@uniformdev/cli 19.194.1-alpha.3 → 19.194.1-alpha.4

package/dist/index.mjs

@@ -460,6 +460,14 @@ import { UncachedFileClient } from "@uniformdev/files";
 
 // src/files/index.ts
 import { preferredType } from "@thi.ng/mime";
+import {
+  findParameterInNodeTree,
+  getLocalizedPropertyValues,
+  isAssetData,
+  isAssetParamValue,
+  isComposition,
+  isEntry
+} from "@uniformdev/canvas";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
 import { createHash } from "crypto";
 import fsj from "fs-jetpack";
@@ -507,6 +515,10 @@ var urlToFileName = (url, hash) => {
   const fileExtension = urlToFileExtension(url);
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
+var fileIdToFileName = (asset) => {
+  const fileExtension = urlToFileExtension(asset.asset.fields?.url?.value ?? "");
+  return asset.asset.fields?.file?.value && fileExtension ? `${asset.asset.fields?.file?.value}.${fileExtension}` : "";
+};
 var getFilesDirectory = (directory) => {
   const isPackage = isPathAPackageFile(directory);
   return isPackage ? dirname(directory) : (
@@ -519,10 +531,14 @@ var getFilesDirectory = (directory) => {
 var getUniformFileUrlMatches = (string) => {
   return string.matchAll(/"(https:\/\/([^"]*?)?img\.uniform\.(rocks|global)\/([^"]*?))"/g);
 };
-var deleteDownloadedFileByUrl = async (url, options) => {
+var deleteDownloadedFile = async (asset, options) => {
+  const fileNameViaURL = urlToFileName(asset.asset.fields?.url?.value ?? "");
+  const fileNameViaFileId = fileIdToFileName(asset);
   const writeDirectory = getFilesDirectory(options.directory);
-  const fileName = urlToFileName(url);
-  const fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileName);
+  let fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileNameViaFileId);
+  if (!await fsj.existsAsync(fileToDelete)) {
+    fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileNameViaURL);
+  }
   try {
     await fsj.removeAsync(fileToDelete);
   } catch {
@@ -533,46 +549,145 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
   const objectAsString = JSON.stringify(object);
   const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   const writeDirectory = getFilesDirectory(options.directory);
+  const urlsToFileIds = /* @__PURE__ */ new Map();
+  const uniformObject = object.object;
+  if (isAssetData(uniformObject) && uniformObject.asset.fields?.file?.value) {
+    const url = uniformObject.asset.fields?.url?.value ?? "";
+    const fileId = uniformObject.asset.fields.file.value;
+    if (url) {
+      try {
+        const urlObject = new URL(url);
+        const fileExtension = urlToFileExtension(url);
+        const fileName = `${fileId}.${fileExtension}`;
+        const fileAlreadyExists = await fsj.existsAsync(join2(writeDirectory, FILES_DIRECTORY_NAME, fileName));
+        urlsToFileIds.set(url, fileId);
+        if (!fileAlreadyExists) {
+          const file = await options.fileClient.get({ id: fileId }).catch(() => null);
+          if (file) {
+            const fetchUrl = `${urlObject.origin}${urlObject.pathname}?format=original`;
+            const response = await fetch(fetchUrl);
+            if (response.ok) {
+              const fileBuffer = await response.arrayBuffer();
+              await fsj.writeAsync(
+                join2(writeDirectory, FILES_DIRECTORY_NAME, fileName),
+                Buffer.from(fileBuffer)
+              );
+            }
+          } else {
+            console.warn(`Skipping file ${url} as it does not exist in the project anymore`);
+          }
+        }
+      } catch (e) {
+        console.warn(`Failed to download file: id - ${fileId} url - ${url}`, e);
+      }
+    }
+  } else if (isEntry(uniformObject) || isComposition(uniformObject)) {
+    const sourceObject = isEntry(uniformObject) ? uniformObject.entry : uniformObject.composition;
+    const foundAssetParamValues = findParameterInNodeTree(
+      sourceObject,
+      (parameter) => parameter.type === "asset"
+    );
+    for (const foundAssetParamValue of foundAssetParamValues) {
+      const assetParamValue = foundAssetParamValue.parameter;
+      if (!assetParamValue) {
+        continue;
+      }
+      const allValues = getLocalizedPropertyValues(
+        assetParamValue
+      );
+      for (const [, paramValue] of allValues) {
+        if (isAssetParamValue(paramValue)) {
+          for (const item of paramValue) {
+            const url = item.fields?.url?.value ?? "";
+            const fileId = item.fields?.file?.value;
+            if (url && fileId) {
+              const urlObject = new URL(url);
+              const fileExtension = urlToFileExtension(url);
+              const fileName = `${fileId}.${fileExtension}`;
+              const fileAlreadyExists = await fsj.existsAsync(
+                join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
+              );
+              urlsToFileIds.set(url, fileId);
+              if (!fileAlreadyExists) {
+                const file = await options.fileClient.get({ id: fileId }).catch(() => null);
+                if (file) {
+                  const fetchUrl = `${urlObject.origin}${urlObject.pathname}?format=original`;
+                  const response = await fetch(fetchUrl);
+                  if (response.ok) {
+                    const fileBuffer = await response.arrayBuffer();
+                    await fsj.writeAsync(
+                      join2(writeDirectory, FILES_DIRECTORY_NAME, fileName),
+                      Buffer.from(fileBuffer)
+                    );
+                  }
+                } else {
+                  console.warn(`Skipping file ${url} as it does not exist in the project anymore`);
+                }
+              }
+            } else {
+              console.warn(`Skipping file because it does not have url or fileId`, item);
+            }
+          }
+        }
+      }
+    }
+  }
   if (uniformFileUrlMatches) {
     const fileDownloadQueue = new PQueue({ concurrency: 10 });
     for (const match of uniformFileUrlMatches) {
       const url = new URL(match[1]);
-      fileDownloadQueue.add(async () => {
-        try {
-          const fileName = urlToFileName(url.toString());
-          const fileAlreadyExists = await fsj.existsAsync(
-            join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
-          );
-          if (fileAlreadyExists) {
-            return;
-          }
-          const file = await options.fileClient.get({ url: url.toString() }).catch(() => null);
-          if (!file) {
-            console.warn(`Skipping file ${url} as it does not exist in the project anymore`);
-            return;
-          }
-          if (file.sourceId) {
-            try {
-              const hashAlreadyExists = await fsj.findAsync(join2(writeDirectory, FILES_DIRECTORY_NAME), {
-                matching: [file.sourceId, `${file.sourceId}.*`]
-              });
-              if (hashAlreadyExists.length > 0) {
-                return;
+      if (!urlsToFileIds.has(url.toString())) {
+        fileDownloadQueue.add(async () => {
+          try {
+            const fileName = urlToFileName(url.toString());
+            const fileAlreadyExists = await fsj.existsAsync(
+              join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
+            );
+            if (fileAlreadyExists) {
+              return;
+            }
+            const file = await options.fileClient.get({ url: url.toString() }).catch(() => null);
+            if (!file) {
+              console.warn(`Skipping file ${url} as it does not exist in the project anymore`);
+              return;
+            }
+            if (file.sourceId) {
+              try {
+                const hashAlreadyExists = await fsj.findAsync(join2(writeDirectory, FILES_DIRECTORY_NAME), {
+                  matching: [file.sourceId, `${file.sourceId}.*`]
+                });
+                if (hashAlreadyExists.length > 0) {
+                  return;
+                }
+              } catch {
               }
-            } catch {
             }
+            if (file.id) {
+              try {
+                const hashAlreadyExists = await fsj.findAsync(join2(writeDirectory, FILES_DIRECTORY_NAME), {
+                  matching: [file.id, `${file.id}.*`]
+                });
+                if (hashAlreadyExists.length > 0) {
+                  return;
+                }
+              } catch {
+              }
+            }
+            const fetchUrl = `${url.origin}${url.pathname}?format=original`;
+            const response = await fetch(fetchUrl);
+            if (!response.ok) {
+              return;
+            }
+            const fileBuffer = await response.arrayBuffer();
+            await fsj.writeAsync(
+              join2(writeDirectory, FILES_DIRECTORY_NAME, fileName),
+              Buffer.from(fileBuffer)
+            );
+          } catch {
+            console.warn(`Failed to download file ${url}`);
           }
-          const fetchUrl = `${url.origin}${url.pathname}?format=original`;
-          const response = await fetch(fetchUrl);
-          if (!response.ok) {
-            return;
-          }
-          const fileBuffer = await response.arrayBuffer();
-          await fsj.writeAsync(join2(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
-        } catch {
-          console.warn(`Failed to download file ${url}`);
-        }
-      });
+        });
+      }
     }
     await fileDownloadQueue.onIdle();
   }
@@ -681,6 +796,60 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   return JSON.parse(objectAsString);
 };
 var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
+  const urlReplacements = /* @__PURE__ */ new Map();
+  const uniformObject = object.object;
+  if (isAssetData(uniformObject) && uniformObject.asset?.fields?.file?.value) {
+    const fileId = uniformObject.asset.fields.file.value;
+    if (fileId) {
+      const file = await options.fileClient.get({ id: fileId });
+      if (file.url && uniformObject.asset.fields?.url?.value) {
+        urlReplacements.set(uniformObject.asset.fields.url.value, file.url);
+        uniformObject.asset.fields = {
+          ...uniformObject.asset.fields,
+          url: {
+            ...uniformObject.asset.fields.url,
+            value: file.url
+          }
+        };
+        return object;
+      }
+    }
+  } else if (isEntry(uniformObject) || isComposition(uniformObject)) {
+    const sourceObject = isEntry(uniformObject) ? uniformObject.entry : uniformObject.composition;
+    const foundAssetParamValues = findParameterInNodeTree(
+      sourceObject,
+      (parameter) => parameter.type === "asset"
+    );
+    for (const foundAssetParamValue of foundAssetParamValues) {
+      const assetParamValue = foundAssetParamValue.parameter;
+      if (!assetParamValue) {
+        continue;
+      }
+      const allValues = getLocalizedPropertyValues(
+        assetParamValue
+      );
+      for (const [, paramValue] of allValues) {
+        if (isAssetParamValue(paramValue)) {
+          for (const item of paramValue) {
+            const fileId = item.fields?.file?.value;
+            if (fileId) {
+              const file = await options.fileClient.get({ id: fileId });
+              if (file.url && item.fields?.url?.value) {
+                urlReplacements.set(item.fields.url.value, file.url);
+                item.fields = {
+                  ...item.fields,
+                  url: {
+                    ...item.fields.url,
+                    value: file.url
+                  }
+                };
+              }
+            }
+          }
+        }
+      }
+    }
+  }
   let objectAsString = JSON.stringify(object);
   const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   if (uniformFileUrlMatches) {
@@ -714,58 +883,94 @@ var replaceRemoteUrlsWithLocalReferences = async (sourceObject, targetObject, op
   const targetObjectAsString = JSON.stringify(targetObject);
   const uniformFileUrlMatches = getUniformFileUrlMatches(sourceObjectAsString);
   const writeDirectory = getFilesDirectory(options.directory);
+  const urlReplacements = /* @__PURE__ */ new Map();
+  if (isAssetData(sourceObject) && sourceObject.asset.fields?.file?.value) {
+    const fileId = sourceObject.asset.fields?.file?.value;
+    if (fileId) {
+      const file = await options.fileClient.get({ id: fileId });
+      if (file.url && sourceObject.asset.fields?.url?.value) {
+        urlReplacements.set(sourceObject.asset.fields.url.value, file.url);
+        sourceObject.asset.fields = {
+          ...sourceObject.asset.fields,
+          url: {
+            ...sourceObject.asset.fields.url,
+            value: file.url
+          }
+        };
+        return sourceObject;
+      }
+    }
+  } else if (isEntry(sourceObject) || isComposition(sourceObject)) {
+    const object = isEntry(sourceObject) ? sourceObject.entry : sourceObject.composition;
+    const foundAssetParamValues = findParameterInNodeTree(object, (parameter) => parameter.type === "asset");
+    for (const foundAssetParamValue of foundAssetParamValues) {
+      const assetParamValue = foundAssetParamValue.parameter;
+      if (!assetParamValue) {
+        continue;
+      }
+      const allValues = getLocalizedPropertyValues(
+        assetParamValue
+      );
+      for (const [, paramValue] of allValues) {
+        if (isAssetParamValue(paramValue)) {
+          for (const item of paramValue) {
+            const fileId = item.fields?.file?.value;
+            if (fileId) {
+              const file = await options.fileClient.get({ id: fileId });
+              if (file.url && item.fields?.url?.value) {
+                urlReplacements.set(item.fields.url.value, file.url);
+                item.fields = {
+                  ...item.fields,
+                  url: {
+                    ...item.fields.url,
+                    value: file.url
+                  }
+                };
+              }
+            }
+          }
+        }
+      }
+    }
+  }
   if (uniformFileUrlMatches) {
     const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
-      fileUrlReplacementQueue.add(async () => {
-        try {
-          const localFileName = urlToFileName(url);
-          const fileExistsLocally = await fsj.existsAsync(
-            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
-          );
-          if (fileExistsLocally) {
-            return;
-          }
-          const file = await options.fileClient.get({ url }).catch(() => null);
-          if (!file || !file.sourceId) {
-            return;
-          }
-          const originalPartialPath = hashToPartialPathname(file.sourceId);
-          if (!originalPartialPath) {
-            return;
-          }
-          const originalUrl = findUrlMatchingPartialPathname(targetObjectAsString, originalPartialPath);
-          if (!originalUrl) {
-            return;
+      if (urlReplacements.has(url)) {
+        sourceObjectAsString = sourceObjectAsString.replaceAll(`"${url}"`, `"${urlReplacements.get(url)}"`);
+      } else {
+        fileUrlReplacementQueue.add(async () => {
+          try {
+            const localFileName = urlToFileName(url);
+            const fileExistsLocally = await fsj.existsAsync(
+              join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
+            );
+            if (fileExistsLocally) {
+              return;
+            }
+            const file = await options.fileClient.get({ url }).catch(() => null);
+            if (!file || !file.sourceId) {
+              return;
+            }
+            const originalPartialPath = hashToPartialPathname(file.sourceId);
+            if (!originalPartialPath) {
+              return;
+            }
+            const originalUrl = findUrlMatchingPartialPathname(targetObjectAsString, originalPartialPath);
+            if (!originalUrl) {
+              return;
+            }
+            sourceObjectAsString = sourceObjectAsString.replaceAll(`"${url}"`, `"${originalUrl}"`);
+          } catch {
           }
-          sourceObjectAsString = sourceObjectAsString.replaceAll(`"${url}"`, `"${originalUrl}"`);
-        } catch {
-        }
-      });
+        });
+      }
     }
     await fileUrlReplacementQueue.onIdle();
   }
   return JSON.parse(sourceObjectAsString);
 };
-var updateAssetFileIdBasedOnUrl = async (asset, options) => {
-  if (!asset.asset.fields) {
-    return asset;
-  }
-  const fileUrl = asset.asset.fields.url?.value;
-  if (!fileUrl) {
-    return asset;
-  }
-  const file = await options.fileClient.get({ url: fileUrl }).catch(() => null);
-  if (!file) {
-    return asset;
-  }
-  asset.asset.fields.file = {
-    type: "file",
-    value: file.id
-  };
-  return asset;
-};
 var legacyUrlToHash = (url) => {
   const hash = createHash("sha256");
   hash.update(url);
@@ -922,7 +1127,7 @@ var AssetPullModule = {
       if (!asset.asset.fields?.url?.value) {
         return;
       }
-      await deleteDownloadedFileByUrl(asset.asset.fields.url.value, {
+      await deleteDownloadedFile(asset, {
         directory
       });
     };
@@ -965,9 +1170,6 @@ var AssetPullModule = {
             fileClient
           }
         );
-        if (sourceObjectWithPotentiallySwappedUrl.object.asset.fields?.url && targetObject.object.asset.fields?.url && sourceObjectWithPotentiallySwappedUrl.object.asset.fields.url.value === targetObject.object.asset.fields.url.value) {
-          targetObject.object.asset.fields.file = sourceObjectWithPotentiallySwappedUrl.object.asset.fields.file;
-        }
         return sourceObjectWithPotentiallySwappedUrl;
       },
       onBeforeWriteObject: async (sourceObject) => {
@@ -1061,12 +1263,6 @@ var AssetPushModule = {
         const sourceObjectWithNewFileUrls = await swapOutUniformFileUrlsForTargetProject(sourceObject, {
           fileClient
         });
-        sourceObjectWithNewFileUrls.object = await updateAssetFileIdBasedOnUrl(
-          sourceObjectWithNewFileUrls.object,
-          {
-            fileClient
-          }
-        );
         return sourceObjectWithNewFileUrls;
       },
       onBeforeWriteObject: async (sourceObject) => {
@@ -1074,12 +1270,6 @@ var AssetPushModule = {
           directory,
           fileClient
         });
-        sourceObjectWithNewFileUrls.object = await updateAssetFileIdBasedOnUrl(
-          sourceObjectWithNewFileUrls.object,
-          {
-            fileClient
-          }
-        );
         return sourceObjectWithNewFileUrls;
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.194.1-alpha.3+9ba3c9e6f0",
+  "version": "19.194.1-alpha.4+a46691a815",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.194.1-alpha.3+9ba3c9e6f0",
-    "@uniformdev/canvas": "19.194.1-alpha.3+9ba3c9e6f0",
-    "@uniformdev/context": "19.194.1-alpha.3+9ba3c9e6f0",
-    "@uniformdev/files": "19.194.1-alpha.3+9ba3c9e6f0",
-    "@uniformdev/project-map": "19.194.1-alpha.3+9ba3c9e6f0",
-    "@uniformdev/redirect": "19.194.1-alpha.3+9ba3c9e6f0",
+    "@uniformdev/assets": "19.194.1-alpha.4+a46691a815",
+    "@uniformdev/canvas": "19.194.1-alpha.4+a46691a815",
+    "@uniformdev/context": "19.194.1-alpha.4+a46691a815",
+    "@uniformdev/files": "19.194.1-alpha.4+a46691a815",
+    "@uniformdev/project-map": "19.194.1-alpha.4+a46691a815",
+    "@uniformdev/redirect": "19.194.1-alpha.4+a46691a815",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9ba3c9e6f09642d4f7e77a9f4b90f416f2521073"
+  "gitHead": "a46691a815b94e40c8f5e8d982e2cf66938a4548"
 }