@uniformdev/cli 20.63.0 → 20.63.1-alpha.12

package/dist/{chunk-KNWMBEB7.mjs → chunk-BFI4F2WF.mjs}

@@ -60,11 +60,11 @@ var package_default = {
     colorette: "2.0.20",
     cosmiconfig: "9.0.0",
     "cosmiconfig-typescript-loader": "5.0.0",
-    diff: "^5.0.0",
+    diff: "^8.0.3",
     dotenv: "^16.4.7",
     esbuild: "0.25.0",
     execa: "5.1.1",
-    "file-type": "^20.0.0",
+    "file-type": "^21.3.2",
     "fs-jetpack": "5.1.0",
     graphql: "16.9.0",
     "graphql-request": "6.1.0",
@@ -82,12 +82,12 @@ var package_default = {
     "registry-url": "^6.0.0",
     slugify: "1.6.6",
     svix: "^1.71.0",
-    undici: "^7.16.0",
+    undici: "^7.24.0",
     yargs: "^17.6.2",
-    zod: "3.25.76"
+    zod: "4.3.6"
   },
   devDependencies: {
-    "@types/diff": "5.0.9",
+    "@types/diff": "^8.0.0",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/node": "24.3.1",

package/dist/defaultConfig.mjs

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

package/dist/index.mjs

@@ -18,7 +18,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-KNWMBEB7.mjs";
+} from "./chunk-BFI4F2WF.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -74,7 +74,7 @@ async function getBearerToken(baseUrl) {
 }
 
 // src/client.ts
-import * as z from "zod/v3";
+import * as z from "zod";
 
 // src/auth/api-key.ts
 var READ_PERMISSIONS = ["PROJECT", "UPM_PUB", "OPT_PUB", "OPT_READ", "UPM_READ"];
@@ -625,6 +625,9 @@ export default uniformConfig({
 `;
 
 // src/sync/fileSyncEngineDataSource.ts
+function isErrorWithCode(error, code) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === code;
+}
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
@@ -685,7 +688,7 @@ ${e?.message}`));
       }
       await unlink(providerId);
     },
