@uniformdev/cli 20.63.1-alpha.12 → 20.63.1-alpha.21

package/dist/index.mjs

@@ -625,9 +625,6 @@ 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",
@@ -688,7 +685,7 @@ ${e?.message}`));
       }
       await unlink(providerId);
     },
-    writeObject: async (object4, existingObject) => {
+    writeObject: async (object4) => {
       const filename = selectFilename3 ? join(directory, `${selectFilename3(object4.object)}.${format}`) : getFullFilename(object4.id);
       let contents = object4.object;
       if (selectSchemaUrl2) {
@@ -701,18 +698,6 @@ ${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;
-          }
-        }
-      }
     }
   };
 }
@@ -851,46 +836,43 @@ 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(
-      (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)
-        });
-      }
-    };
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o?.object !== targetObject?.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++;
-          actions.push(() => processUpdate(sourceObject, targetObject));
+          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));
         }
       }
-      processedIds.forEach((i) => targetItems.delete(i));
+      ids.forEach((i) => targetItems.delete(i));
     } else {
+      status.changeCount++;
       const processUpsert = async (sourceObject2, id) => {
         try {
           if (!whatIf) {
@@ -916,23 +898,6 @@ 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));
         });
@@ -944,22 +909,20 @@ async function syncEngine({
           () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
         );
       } else {
-        status.changeCount++;
         actions.push(() => processUpsert(sourceObject, ids[0]));
       }
     }
   }
-  const orphanTargetObjects = new Set(targetItems.values());
+  status.changeCount += targetItems.size;
+  status.compared += targetItems.size;
   if (mode === "mirror") {
-    status.changeCount += orphanTargetObjects.size;
-    status.compared += orphanTargetObjects.size;
-    if (!sourceHasItems && !allowEmptySource && orphanTargetObjects.size > 0) {
+    if (!sourceHasItems && !allowEmptySource && targetItems.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 = [];
-    orphanTargetObjects.forEach((object4) => {
+    targetItems.forEach((object4) => {
       deletes.push(() => processDelete(object4));
     });
     await Promise.all(deletes.map((d) => d()));
@@ -11994,20 +11957,6 @@ 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({
@@ -12224,12 +12173,6 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.63.1-alpha.12+914935b899",
+  "version": "20.63.1-alpha.21+dce4d28095",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@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",
+    "@uniformdev/assets": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/canvas": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/context": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/files": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/project-map": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/redirect": "20.63.1-alpha.21+dce4d28095",
+    "@uniformdev/richtext": "20.63.1-alpha.21+dce4d28095",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "914935b89907018dde56a2c49b72e6899d9fb0e2"
+  "gitHead": "dce4d280956f096f3530911c59fe186c86c17eda"
 }