@uniformdev/cli 20.80.2-alpha.17.sha-6b1014c36e → 20.80.2-alpha.22.sha-545d46ba66

package/dist/index.mjs

@@ -2814,18 +2814,20 @@ var downloadFile = async ({
   fileClient,
   fileUrl,
   fileId,
-  directory
+  directory,
+  expectedSize
 }) => {
   const writeDirectory = getFilesDirectory(directory);
   const filesDirectory = join10(writeDirectory, FILES_DIRECTORY_NAME);
   const fileName = urlToFileName(fileUrl.toString());
   const filePath = join10(filesDirectory, fileName);
   const fileAlreadyExists = await fsj2.existsAsync(filePath);
-  if (fileAlreadyExists) {
+  const localCopyIsStale = fileAlreadyExists && expectedSize !== void 0 && (await fsj2.inspectAsync(filePath))?.size !== expectedSize;
+  if (fileAlreadyExists && !localCopyIsStale) {
     return { id: fileId, url: fileUrl };
   }
   const file = await getFileMetadata({ fileClient, fileId, fileUrl });
-  if (file?.sourceId) {
+  if (!localCopyIsStale && file?.sourceId) {
     const sourceId = file.sourceId;
     try {
       const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
@@ -2870,7 +2872,7 @@ var downloadFile = async ({
 
 // src/files/uploadFile.ts
 import { preferredType } from "@thi.ng/mime";
-import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
+import { FILE_MIME_TYPES_ALL, FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
 import { fileTypeFromFile } from "file-type";
 import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
@@ -2885,6 +2887,7 @@ var uploadFile = async ({
   fileUrl,
   directory,
   fileId,
+  declaredMediaType,
   warnIfLocalCopyMissing = true
 }) => {
   const key = `${fileId}-${fileUrl}`;
@@ -2893,6 +2896,7 @@ var uploadFile = async ({
     return result2 ?? null;
   }
   const promise = fileUploadQueue.add(async () => {
+    let uploadBody;
     try {
       const writeDirectory = getFilesDirectory(directory);
       const hash = urlToHash(fileUrl);
@@ -2916,7 +2920,15 @@ var uploadFile = async ({
         return null;
       }
       const fileName = getFileNameFromUrl(fileUrl);
-      let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromFile(expectedFilePath))?.mime;
+      let mimeType = declaredMediaType && FILE_MIME_TYPES_ALL.includes(declaredMediaType) ? declaredMediaType : void 0;
+      if (declaredMediaType && !mimeType) {
+        console.warn(
+          `Asset declares unsupported media type "${declaredMediaType}" for ${fileUrl}, detecting instead`
+        );
+      }
+      if (!mimeType) {
+        mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromFile(expectedFilePath))?.mime;
+      }
       if (!mimeType) {
         mimeType = preferredType(fileUrl.split(".").at(-1) ?? "");
       }
@@ -2926,7 +2938,6 @@ var uploadFile = async ({
       if (mimeType === "audio/x-flac") {
         mimeType = "audio/flac";
       }
-      let uploadBody;
       let uploadSize = fileInspect.size;
       if (mimeType === "image/svg+xml") {
         const fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
@@ -2942,6 +2953,7 @@ var uploadFile = async ({
         uploadSize = uploadBody.length;
       } else {
         uploadBody = createReadStream(expectedFilePath);
+        uploadBody.on("error", () => void 0);
       }
       const { width, height } = await (async () => {
         if (!mimeType.startsWith("image/")) {
@@ -3002,6 +3014,9 @@ var uploadFile = async ({
       return { id, url: uploadedFileUrl };
     } catch (e) {
       console.warn(`Failed to upload file ${fileUrl}`, e);
+      if (uploadBody && "destroy" in uploadBody) {
+        uploadBody.destroy();
+      }
       return null;
     }
   });
@@ -3085,7 +3100,7 @@ var downloadFileForAsset = async ({
   if (!fileUrl) {
     return null;
   }
-  return downloadFile({ fileUrl, fileId, directory, fileClient });
+  return downloadFile({ fileUrl, fileId, directory, fileClient, expectedSize: fields.size?.value });
 };
 var uploadFileForAsset = async ({
   asset,
@@ -3102,6 +3117,7 @@ var uploadFileForAsset = async ({
     directory,
     fileClient,
     fileId,
+    declaredMediaType: asset.asset.fields?.mediaType?.value,
     warnIfLocalCopyMissing: false
   });
 };
@@ -3179,7 +3195,11 @@ var selectComparableAsset = ({ asset }) => ({
   _name: asset._name,
   _dataResources: asset._dataResources,
   labels: asset.labels,
-  fields: selectWritableAssetFields(asset.fields)
+  fields: {
+    ...selectWritableAssetFields(asset.fields),
+    mediaType: asset.fields?.mediaType,
+    size: asset.fields?.size
+  }
 });
 var compareAssetsWithoutUrls = (source, target) => {
   return serializedDequal(selectComparableAsset(source.object), selectComparableAsset(target.object));
@@ -9508,6 +9528,7 @@ var PromptPushModule = {
     proxy,
     directory,
     mode,
+    whatIf,
     project: projectId,
     diff: diffMode,
     allowEmptySource,
@@ -9543,6 +9564,7 @@ var PromptPushModule = {
       source,
       target,
       mode,
+      whatIf,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
@@ -13415,12 +13437,9 @@ var selectFilename2 = (source) => {
   return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
 };
 var selectDisplayName17 = (source) => {
-  if (typeof source.sourceUrl !== "string") {
-    return `${source.id ?? "redirect"} (id: ${source.id})`;
-  }
   let pathName = source.sourceUrl;
   if (pathName.length > 30) {
-    const slashIndex = pathName.indexOf("/", pathName.length - 30);
+    const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
     pathName = "..." + pathName.substring(slashIndex);
   }
   return `${pathName} (id: ${source.id})`;
@@ -13690,11 +13709,7 @@ var RedirectDefinitionUpdateModule = {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getRedirectClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
-    if (!file || typeof file !== "object" || Array.isArray(file)) {
-      console.error(`${filename} does not contain a YAML or JSON object`);
-      process.exit(1);
-    }
-    await client.upsertRedirect("redirect" in file ? file.redirect : file);
+    await client.upsertRedirect(file);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.80.2-alpha.17.sha-6b1014c36e",
+  "version": "20.80.2-alpha.22.sha-545d46ba66",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,14 +27,14 @@
   "dependencies": {
     "@inquirer/prompts": "^8.5.2",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/automations-sdk": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/canvas": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/context": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/files": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/project-map": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/redirect": "20.80.2-alpha.17.sha-6b1014c36e",
-    "@uniformdev/richtext": "20.80.2-alpha.17.sha-6b1014c36e",
+    "@uniformdev/assets": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/automations-sdk": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/canvas": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/context": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/files": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/project-map": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/redirect": "20.80.2-alpha.22.sha-545d46ba66",
+    "@uniformdev/richtext": "20.80.2-alpha.22.sha-545d46ba66",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.2",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6b1014c36e49b6ec5cf3e347070d18ca8095c0e0"
+  "gitHead": "545d46ba66a16e24a82d3f832ebf5ea342b79d56"
 }