@uniformdev/cli 19.214.1-alpha.32 → 19.214.1-alpha.34

package/dist/index.mjs

@@ -653,6 +653,13 @@ var urlToFileName = (url, hash) => {
   const fileExtension = urlToFileExtension(url);
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
+var hashToPartialPathname = (hash) => {
+  try {
+    return Buffer.from(hash, "base64").toString("utf8");
+  } catch {
+    return null;
+  }
+};
 
 // src/files/deleteDownloadedFileByUrl.ts
 var deleteDownloadedFileByUrl = async (url, options) => {
@@ -677,7 +684,7 @@ 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 join6 } from "path";
 
 // src/files/downloadFile.ts
@@ -831,32 +838,22 @@ var uploadFile = async ({
   }) ?? null;
 };
 
-// src/files/walkFilesForCompositionOrEntry.ts
+// src/files/walkFileUrlsForCompositionOrEntry.ts
 import {
   getPropertiesValue,
   walkNodeTree,
   walkPropertyValues
 } from "@uniformdev/canvas";
-import PQueue2 from "p-queue";
 var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.uniform\.(rocks|global)\/([^"]*?))"/g;
-var walkFilesForCompositionOrEntry = async ({
+var walkFileUrlsForCompositionOrEntry = ({
   entity,
-  directory,
-  fileClient,
   callback
 }) => {
-  const urlReplacementMap = /* @__PURE__ */ new Map();
-  const fileDownloadQueue = new PQueue2({ concurrency: 3 });
   const thumbnail = "entry" in entity ? entity.entry._thumbnail : void 0;
   if (typeof thumbnail === "string") {
     const isUniformFile = `"${thumbnail}"`.match(UNIFORM_FILE_MATCH) !== null;
     if (isUniformFile) {
-      fileDownloadQueue.add(async () => {
-        const result = await callback({ fileUrl: thumbnail, directory, fileClient });
-        if (result) {
-          urlReplacementMap.set(thumbnail, result.url);
-        }
-      });
+      callback({ fileUrl: thumbnail });
     }
   }
   walkNodeTree("entry" in entity ? entity.entry : entity.composition, ({ node }) => {
@@ -876,17 +873,10 @@ var walkFilesForCompositionOrEntry = async ({
         if (!isUniformFile) {
           return;
         }
-        fileDownloadQueue.add(async () => {
-          const result = await callback({ fileUrl: value, directory, fileClient });
-          if (result) {
-            urlReplacementMap.set(value, result.url);
-          }
-        });
+        callback({ fileUrl: value });
       });
     });
   });
-  await fileDownloadQueue.onIdle();
-  return urlReplacementMap;
 };
 
 // src/files/files.ts
@@ -981,26 +971,42 @@ var downloadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  await walkFilesForCompositionOrEntry({
+  const fileDownloadQueue = new PQueue2({ concurrency: 3 });
+  await walkFileUrlsForCompositionOrEntry({
     entity,
-    directory,
-    fileClient,
-    callback: downloadFile
+    callback: ({ fileUrl }) => {
+      fileDownloadQueue.add(async () => {
+        await downloadFile({ fileUrl, directory, fileClient });
+      });
+    }
   });
+  await fileDownloadQueue.onIdle();
 };
 var uploadFilesForCompositionOrEntry = async ({
   entity,
   directory,
   fileClient
 }) => {
-  const replacements = await walkFilesForCompositionOrEntry({
+  const fileUploadQueue2 = new PQueue2({ concurrency: 3 });
+  const urlReplacementMap = /* @__PURE__ */ new Map();
+  walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
-    directory,
-    fileClient,
-    callback: uploadFile
+    callback: async ({ fileUrl }) => {
+      fileUploadQueue2.add(async () => {
+        const upload = await uploadFile({
+          directory,
+          fileUrl,
+          fileClient
+        });
+        if (upload !== null) {
+          urlReplacementMap.set(fileUrl, upload.url);
+        }
+      });
+    }
   });
+  await fileUploadQueue2.onIdle();
   let entityAsString = JSON.stringify(entity);
-  for (const [key, value] of replacements.entries()) {
+  for (const [key, value] of urlReplacementMap.entries()) {
     entityAsString = entityAsString.replaceAll(`"${key}"`, `"${value}"`);
   }
   return JSON.parse(entityAsString);
@@ -1014,12 +1020,10 @@ var replaceRemoteUrlsWithLocalReferences = async ({
   let sourceEntityAsString = JSON.stringify(sourceEntity);
   const targetEntityAsString = JSON.stringify(targetEntity);
   const writeDirectory = getFilesDirectory(directory);
-  const fileUrlReplacementQueue = new PQueue3({ concurrency: 3 });
-  await walkFilesForCompositionOrEntry({
+  const fileUrlReplacementQueue = new PQueue2({ concurrency: 3 });
+  walkFileUrlsForCompositionOrEntry({
     entity: sourceEntity.object,
-    directory,
-    fileClient,
-    callback: async ({ fileUrl }) => {
+    callback: ({ fileUrl }) => {
       fileUrlReplacementQueue.add(async () => {
         try {
           const localFileName = urlToFileName(fileUrl);
@@ -1053,16 +1057,13 @@ var replaceRemoteUrlsWithLocalReferences = async ({
 };
 var replaceLocalUrlsWithRemoteReferences = async ({
   entity,
-  directory,
   fileClient
 }) => {
   let entityAsString = JSON.stringify(entity);
-  const fileUrlReplacementQueue = new PQueue3({ concurrency: 3 });
-  await walkFilesForCompositionOrEntry({
+  const fileUrlReplacementQueue = new PQueue2({ concurrency: 3 });
+  walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
-    directory,
-    fileClient,
-    callback: async ({ fileUrl }) => {
+    callback: ({ fileUrl }) => {
       fileUrlReplacementQueue.add(async () => {
         try {
           const hash = urlToHash(fileUrl);
@@ -1088,13 +1089,6 @@ var replaceLocalUrlsWithRemoteReferences = async ({
 var escapeRegExp = (string) => {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
-var hashToPartialPathname = (hash) => {
-  try {
-    return Buffer.from(hash, "base64").toString("utf8");
-  } catch {
-    return null;
-  }
-};
 var findUrlMatchingPartialPathname = (source, pathname) => {
   const escapedPathname = escapeRegExp(pathname);
   const regex = new RegExp(
@@ -2843,7 +2837,6 @@ var CompositionPushModule = {
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
-          directory,
           fileClient
         });
       },
@@ -4540,7 +4533,6 @@ var EntryPushModule = {
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
-          directory,
           fileClient
         });
       },
@@ -5024,7 +5016,6 @@ var EntryPatternPushModule = {
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
-          directory,
           fileClient
         });
       },
@@ -8387,7 +8378,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.214.0",
+  version: "20.0.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.214.1-alpha.32+fb2084b713",
+  "version": "19.214.1-alpha.34+476b7be79b",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/canvas": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/context": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/files": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/project-map": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/redirect": "19.214.1-alpha.32+fb2084b713",
-    "@uniformdev/richtext": "19.214.1-alpha.32+fb2084b713",
+    "@uniformdev/assets": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/canvas": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/context": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/files": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/project-map": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/redirect": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/richtext": "19.214.1-alpha.34+476b7be79b",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb2084b713e551eb79a28c6d8a372f3b3038d02e"
+  "gitHead": "476b7be79b950e65641ffb8698a13bc5d9b966f8"
 }