@uniformdev/cli 19.173.1-alpha.17 → 19.173.2-alpha.258

package/dist/{chunk-DDTNSIMF.mjs → chunk-VMUNHMVI.mjs}

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@8.1.0_@microsoft+api-extractor@7.43.2_postcss@8.4.38_typescript@5.3.3/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.2.4_@microsoft+api-extractor@7.43.2_tsx@4.17.0_typescript@5.5.4/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-DDTNSIMF.mjs";
+import "./chunk-VMUNHMVI.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -15,7 +15,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-DDTNSIMF.mjs";
+} from "./chunk-VMUNHMVI.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -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) => {
@@ -1883,7 +1896,7 @@ var CompositionListModule = {
     const res = await client.getCompositionList({
       limit,
       offset,
-      search: search.length > 0 ? search : void 0,
+      search: search && search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
       patternType,
       state: convertStateOption(state),
@@ -1947,7 +1960,17 @@ var ComponentPatternListModule = {
 import { UncachedCanvasClient as UncachedCanvasClient9 } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/composition/_util.ts
-var selectIdentifier3 = (component) => component.composition._id;
+var selectIdentifier3 = (response) => {
+  let baseId = response.composition._id;
+  if (response.editionId) {
+    baseId += ` (${response.editionId})`;
+  }
+  return baseId;
+};
+function parseCompositionSerializedId(providerId) {
+  const [compositionId, editionId] = providerId.split(" (");
+  return { compositionId, editionId: editionId?.slice(0, -1) };
+}
 var selectDisplayName3 = (component) => `${component.composition._name ?? component.composition._slug ?? component.composition._id} (pid: ${component.composition._id})`;
 
 // src/commands/canvas/componentInstanceEngineDataSource.ts
@@ -1971,7 +1994,8 @@ function createComponentInstanceEngineDataSource({
         skipPatternResolution: true,
         skipOverridesResolution: true,
         withComponentIDs: true,
-        patternType
+        patternType,
+        editions: "all"
       })).compositions,
       { pageSize: 100 }
     );
@@ -1979,7 +2003,7 @@ function createComponentInstanceEngineDataSource({
       const result = {
         id: selectIdentifier3(compositionListItem),
         displayName: selectDisplayName3(compositionListItem),
-        providerId: compositionListItem.composition._id,
+        providerId: selectIdentifier3(compositionListItem),
         object: prepCompositionForDisk(compositionListItem)
       };
       yield result;
@@ -1989,7 +2013,7 @@ function createComponentInstanceEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.removeComposition({ compositionId: providerId });
+      await client.removeComposition(parseCompositionSerializedId(providerId));
     },
     writeObject: async (object) => {
       await client.updateComposition({ ...object.object, state: stateId });
@@ -3588,7 +3612,6 @@ var EntryGetModule = {
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yargs36.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
               resolveData: {
                 type: "boolean",
@@ -4151,7 +4174,6 @@ var EntryPatternGetModule = {
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yargs36.positional("id", {
               demandOption: true,
               describe: "Entry pattern public ID to fetch"
@@ -7463,7 +7485,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.173.0",
+  version: "19.188.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9109,7 +9131,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 +9188,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 +9203,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.173.2-alpha.258+e8775b83de",
   "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.173.2-alpha.258+e8775b83de",
+    "@uniformdev/canvas": "19.173.2-alpha.258+e8775b83de",
+    "@uniformdev/context": "19.173.2-alpha.258+e8775b83de",
+    "@uniformdev/files": "19.173.2-alpha.258+e8775b83de",
+    "@uniformdev/project-map": "19.173.2-alpha.258+e8775b83de",
+    "@uniformdev/redirect": "19.173.2-alpha.258+e8775b83de",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "25c1176cea8d5114b92fc75cdd8bba4aa6463a50"
+  "gitHead": "e8775b83dec606ce6e2198182152d8b386e15f94"
 }