-    writeObject: async (object4) => {
+    writeObject: async (object4, existingObject) => {
       const filename = selectFilename3 ? join(directory, `${selectFilename3(object4.object)}.${format}`) : getFullFilename(object4.id);
       let contents = object4.object;
       if (selectSchemaUrl2) {
@@ -698,6 +701,18 @@ ${e?.message}`));
         console.log(`Writing file ${filename}`);
       }
       emitWithFormat(contents, format, filename);
+      if (existingObject?.providerId && existingObject.providerId !== filename) {
+        if (verbose) {
+          console.log(`Deleting file ${existingObject.providerId}`);
+        }
+        try {
+          await unlink(existingObject.providerId);
+        } catch (error) {
+          if (!isErrorWithCode(error, "ENOENT")) {
+            throw error;
+          }
+        }
+      }
     }
   };
 }
@@ -836,43 +851,46 @@ async function syncEngine({
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     status.compared++;
-    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o?.object !== targetObject?.object);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter(
+      (invalidTargetObject) => typeof invalidTargetObject !== "undefined" && invalidTargetObject.object !== targetObject?.object
+    );
+    const targetIds = Array.isArray(targetObject?.id) ? targetObject.id : [targetObject?.id];
+    const processedIds = new Set([...ids, ...targetIds].filter((id) => typeof id === "string"));
+    const processUpdate = async (sourceObject2, targetObject2) => {
+      try {
+        if (!whatIf) {
+          const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
+          await target.writeObject(finalSourceObject, targetObject2);
+          status.changesApplied++;
+        }
+      } catch (e) {
+        if (onError) {
+          onError(e, sourceObject2);
+        } else {
+          throw new SyncEngineError(e, sourceObject2);
+        }
+      } finally {
+        log2({
+          action: "update",
+          id: ids[0],
+          providerId: sourceObject2.providerId,
+          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+          whatIf,
+          diff: () => diffJson(targetObject2.object, sourceObject2.object)
+        });
+      }
+    };
     if (targetObject && invalidTargetObjects.length === 0) {
       sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       const compareResult = compareContents(sourceObject, targetObject);
       if (!compareResult) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           status.changeCount++;
-          const process2 = async (sourceObject2, targetObject2) => {
-            try {
-              if (!whatIf) {
-                const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
-                await target.writeObject(finalSourceObject, targetObject2);
-                status.changesApplied++;
-              }
-            } catch (e) {
-              if (onError) {
-                onError(e, sourceObject2);
-              } else {
-                throw new SyncEngineError(e, sourceObject2);
-              }
-            } finally {
-              log2({
-                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));
+          actions.push(() => processUpdate(sourceObject, targetObject));
         }
       }
-      ids.forEach((i) => targetItems.delete(i));
+      processedIds.forEach((i) => targetItems.delete(i));
     } else {
-      status.changeCount++;
       const processUpsert = async (sourceObject2, id) => {
         try {
           if (!whatIf) {
@@ -898,6 +916,23 @@ async function syncEngine({
         }
       };
       if (invalidTargetObjects.length > 0) {
+        if (mode === "createOrUpdate" && !targetObject && invalidTargetObjects.length === 1) {
+          const matchedTargetObject = invalidTargetObjects[0];
+          sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, matchedTargetObject) : sourceObject;
+          const compareResult = compareContents(sourceObject, matchedTargetObject);
+          if (!compareResult) {
+            status.changeCount++;
+            actions.push(() => processUpdate(sourceObject, matchedTargetObject));
+          }
+          (Array.isArray(matchedTargetObject.id) ? matchedTargetObject.id : [matchedTargetObject.id]).forEach(
+            (i) => targetItems.delete(i)
+          );
+          continue;
+        }
+        if (mode !== "mirror") {
+          continue;
+        }
+        status.changeCount++;
         [...invalidTargetObjects, targetObject].forEach((o) => {
           (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
@@ -909,20 +944,22 @@ async function syncEngine({
           () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
         );
       } else {
+        status.changeCount++;
         actions.push(() => processUpsert(sourceObject, ids[0]));
       }
     }
   }
-  status.changeCount += targetItems.size;
-  status.compared += targetItems.size;
+  const orphanTargetObjects = new Set(targetItems.values());
   if (mode === "mirror") {
-    if (!sourceHasItems && !allowEmptySource && targetItems.size > 0) {
+    status.changeCount += orphanTargetObjects.size;
+    status.compared += orphanTargetObjects.size;
+    if (!sourceHasItems && !allowEmptySource && orphanTargetObjects.size > 0) {
       throw new Error(
         `Sync source (${source.name}) is empty and mode is mirror. This would cause deletion of everything in the target (${target.name}), and most likely indicates an error in source definition.`
       );
     }
     const deletes = [];
-    targetItems.forEach((object4) => {
+    orphanTargetObjects.forEach((object4) => {
       deletes.push(() => processDelete(object4));
     });
     await Promise.all(deletes.map((d) => d()));
@@ -1046,7 +1083,7 @@ async function chooseTeam(user, prompt, telemetry) {
 // src/auth/user-info.ts
 import { ProjectClient } from "@uniformdev/canvas";
 import { gql, request } from "graphql-request";
-import * as z2 from "zod/v3";
+import * as z2 from "zod";
 var identityQuery = gql`
   query GetUserIdentity($subject: String!) {
     info: identities_by_pk(subject: $subject) {
@@ -7158,14 +7195,6 @@ var EntryPatternModule = {
 // src/commands/canvas/commands/label.ts
 import yargs15 from "yargs";
 
-// src/commands/canvas/commands/label/_util.ts
-import { LabelClient } from "@uniformdev/canvas";
-var selectLabelIdentifier = (label) => label.label.publicId;
-var selectLabelDisplayName = (label) => `${label.label.displayName} (pid: ${label.label.publicId})`;
-function getLabelClient(options) {
-  return new LabelClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
-}
-
 // src/commands/canvas/labelsEngineDataSource.ts
 function normalizeLabelForSync(label) {
   const { projectId: _projectId, ...labelWithoutProjectId } = label;
@@ -7201,6 +7230,14 @@ function createLabelsEngineDataSource({
   };
 }
 
+// src/commands/canvas/commands/label/_util.ts
+import { LabelClient } from "@uniformdev/canvas";
+var selectLabelIdentifier = (label) => label.label.publicId;
+var selectLabelDisplayName = (label) => `${label.label.displayName} (pid: ${label.label.publicId})`;
+function getLabelClient(options) {
+  return new LabelClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+}
+
 // src/commands/canvas/commands/label/pull.ts
 var LabelPullModule = {
   command: "pull <directory>",
@@ -11957,6 +11994,20 @@ var selectIdentifier15 = (source, projectId) => [
 ];
 var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
 var selectDisplayName15 = (source) => `${source.name} (pid: ${source.id})`;
+function alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject) {
+  if (!targetObject) {
+    return sourceObject;
+  }
+  return {
+    ...sourceObject,
+    id: targetObject.id,
+    providerId: targetObject.providerId,
+    object: {
+      ...sourceObject.object,
+      id: targetObject.object.id
+    }
+  };
+}
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
 function createProjectMapNodeEngineDataSource({
@@ -12173,6 +12224,12 @@ var ProjectMapNodePushModule = {
         whatIf,
         allowEmptySource,
         log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
+        onBeforeWriteObject: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
         onError: (error, object4) => {
           if (error.message.includes(__INTERNAL_MISSING_PARENT_NODE_ERROR)) {
             nodesFailedDueToMissingParent.add(object4.object);
@@ -12578,7 +12635,7 @@ import yargs40 from "yargs";
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
 import PQueue3 from "p-queue";
 import { Svix } from "svix";
-import * as z3 from "zod/v3";
+import * as z3 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
 var WebhooksClient = class extends ApiClient4 {
   constructor(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.63.0",
+  "version": "20.63.1-alpha.12+914935b899",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,22 +27,22 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.63.0",
-    "@uniformdev/canvas": "20.63.0",
-    "@uniformdev/context": "20.63.0",
-    "@uniformdev/files": "20.63.0",
-    "@uniformdev/project-map": "20.63.0",
-    "@uniformdev/redirect": "20.63.0",
-    "@uniformdev/richtext": "20.63.0",
+    "@uniformdev/assets": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/canvas": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/context": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/files": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/project-map": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/redirect": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/richtext": "20.63.1-alpha.12+914935b899",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
     "cosmiconfig-typescript-loader": "5.0.0",
-    "diff": "^5.0.0",
+    "diff": "^8.0.3",
     "dotenv": "^16.4.7",
     "esbuild": "0.25.0",
     "execa": "5.1.1",
-    "file-type": "^20.0.0",
+    "file-type": "^21.3.2",
     "fs-jetpack": "5.1.0",
     "graphql": "16.9.0",
     "graphql-request": "6.1.0",
@@ -60,12 +60,12 @@
     "registry-url": "^6.0.0",
     "slugify": "1.6.6",
     "svix": "^1.71.0",
-    "undici": "^7.16.0",
+    "undici": "^7.24.0",
     "yargs": "^17.6.2",
-    "zod": "3.25.76"
+    "zod": "4.3.6"
   },
   "devDependencies": {
-    "@types/diff": "5.0.9",
+    "@types/diff": "^8.0.0",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/node": "24.3.1",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "76729fa5c8c4dc3d71d65fdb181a659755ec34ae"
+  "gitHead": "914935b89907018dde56a2c49b72e6899d9fb0e2"
 }