build: try to make output stabler during serialization

formatjs · Sep 17, 2020 · 287f504 · 287f504
1 parent 4089740
commit 287f504
Show file tree

Hide file tree

Showing 4 changed files with 423 additions and 411 deletions.
diff --git a/packages/intl-datetimeformat/BUILD b/packages/intl-datetimeformat/BUILD
@@ -213,9 +213,11 @@ generate_src_file(
         "//packages/ecma402-abstract:dist",
         "//packages/ecma402-abstract:types",
         "@npm//@types/fs-extra",
+        "@npm//@types/json-stable-stringify",
         "@npm//@types/minimist",
         "@npm//@types/node",
         "@npm//fs-extra",
+        "@npm//json-stable-stringify",
         "@npm//minimist",
         "@tzdata//:zdumps",
     ],
@@ -241,9 +243,11 @@ ts_node(
         "//packages/ecma402-abstract:dist",
         "//packages/ecma402-abstract:types",
         "@npm//@types/fs-extra",
+        "@npm//@types/json-stable-stringify",
         "@npm//@types/minimist",
         "@npm//@types/node",
         "@npm//fs-extra",
+        "@npm//json-stable-stringify",
         "@npm//minimist",
         "@tzdata//:zdumps",
     ],
@@ -269,9 +273,11 @@ ts_node(
         "//packages/ecma402-abstract:dist",
         "//packages/ecma402-abstract:types",
         "@npm//@types/fs-extra",
+        "@npm//@types/json-stable-stringify",
         "@npm//@types/minimist",
         "@npm//@types/node",
         "@npm//fs-extra",
+        "@npm//json-stable-stringify",
         "@npm//minimist",
         "@tzdata//:zdumps",
     ],

diff --git a/packages/intl-datetimeformat/scripts/process-zdump.ts b/packages/intl-datetimeformat/scripts/process-zdump.ts
@@ -5,6 +5,7 @@ import {promisify} from 'util';
 import {outputFileSync} from 'fs-extra';
 import {UnpackedData, ZoneData} from '../src/types';
 import {pack} from '../src/packer';
+import stringify from 'json-stable-stringify';
 
 const readFile = promisify(_readFile);
 const SPACE_REGEX = /[\s\t]+/;
@@ -299,12 +300,11 @@ function utTimeToSeconds(utTime: string) {
 
 const LINE_REGEX = /^(.*?)\s+(.*?) UTC? = (.*?) isdst=(0|1) gmtoff=(.*?)$/i;
 
-async function processZone(
-  input: string,
+function processZone(
+  content: string,
   {zones, abbrvs, offsets}: UnpackedData,
   golden?: string
 ) {
-  const content = await readFile(input, 'utf8');
   const lines = content.split('\n');
   for (const line of lines) {
     if (line.endsWith('NULL')) {
@@ -361,10 +361,12 @@ async function main(args: minimist.ParsedArgs) {
     offsets,
   };
 
-  await Promise.all(
-    inputs.map((input: string) => processZone(input, data, golden))
+  const contents = await Promise.all(
+    inputs.map((input: string) => readFile(input, 'utf8'))
   );
 
+  processZone(contents.join('\n'), data, golden);
+
   if (polyfill) {
     outputFileSync(
       output,
@@ -379,7 +381,9 @@ if ('DateTimeFormat' in Intl && Intl.DateTimeFormat.__addTZData) {
       output,
       `// @generated
 // prettier-ignore
-export default ${JSON.stringify(pack(data), undefined, 2)}`
+export default ${stringify(pack(data), {
+        space: 2,
+      })}`
     );
   }
 }