@uniformdev/cli 20.69.0 → 20.69.1-alpha.10

package/dist/index.mjs

@@ -628,6 +628,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",
@@ -688,7 +691,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) {
@@ -701,6 +704,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;
+          }
+        }
+      }
     }
   };
 }
@@ -724,6 +739,7 @@ function writeUniformPackage(filename, packageContents) {
 // src/sync/syncEngine.ts
 import { diffJson, diffLines } from "diff";
 import mitt from "mitt";
+import PQueue from "p-queue";
 
 // src/sync/serializedDequal.ts
 var has = Object.prototype.hasOwnProperty;
@@ -790,7 +806,8 @@ async function syncEngine({
   onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
-  onError
+  onError,
+  actionConcurrency
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
@@ -839,43 +856,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) {
@@ -901,6 +921,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));
         });
@@ -908,31 +945,47 @@ async function syncEngine({
         if (targetObject) {
           deletes.push(() => processDelete(targetObject));
         }
-        actions.push(
-          () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
-        );
+        actions.push(async () => {
+          for (const deleteFn of deletes) {
+            await deleteFn();
+          }
+          await 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()));
+    await runSyncActions(deletes, actionConcurrency);
   }
-  await Promise.all(actions.map((a) => a()));
+  await runSyncActions(actions, actionConcurrency);
   await Promise.all([source.onSyncComplete?.(false), target.onSyncComplete?.(true)]);
 }
