@uniformdev/cli 19.173.1-alpha.17 → 19.176.1-alpha.9

package/dist/index.mjs

@@ -236,7 +236,8 @@ async function syncEngine({
   log = () => {
   },
   onBeforeCompareObjects,
-  onBeforeWriteObject
+  onBeforeWriteObject,
+  onError
 }) {
   const targetItems = /* @__PURE__ */ new Map();
   const deleteTracker = /* @__PURE__ */ new Set();
@@ -246,18 +247,22 @@ async function syncEngine({
     if (!whatIf) {
       try {
         await target.deleteObject(object.providerId, object);
+        log({
+          action: "delete",
+          id: object.id[0],
+          providerId: object.providerId,
+          displayName: object.displayName ?? object.providerId,
+          whatIf,
+          diff: diffLines(JSON.stringify(object.object, null, 2), "")
+        });
       } catch (e) {
-        throw new SyncEngineError(e, object);
+        if (onError) {
+          onError(e, object);
+        } else {
+          throw new SyncEngineError(e, object);
+        }
       }
     }
-    log({
-      action: "delete",
-      id: object.id[0],
-      providerId: object.providerId,
-      displayName: object.displayName ?? object.providerId,
-      whatIf,
-      diff: diffLines(JSON.stringify(object.object, null, 2), "")
-    });
   };
   for await (const obj of target.objects) {
     if (Array.isArray(obj.id)) {
@@ -282,18 +287,22 @@ async function syncEngine({
               try {
                 const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
                 await target.writeObject(finalSourceObject, targetObject2);
+                log({
+                  action: "update",
+                  id: ids[0],
+                  providerId: sourceObject2.providerId,
+                  displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+                  whatIf,
+                  diff: diffJson(targetObject2.object, sourceObject2.object)
+                });
               } catch (e) {
-                throw new SyncEngineError(e, sourceObject2);
+                if (onError) {
+                  onError(e, sourceObject2);
+                } else {
+                  throw new SyncEngineError(e, sourceObject2);
+                }
               }
             }
-            log({
-              action: "update",
-              id: ids[0],
-              providerId: sourceObject2.providerId,
-              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-              whatIf,
-              diff: diffJson(targetObject2.object, sourceObject2.object)
-            });
           };
           actions.push(process2(sourceObject, targetObject));
         }
@@ -305,18 +314,22 @@ async function syncEngine({
           try {
             const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
             await target.writeObject(finalSourceObject);
+            log({
+              action: "create",
+              id,
+              providerId: id,
+              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+              whatIf,
+              diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+            });
           } catch (e) {
-            throw new SyncEngineError(e, sourceObject2);
+            if (onError) {
+              onError(e, sourceObject2);
+            } else {
+              throw new SyncEngineError(e, sourceObject2);
+            }
           }
         }
-        log({
-          action: "create",
-          id,
-          providerId: id,
-          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-          whatIf,
-          diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
-        });
       };
       if (invalidTargetObjects.length > 0) {
         [...invalidTargetObjects, targetObject].forEach((o) => {
@@ -7463,7 +7476,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.173.0",
+  version: "19.175.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9109,7 +9122,10 @@ var ProjectMapNodePullModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapNode/push.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniformdev/project-map";
+import {
+  __INTERNAL_MISSING_PARENT_NODE_ERROR,
+  UncachedProjectMapClient as UncachedProjectMapClient10
+} from "@uniformdev/project-map";
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
@@ -9163,7 +9179,9 @@ var ProjectMapNodePushModule = {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.projectMapNodes ?? [],
+        objects: packageContents.projectMapNodes.sort((a, b) => {
+          return a.path.length - b.path.length;
+        }) ?? [],
         selectIdentifier: expandedSelectIdentifier,
         selectDisplayName: selectDisplayName12
       });
@@ -9176,14 +9194,41 @@ var ProjectMapNodePushModule = {
       });
     }
     const target = createProjectMapNodeEngineDataSource({ client, projectId });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode })
-    });
+    const nodesFailedDueToMissingParent = /* @__PURE__ */ new Set();
+    const attemptSync = async () => {
+      const lastFailedNodesCount = nodesFailedDueToMissingParent.size;
+      nodesFailedDueToMissingParent.clear();
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onError: (error, object) => {
+          if (error.message.includes(__INTERNAL_MISSING_PARENT_NODE_ERROR)) {
+            nodesFailedDueToMissingParent.add(object.object);
+          } else {
+            throw error;
+          }
+        }
+      });
+      if (nodesFailedDueToMissingParent.size !== 0) {
+        const newFailedNodesCount = nodesFailedDueToMissingParent.size;
+        if (newFailedNodesCount !== lastFailedNodesCount) {
+          source = await createArraySyncEngineDataSource({
+            name: `Nodes re-push from ${directory}`,
+            objects: Array.from(nodesFailedDueToMissingParent),
+            selectIdentifier: expandedSelectIdentifier,
+            selectDisplayName: selectDisplayName12
+          });
+          await attemptSync();
+        } else {
+          throw new Error("Failed to push nodes due to missing parent nodes");
+        }
+      }
+    };
+    await attemptSync();
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.173.1-alpha.17+25c1176cea",
+  "version": "19.176.1-alpha.9+f0d014e428",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.173.1-alpha.17+25c1176cea",
-    "@uniformdev/canvas": "19.173.1-alpha.17+25c1176cea",
-    "@uniformdev/context": "19.173.1-alpha.17+25c1176cea",
-    "@uniformdev/files": "19.173.1-alpha.17+25c1176cea",
-    "@uniformdev/project-map": "19.173.1-alpha.17+25c1176cea",
-    "@uniformdev/redirect": "19.173.1-alpha.17+25c1176cea",
+    "@uniformdev/assets": "19.176.1-alpha.9+f0d014e428",
+    "@uniformdev/canvas": "19.176.1-alpha.9+f0d014e428",
+    "@uniformdev/context": "19.176.1-alpha.9+f0d014e428",
+    "@uniformdev/files": "19.176.1-alpha.9+f0d014e428",
+    "@uniformdev/project-map": "19.176.1-alpha.9+f0d014e428",
+    "@uniformdev/redirect": "19.176.1-alpha.9+f0d014e428",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "25c1176cea8d5114b92fc75cdd8bba4aa6463a50"
+  "gitHead": "f0d014e4289935e7192ae91d421883c8b49cc3fb"
 }