@uniformdev/cli 20.67.1-alpha.22 → 20.67.1-alpha.23

package/dist/index.mjs

@@ -724,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;
@@ -778,7 +777,6 @@ function serializedDequal(foo, bar) {
 }
 
 // src/sync/syncEngine.ts
-var DEFAULT_SYNC_ACTION_CONCURRENCY = 10;
 var syncEngineEvents = mitt();
 async function syncEngine({
   source,
@@ -792,8 +790,7 @@ async function syncEngine({
   onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
-  onError,
-  actionConcurrency = DEFAULT_SYNC_ACTION_CONCURRENCY
+  onError
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
@@ -912,7 +909,7 @@ async function syncEngine({
           deletes.push(() => processDelete(targetObject));
         }
         actions.push(
-          () => runSyncActions(deletes, actionConcurrency).then(() => processUpsert(sourceObject, ids[0]))
+          () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
         );
       } else {
         actions.push(() => processUpsert(sourceObject, ids[0]));
@@ -931,18 +928,11 @@ async function syncEngine({
     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;
-  }
-  const queue = new PQueue({ concurrency: actionConcurrency });
-  await queue.addAll(actions);
-};
 var SyncEngineError = class _SyncEngineError extends Error {
   constructor(innerError, sourceObject) {
     super(
@@ -2210,59 +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 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 = `${filePath}.${process.pid}.${Date.now()}.download`;
-  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 };
   }
@@ -2272,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 {
@@ -2286,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 };
 };
 
@@ -2303,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,
@@ -2486,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,
@@ -12834,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";
@@ -12882,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.67.1-alpha.22+329be3528c",
+  "version": "20.67.1-alpha.23+6cbc37f1d4",
   "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.67.1-alpha.22+329be3528c",
-    "@uniformdev/canvas": "20.67.1-alpha.22+329be3528c",
-    "@uniformdev/context": "20.67.1-alpha.22+329be3528c",
-    "@uniformdev/files": "20.67.1-alpha.22+329be3528c",
-    "@uniformdev/project-map": "20.67.1-alpha.22+329be3528c",
-    "@uniformdev/redirect": "20.67.1-alpha.22+329be3528c",
-    "@uniformdev/richtext": "20.67.1-alpha.22+329be3528c",
+    "@uniformdev/assets": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/canvas": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/context": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/files": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/project-map": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/redirect": "20.67.1-alpha.23+6cbc37f1d4",
+    "@uniformdev/richtext": "20.67.1-alpha.23+6cbc37f1d4",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "329be3528c6e4e6d01316386d18059ec0ffcd172"
+  "gitHead": "6cbc37f1d4431eddfc8e478612bb45463bc9b5bd"
 }