@uniformdev/cli 18.27.1-alpha.23 → 18.28.0

package/dist/index.mjs

@@ -48,16 +48,22 @@ async function createArraySyncEngineDataSource({
   onSyncComplete
 }) {
   const objectIndex = objects.reduce((result, current) => {
-    const identifier = selectIdentifier11(current);
-    if (result[identifier]) {
-      throw new Error(`Identifier ${identifier} was not unique.`);
+    const rawIdentifiers = selectIdentifier11(current);
+    const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
+    while (identifiers.length > 0) {
+      const identifier = identifiers.pop();
+      if (!identifier)
+        continue;
+      if (result[identifier]) {
+        throw new Error(`Identifier ${identifier} was not unique.`);
+      }
+      result[identifier] = {
+        id: identifier,
+        object: current,
+        providerId: identifier,
+        displayName: selectDisplayName11(current)[0]
+      };
     }
-    result[identifier] = {
-      id: identifier,
-      object: current,
-      providerId: identifier,
-      displayName: selectDisplayName11(current)
-    };
     return result;
   }, {});
   async function* getObjects() {
@@ -75,7 +81,11 @@ async function createArraySyncEngineDataSource({
     },
     writeObject: async (objectToWrite) => {
       const id = selectIdentifier11(objectToWrite.object);
-      objectIndex[id] = objectToWrite;
+      if (Array.isArray(id)) {
+        id.forEach((i) => objectIndex[i] = objectToWrite);
+      } else {
+        objectIndex[id] = objectToWrite;
+      }
     },
     extractCurrent,
     onSyncComplete: onSyncComplete ? (isTarget) => onSyncComplete(isTarget, extractCurrent()) : void 0
@@ -249,7 +259,7 @@ async function createFileSyncEngineDataSource({
       return ext === `.json` || ext === `.yaml` || ext === `.yml`;
     })
   );
-  const getFullFilename = (id) => join(directory, `${id}.${format}`);
+  const getFullFilename = (id) => join(directory, `${Array.isArray(id) ? id[0] : id}.${format}`);
   async function* getObjects() {
     for (const filename of filenames) {
       const fullFilename = join(directory, filename);
@@ -257,7 +267,7 @@ async function createFileSyncEngineDataSource({
         const contents = await readFileToObject(fullFilename);
         const object = {
           id: selectIdentifier11(contents),
-          displayName: selectDisplayName11(contents),
+          displayName: selectDisplayName11(contents)[0],
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
         };
@@ -326,16 +336,42 @@ async function syncEngine({
 }) {
   var _a, _b;
   const targetItems = /* @__PURE__ */ new Map();
+  const deleteTracker = /* @__PURE__ */ new Set();
+  const processDelete = async (object) => {
+    if (deleteTracker.has(object))
+      return;
+    deleteTracker.add(object);
+    if (!whatIf) {
+      try {
+        await target.deleteObject(object.providerId, object);
+      } catch (e) {
+        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) {
-    targetItems.set(obj.id, obj);
+    if (Array.isArray(obj.id)) {
+      obj.id.forEach((o) => targetItems.set(o, obj));
+    } else {
+      targetItems.set(obj.id, obj);
+    }
   }
   const actions = [];
   let sourceHasItems = false;
   for await (const sourceObject of source.objects) {
     sourceHasItems = true;
-    const id = sourceObject.id;
-    const targetObject = targetItems.get(id);
-    if (targetObject) {
+    const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
+    const targetObject = targetItems.get(ids[0]);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o !== targetObject);
+    if (targetObject && invalidTargetObjects.length == 0) {
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           const process2 = async (sourceObject2, targetObject2) => {
@@ -348,7 +384,7 @@ async function syncEngine({
             }
             log({
               action: "update",
-              id,
+              id: ids[0],
               providerId: sourceObject2.providerId,
               displayName: sourceObject2.displayName ?? sourceObject2.providerId,
               whatIf,
@@ -358,9 +394,9 @@ async function syncEngine({
           actions.push(process2(sourceObject, targetObject));
         }
       }
-      targetItems.delete(id);
+      ids.forEach((i) => targetItems.delete(i));
     } else {
-      const process2 = async (sourceObject2, id2) => {
+      const process2 = async (sourceObject2, id) => {
         if (!whatIf) {
           try {
             await target.writeObject(sourceObject2);
@@ -370,14 +406,30 @@ async function syncEngine({
         }
         log({
           action: "create",
-          id: id2,
-          providerId: id2,
+          id,
+          providerId: id,
           displayName: sourceObject2.displayName ?? sourceObject2.providerId,
           whatIf,
           diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
         });
       };
-      actions.push(process2(sourceObject, id));
+      if (invalidTargetObjects.length > 0) {
+        [...invalidTargetObjects, targetObject].forEach(
+          (o) => {
+            var _a2;
+            return (_a2 = o == null ? void 0 : o.id) == null ? void 0 : _a2.forEach((i) => targetItems.delete(i));
+          }
+        );
+        const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map(async (io) => {
+          await processDelete(io);
+        });
+        if (targetObject) {
+          deletes.push(processDelete(targetObject));
+        }
+        actions.push(Promise.all(deletes).then(() => process2(sourceObject, ids[0])));
+      } else {
+        actions.push(process2(sourceObject, ids[0]));
+      }
     }
   }
   await Promise.all(actions);
@@ -389,24 +441,7 @@ async function syncEngine({
     }
     const deletes = [];
     targetItems.forEach(async (object) => {
-      const process2 = async (object2) => {
-        if (!whatIf) {
-          try {
-            await target.deleteObject(object2.providerId, object2);
-          } catch (e) {
-            throw new SyncEngineError(e, object2);
-          }
-        }
-        log({
-          action: "delete",
-          id: object2.id,
-          providerId: object2.providerId,
-          displayName: object2.displayName ?? object2.providerId,
-          whatIf,
-          diff: diffLines(JSON.stringify(object2.object, null, 2), "")
-        });
-      };
-      deletes.push(process2(object));
+      deletes.push(processDelete(object));
     });
     await Promise.all(deletes);
   }
@@ -3190,7 +3225,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "18.27.0",
+  version: "18.28.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3223,7 +3258,7 @@ var package_default = {
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.0",
     "lodash.isequalwith": "^4.4.0",
-    open: "8.4.0",
+    open: "9.0.0",
     ora: "6.2.0",
     "posthog-node": "2.6.0",
     slugify: "1.6.5",
@@ -4677,7 +4712,10 @@ var ProjectMapNodeListModule = {
 import { UncachedProjectMapClient as UncachedProjectMapClient9 } from "@uniformdev/project-map";
 
 // src/commands/project-map/commands/ProjectMapNode/_util.ts
-var selectIdentifier10 = (source, projectId) => projectId + source.projectMapId + source.id + source.path;
+var selectIdentifier10 = (source, projectId) => [
+  projectId + source.projectMapId + source.id,
+  projectId + source.projectMapId + source.path
+];
 var selectFilename = (source) => `${source.pathSegment}_${source.id}`;
 var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
 
@@ -4695,7 +4733,7 @@ function createProjectMapNodeEngineDataSource({
           const result = {
             id: selectIdentifier10({ ...def, projectMapId: projectMap.id }, projectId),
             displayName: selectDisplayName10(def),
-            providerId: selectIdentifier10({ ...def, projectMapId: projectMap.id }, projectId),
+            providerId: selectIdentifier10({ ...def, projectMapId: projectMap.id }, projectId)[0],
             object: { ...def, projectMapId: projectMap.id }
           };
           yield result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "18.27.1-alpha.23+ed7d9bfa0",
+  "version": "18.28.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,9 +16,9 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "18.27.1-alpha.23+ed7d9bfa0",
-    "@uniformdev/context": "18.27.1-alpha.23+ed7d9bfa0",
-    "@uniformdev/project-map": "18.27.1-alpha.23+ed7d9bfa0",
+    "@uniformdev/canvas": "18.28.0",
+    "@uniformdev/context": "18.28.0",
+    "@uniformdev/project-map": "18.28.0",
     "chalk": "^5.2.0",
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
@@ -33,7 +33,7 @@
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "9.0.0",
     "lodash.isequalwith": "^4.4.0",
-    "open": "8.4.0",
+    "open": "9.0.0",
     "ora": "6.2.0",
     "posthog-node": "2.6.0",
     "slugify": "1.6.5",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ed7d9bfa014db103691c2d2030b1549770a48d6b"
+  "gitHead": "97d916ca20965e8a86d2454847114068895ccddd"
 }