+var runSyncActions = async (actions, actionConcurrency) => {
+  if (actions.length === 0) {
+    return;
+  }
+  if (typeof actionConcurrency === "undefined") {
+    await Promise.all(actions.map((action) => action()));
+    return;
+  }
+  const queue = new PQueue({ concurrency: actionConcurrency });
+  await queue.addAll(actions);
+};
 var SyncEngineError = class _SyncEngineError extends Error {
   constructor(innerError, sourceObject) {
     super(
@@ -2200,20 +2253,64 @@ import {
 } from "@uniformdev/canvas";
 import { isRichTextNodeType, isRichTextValue, walkRichTextTree } from "@uniformdev/richtext";
 import fsj4 from "fs-jetpack";
-import PQueue2 from "p-queue";
+import PQueue3 from "p-queue";
 import { join as join10 } from "path";
 
 // src/files/downloadFile.ts
+import { createWriteStream } from "fs";
 import fsj2 from "fs-jetpack";
-import { join as join8 } from "path";
+import { dirname as dirname2, join as join8 } from "path";
+import { Readable } from "stream";
+import { pipeline } from "stream/promises";
+var downloadedFilePathCacheByDirectory = /* @__PURE__ */ new Map();
+var tempDownloadFileCounter = 0;
+var getTempDownloadFilePath = (filePath) => {
+  tempDownloadFileCounter += 1;
+  return `${filePath}.${process.pid}.${Date.now()}.${tempDownloadFileCounter}.download`;
+};
+var getDownloadedFilePathCache = (filesDirectory) => {
+  const cached = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (cached) {
+    return cached;
+  }
+  const cache = fsj2.cwd(filesDirectory).findAsync({ files: true, directories: false }).then((paths) => new Set(paths)).catch(() => /* @__PURE__ */ new Set());
+  downloadedFilePathCacheByDirectory.set(filesDirectory, cache);
+  return cache;
+};
+var filePathMatchesSourceId = (filePath, sourceId) => filePath === sourceId || filePath.startsWith(`${sourceId}.`);
+var hasFilePathMatchingSourceId = (filePaths, sourceId) => {
+  for (const filePath of filePaths) {
+    if (filePathMatchesSourceId(filePath, sourceId)) {
+      return true;
+    }
+  }
+  return false;
+};
+var writeResponseBodyToFile = async (response, filePath) => {
+  if (!response.body) {
+    throw new Error("Response does not contain a body");
+  }
+  const tempFilePath = getTempDownloadFilePath(filePath);
+  await fsj2.dirAsync(dirname2(filePath));
+  try {
+    const responseBody = response.body;
+    await pipeline(Readable.fromWeb(responseBody), createWriteStream(tempFilePath));
+    await fsj2.moveAsync(tempFilePath, filePath, { overwrite: true });
+  } catch (error) {
+    await fsj2.removeAsync(tempFilePath).catch(() => void 0);
+    throw error;
+  }
+};
 var downloadFile = async ({
   fileClient,
   fileUrl,
   directory
 }) => {
   const writeDirectory = getFilesDirectory(directory);
+  const filesDirectory = join8(writeDirectory, FILES_DIRECTORY_NAME);
   const fileName = urlToFileName(fileUrl.toString());
-  const fileAlreadyExists = await fsj2.existsAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName));
+  const filePath = join8(filesDirectory, fileName);
+  const fileAlreadyExists = await fsj2.existsAsync(filePath);
   if (fileAlreadyExists) {
     return { url: fileUrl };
   }
@@ -2223,11 +2320,10 @@ var downloadFile = async ({
     return null;
   }
   if (file.sourceId) {
+    const sourceId = file.sourceId;
     try {
-      const hashAlreadyExists = await fsj2.findAsync(join8(writeDirectory, FILES_DIRECTORY_NAME), {
-        matching: [file.sourceId, `${file.sourceId}.*`]
-      });
-      if (hashAlreadyExists.length > 0) {
+      const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
+      if (hasFilePathMatchingSourceId(downloadedFilePaths, sourceId)) {
         return { id: file.id, url: fileUrl };
       }
     } catch {
@@ -2238,8 +2334,12 @@ var downloadFile = async ({
   if (!response.ok) {
     return null;
   }
-  const fileBuffer = await response.arrayBuffer();
-  await fsj2.writeAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
+  await writeResponseBodyToFile(response, filePath);
+  const downloadedFilePathCache = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (downloadedFilePathCache) {
+    const downloadedFilePaths = await downloadedFilePathCache;
+    downloadedFilePaths.add(fileName);
+  }
   return { id: file.id, url: fileUrl };
 };
 
@@ -2251,10 +2351,10 @@ import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
 import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
-import PQueue from "p-queue";
+import PQueue2 from "p-queue";
 import { join as join9 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
-var fileUploadQueue = new PQueue({ concurrency: 10 });
+var fileUploadQueue = new PQueue2({ concurrency: 10 });
 var uploadFile = async ({
   fileClient,
   fileUrl,
@@ -2434,9 +2534,9 @@ var walkFileUrlsForCompositionOrEntry = ({
 };
 
 // src/files/files.ts
-var fileDownloadQueue = new PQueue2({ concurrency: 10 });
-var fileUploadQueue2 = new PQueue2({ concurrency: 10 });
-var fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
+var fileDownloadQueue = new PQueue3({ concurrency: 10 });
+var fileUploadQueue2 = new PQueue3({ concurrency: 10 });
+var fileUrlReplacementQueue = new PQueue3({ concurrency: 10 });
 var downloadFileForAsset = async ({
   asset,
   directory,
@@ -2763,6 +2863,7 @@ function writeCanvasPackage(filename, packageContents) {
 }
 
 // src/commands/canvas/commands/asset/pull.ts
+var ASSET_PULL_ACTION_CONCURRENCY = 10;
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
@@ -2861,6 +2962,7 @@ var AssetPullModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PULL_ACTION_CONCURRENCY,
       allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -2888,6 +2990,7 @@ var AssetPullModule = {
 };
 
 // src/commands/canvas/commands/asset/push.ts
+var ASSET_PUSH_ACTION_CONCURRENCY = 10;
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
@@ -2963,6 +3066,7 @@ var AssetPushModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PUSH_ACTION_CONCURRENCY,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
@@ -12163,6 +12267,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({
@@ -12379,6 +12497,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);
@@ -12782,7 +12906,7 @@ import yargs40 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
-import PQueue3 from "p-queue";
+import PQueue4 from "p-queue";
 import { Svix } from "svix";
 import * as z3 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
@@ -12830,7 +12954,7 @@ var WebhooksClient = class extends ApiClient4 {
     };
   }
   async get() {
-    const webhooksAPIQueue = new PQueue3({ concurrency: 10 });
+    const webhooksAPIQueue = new PQueue4({ concurrency: 10 });
     const { appId, token } = await this.getToken();
     const svix = new Svix(token);
     const getEndpoints = async ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.69.0",
+  "version": "20.69.1-alpha.10+3d89a58006",
   "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.69.0",
-    "@uniformdev/canvas": "20.69.0",
-    "@uniformdev/context": "20.69.0",
-    "@uniformdev/files": "20.69.0",
-    "@uniformdev/project-map": "20.69.0",
-    "@uniformdev/redirect": "20.69.0",
-    "@uniformdev/richtext": "20.69.0",
+    "@uniformdev/assets": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/canvas": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/context": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/files": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/project-map": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/redirect": "20.69.1-alpha.10+3d89a58006",
+    "@uniformdev/richtext": "20.69.1-alpha.10+3d89a58006",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4b9b5df363c6f87dba72c772ae49a4624b4e2e4"
+  "gitHead": "3d89a5800698d773fd45afbcbec0bc5a3493cf0a"
 }