@uniformdev/cli 19.42.1-alpha.6 → 19.42.1-alpha.7

package/dist/index.mjs

@@ -412,6 +412,7 @@ async function syncEngine({
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   log = () => {
   },
+  onBeforeCompareObjects,
   onBeforeWriteObject
 }) {
   var _a, _b;
@@ -446,12 +447,13 @@ async function syncEngine({
   }
   const actions = [];
   let sourceHasItems = false;
-  for await (const sourceObject of source.objects) {
+  for await (let sourceObject of source.objects) {
     sourceHasItems = true;
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => (o == null ? void 0 : o.object) !== (targetObject == null ? void 0 : targetObject.object));
     if (targetObject && invalidTargetObjects.length == 0) {
+      sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           const process2 = async (sourceObject2, targetObject2) => {
@@ -1469,11 +1471,15 @@ import sizeOf from "image-size";
 import PQueue from "p-queue";
 import { join as join2 } from "path";
 var FILES_DIRECTORY_NAME = "files";
-var urlToFileName = (url) => {
+var urlToHash = (url) => {
   const hash = createHash("sha256");
   hash.update(url);
-  const fileName = hash.digest("hex");
-  const fileExtension = url.split(".").pop();
+  return hash.digest("hex");
+};
+var urlToFileName = (url) => {
+  const fileName = urlToHash(url);
+  const fileNameChunks = url.split(".");
+  const fileExtension = fileNameChunks.length > 1 ? fileNameChunks.at(-1) : "";
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
 var extractAndDownloadUniformFilesForObject = async (object, options) => {
@@ -1518,13 +1524,17 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
     /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
   );
   if (uniformFileUrlMatches) {
-    const fileUploadQueue = new PQueue({ concurrency: 5 });
+    const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
+      const hash = urlToHash(url);
       fileUploadQueue.add(async () => {
         try {
-          const fileAlreadyExists = await options.fileClient.getFile({ url }).catch(() => null);
-          if (fileAlreadyExists) {
+          const fileAlreadyExistsChecks = await Promise.all([
+            options.fileClient.getFile({ projectId: options.projectId, url }).catch(() => null),
+            options.fileClient.getFile({ projectId: options.projectId, sourceId: hash }).catch(() => null)
+          ]);
+          if (fileAlreadyExistsChecks.some((check) => check !== null)) {
             return;
           }
           const localFileName = urlToFileName(url);
@@ -1559,7 +1569,9 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             mediaType: preferredType(url.split(".").at(-1) ?? ""),
             size: fileBuffer.length,
             width,
-            height
+            height,
+            projectId: options.projectId,
+            sourceId: hash
           });
           const uploadResponse = await fetch(uploadUrl, {
             method,
@@ -1592,6 +1604,35 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   }
   return JSON.parse(objectAsString);
 };
+var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
+  let objectAsString = JSON.stringify(object);
+  const uniformFileUrlMatches = objectAsString.matchAll(
+    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
+  );
+  if (uniformFileUrlMatches) {
+    const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
+    for (const match of uniformFileUrlMatches) {
+      const url = match[1];
+      const hash = urlToHash(url);
+      fileUrlReplacementQueue.add(async () => {
+        try {
+          const fileAlreadyExistsChecks = await Promise.all([
+            options.fileClient.getFile({ projectId: options.projectId, url }).catch(() => null),
+            options.fileClient.getFile({ projectId: options.projectId, sourceId: hash }).catch(() => null)
+          ]);
+          const file = fileAlreadyExistsChecks.find((check) => check !== null);
+          if (!file) {
+            return;
+          }
+          objectAsString = objectAsString.replaceAll(`"${url}"`, `"${file.url}"`);
+        } catch {
+        }
+      });
+    }
+    await fileUrlReplacementQueue.onIdle();
+  }
+  return JSON.parse(objectAsString);
+};
 
 // src/commands/canvas/commands/composition/pull.ts
 var CompositionPullModule = {
@@ -1769,10 +1810,17 @@ var CompositionPushModule = {
       mode,
       whatIf,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return swapOutUniformFileUrlsForTargetProject(sourceObject, {
+          fileClient,
+          projectId
+        });
+      },
       onBeforeWriteObject: async (sourceObject) => {
         return extractAndUploadUniformFilesForObject(sourceObject, {
           directory,
-          fileClient
+          fileClient,
+          projectId
         });
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.42.1-alpha.6+8511a0877",
+  "version": "19.42.1-alpha.7+1380aadd7",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/canvas": "19.42.1-alpha.6+8511a0877",
-    "@uniformdev/context": "19.42.1-alpha.6+8511a0877",
+    "@uniformdev/canvas": "19.42.1-alpha.7+1380aadd7",
+    "@uniformdev/context": "19.42.1-alpha.7+1380aadd7",
     "@uniformdev/files-sdk": "19.37.0",
-    "@uniformdev/project-map": "19.42.1-alpha.6+8511a0877",
-    "@uniformdev/redirect": "19.42.1-alpha.6+8511a0877",
+    "@uniformdev/project-map": "19.42.1-alpha.7+1380aadd7",
+    "@uniformdev/redirect": "19.42.1-alpha.7+1380aadd7",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8511a0877200b169973a40ab7c7684e6744f3d2f"
+  "gitHead": "1380aadd7c71f6f120f933a40e73e113518e3716"
 }