@uniformdev/cli 20.70.1-alpha.10 → 20.70.1-alpha.6

package/dist/index.mjs

@@ -628,9 +628,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",
@@ -691,7 +688,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) {
@@ -704,18 +701,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;
-          }
-        }
-      }
     }
   };
 }
@@ -739,7 +724,6 @@ 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;
@@ -806,8 +790,7 @@ async function syncEngine({
   onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
-  onError,
-  actionConcurrency
+  onError
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
@@ -856,46 +839,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) {
@@ -921,73 +901,38 @@ 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));
         });
-        const deletes = invalidTargetObjects.map(
-          (invalidTargetObject) => () => processDelete(invalidTargetObject)
-        );
+        const deletes = invalidTargetObjects.filter((invalidTargetObject) => typeof invalidTargetObject !== "undefined").map((invalidTargetObject) => () => processDelete(invalidTargetObject));
         if (targetObject) {
           deletes.push(() => processDelete(targetObject));
         }
-        actions.push(async () => {
-          for (const deleteFn of deletes) {
-            await deleteFn();
-          }
-          await processUpsert(sourceObject, ids[0]);
-        });
+        actions.push(
+          () => 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 runSyncActions(deletes, actionConcurrency);
+    await Promise.all(deletes.map((d) => d()));
   }
-  await runSyncActions(actions, actionConcurrency);
+  await Promise.all(actions.map((a) => a()));
   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(
@@ -2255,64 +2200,20 @@ import {
 } from "@uniformdev/canvas";
 import { isRichTextNodeType, isRichTextValue, walkRichTextTree } from "@uniformdev/richtext";
 import fsj4 from "fs-jetpack";
-import PQueue3 from "p-queue";
+import PQueue2 from "p-queue";
 import { join as join10 } from "path";
 
 // src/files/downloadFile.ts
-import { createWriteStream } from "fs";
 import fsj2 from "fs-jetpack";
-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;
-  }
-};
+import { join as join8 } from "path";
 var downloadFile = async ({
   fileClient,
   fileUrl,
   directory
 }) => {
   const writeDirectory = getFilesDirectory(directory);
-  const filesDirectory = join8(writeDirectory, FILES_DIRECTORY_NAME);
   const fileName = urlToFileName(fileUrl.toString());
-  const filePath = join8(filesDirectory, fileName);
-  const fileAlreadyExists = await fsj2.existsAsync(filePath);
+  const fileAlreadyExists = await fsj2.existsAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName));
   if (fileAlreadyExists) {
     return { url: fileUrl };
   }
@@ -2322,10 +2223,11 @@ var downloadFile = async ({
     return null;
   }
   if (file.sourceId) {
-    const sourceId = file.sourceId;
     try {
-      const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
-      if (hasFilePathMatchingSourceId(downloadedFilePaths, sourceId)) {
+      const hashAlreadyExists = await fsj2.findAsync(join8(writeDirectory, FILES_DIRECTORY_NAME), {
+        matching: [file.sourceId, `${file.sourceId}.*`]
+      });
+      if (hashAlreadyExists.length > 0) {
         return { id: file.id, url: fileUrl };
       }
     } catch {
@@ -2336,12 +2238,8 @@ var downloadFile = async ({
   if (!response.ok) {
     return null;
   }
-  await writeResponseBodyToFile(response, filePath);
-  const downloadedFilePathCache = downloadedFilePathCacheByDirectory.get(filesDirectory);
-  if (downloadedFilePathCache) {
-    const downloadedFilePaths = await downloadedFilePathCache;
-    downloadedFilePaths.add(fileName);
-  }
+  const fileBuffer = await response.arrayBuffer();
+  await fsj2.writeAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
   return { id: file.id, url: fileUrl };
 };
 
@@ -2353,10 +2251,10 @@ import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
 import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
-import PQueue2 from "p-queue";
+import PQueue from "p-queue";
 import { join as join9 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
-var fileUploadQueue = new PQueue2({ concurrency: 10 });
+var fileUploadQueue = new PQueue({ concurrency: 10 });
 var uploadFile = async ({
   fileClient,
   fileUrl,
@@ -2536,9 +2434,9 @@ var walkFileUrlsForCompositionOrEntry = ({
 };
 
 // src/files/files.ts
-var fileDownloadQueue = new PQueue3({ concurrency: 10 });
-var fileUploadQueue2 = new PQueue3({ concurrency: 10 });
-var fileUrlReplacementQueue = new PQueue3({ concurrency: 10 });
+var fileDownloadQueue = new PQueue2({ concurrency: 10 });
+var fileUploadQueue2 = new PQueue2({ concurrency: 10 });
+var fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
 var downloadFileForAsset = async ({
   asset,
   directory,
@@ -2865,7 +2763,6 @@ 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",
@@ -2964,7 +2861,6 @@ var AssetPullModule = {
       target,
       mode,
       whatIf,
-      actionConcurrency: ASSET_PULL_ACTION_CONCURRENCY,
       allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -2992,7 +2888,6 @@ 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",
@@ -3068,7 +2963,6 @@ var AssetPushModule = {
       target,
       mode,
       whatIf,
-      actionConcurrency: ASSET_PUSH_ACTION_CONCURRENCY,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
@@ -12269,20 +12163,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({
@@ -12499,12 +12379,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);
@@ -12908,7 +12782,7 @@ import yargs40 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
-import PQueue4 from "p-queue";
+import PQueue3 from "p-queue";
 import { Svix } from "svix";
 import * as z3 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
@@ -12956,7 +12830,7 @@ var WebhooksClient = class extends ApiClient4 {
     };
   }
   async get() {
-    const webhooksAPIQueue = new PQueue4({ concurrency: 10 });
+    const webhooksAPIQueue = new PQueue3({ 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.70.1-alpha.10+6e0ecaf156",
+  "version": "20.70.1-alpha.6+9aeb4f32ae",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   "dependencies": {
     "@inquirer/prompts": "^8.5.2",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/canvas": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/context": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/files": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/project-map": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/redirect": "20.70.1-alpha.10+6e0ecaf156",
-    "@uniformdev/richtext": "20.70.1-alpha.10+6e0ecaf156",
+    "@uniformdev/assets": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/canvas": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/context": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/files": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/project-map": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/redirect": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/richtext": "20.70.1-alpha.6+9aeb4f32ae",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.2",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e0ecaf15691da45ddab84cc3ca11c4d048bbbdd"
+  "gitHead": "9aeb4f32aeef86de9ce119eeb1516f5f8c6b6063"
 }