@firestartr/cli 2.10.0-snapshot-fix-renderer-1 → 2.10.0-snapshot-fix-renderer-nondeterminism-2

package/build/index.js

@@ -319900,25 +319900,23 @@ class DefaultSection extends BasePatches {
         return [
             {
                 async apply(cr) {
-                    let currentPatchData = patchData;
                     // Merge object arrays
-                    const mergeResult = await __self._mergeObjectArrays(cr, currentPatchData, mergeFilterFn, arrayPaths);
+                    const mergeResult = await __self._mergeObjectArrays(cr, patchData, mergeFilterFn, arrayPaths);
                     cr = mergeResult.cr;
-                    currentPatchData = mergeResult.patchData;
+                    patchData = mergeResult.patchData;
                     // Get the patch list
-                    const patchList = getPatchesFn(cr, currentPatchData);
+                    const patchList = getPatchesFn(cr, patchData);
                     // We apply the patches, update the cr.spec field and return the CR
                     cr.spec = fast_json_patch_default().applyPatch(cr.spec, patchList).newDocument;
                     return cr;
                 },
                 async validate(cr) {
-                    let currentPatchData = patchData;
                     // Merge object arrays
-                    const mergeResult = await __self._mergeObjectArrays(cr, currentPatchData, mergeFilterFn, arrayPaths);
+                    const mergeResult = await __self._mergeObjectArrays(cr, patchData, mergeFilterFn, arrayPaths);
                     cr = mergeResult.cr;
-                    currentPatchData = mergeResult.patchData;
+                    patchData = mergeResult.patchData;
                     // Get the patch list
-                    const patchList = getPatchesFn(cr, currentPatchData);
+                    const patchList = getPatchesFn(cr, patchData);
                     // If the patchList array has length greater than 0,
                     // that must mean some operation was either overriden or not
                     // done at all. That would make our CR invalid
@@ -320841,20 +320839,18 @@ async function freeSlot() {
  *
  */
 async function crawlDirectory(dirEnt, exec) {
-    const entries = (await promises_.readdir(dirEnt)).map((entry) => external_path_.join(dirEnt, entry));
-    const slurps = [];
+    const entries = (await promises_.readdir(dirEnt))
+        .map((entry) => external_path_.join(dirEnt, entry))
+        .sort();
     for (const entry of entries) {
         const testDir = await isDir(entry);
         if (testDir) {
-            slurps.push(() => crawlDirectory(entry, exec));
+            await crawlDirectory(entry, exec);
         }
         else {
-            slurps.push(() => slurpFile(entry, exec));
+            await slurpFile(entry, exec);
         }
     }
-    return Promise.all(slurps.map((f) => f())).catch((err) => {
-        throw `crawlDirectory: ${err} on ${dirEnt}`;
-    });
 }
 function isDir(dirEnt) {
     return promises_.stat(dirEnt)
@@ -524899,7 +524895,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.10.0-snapshot-fix-renderer-1"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.10.0-snapshot-fix-renderer-nondeterminism-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.9.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.10.0-snapshot-fix-renderer-1",
+  "version": "2.10.0-snapshot-fix-renderer-nondeterminism-2",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",