@uniformdev/cli 20.75.1-alpha.0 → 20.75.1-alpha.11

package/dist/index.mjs

@@ -2741,9 +2741,32 @@ var writeResponseBodyToFile = async (response, filePath) => {
     throw error;
   }
 };
+var getFileMetadata = async ({
+  fileClient,
+  fileId,
+  fileUrl
+}) => {
+  if (fileId) {
+    const fileById = await fileClient.get({ id: fileId }).catch(() => null);
+    if (fileById) {
+      return fileById;
+    }
+  }
+  return fileClient.get({ url: fileUrl }).catch(() => null);
+};
+var logDownloadFailure = ({
+  fileUrl,
+  filePath,
+  status
+}) => {
+  console.warn(
+    `Failed to download file ${fileUrl} (HTTP status: ${status}; expected local path: ${filePath})`
+  );
+};
 var downloadFile = async ({
   fileClient,
   fileUrl,
+  fileId,
   directory
 }) => {
   const writeDirectory = getFilesDirectory(directory);
@@ -2752,14 +2775,10 @@ var downloadFile = async ({
   const filePath = join10(filesDirectory, fileName);
   const fileAlreadyExists = await fsj2.existsAsync(filePath);
   if (fileAlreadyExists) {
-    return { url: fileUrl };
-  }
-  const file = await fileClient.get({ url: fileUrl }).catch(() => null);
-  if (!file) {
-    console.warn(`Skipping file ${fileUrl} as it does not exist in the project anymore`);
-    return null;
+    return { id: fileId, url: fileUrl };
   }
-  if (file.sourceId) {
+  const file = await getFileMetadata({ fileClient, fileId, fileUrl });
+  if (file?.sourceId) {
     const sourceId = file.sourceId;
     try {
       const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
@@ -2770,17 +2789,36 @@ var downloadFile = async ({
     }
   }
   const fetchUrl = `${fileUrl}?format=original`;
-  const response = await fetch(fetchUrl);
+  const preserveWarningOnlyFailure = !file;
+  let response;
+  try {
+    response = await fetch(fetchUrl);
+  } catch (error) {
+    logDownloadFailure({ fileUrl, filePath, status: "unavailable" });
+    if (preserveWarningOnlyFailure) {
+      return null;
+    }
+    throw error;
+  }
   if (!response.ok) {
+    logDownloadFailure({ fileUrl, filePath, status: response.status });
     return null;
   }
-  await writeResponseBodyToFile(response, filePath);
+  try {
+    await writeResponseBodyToFile(response, filePath);
+  } catch (error) {
+    logDownloadFailure({ fileUrl, filePath, status: response.status });
+    if (preserveWarningOnlyFailure) {
+      return null;
+    }
+    throw error;
+  }
   const downloadedFilePathCache = downloadedFilePathCacheByDirectory.get(filesDirectory);
   if (downloadedFilePathCache) {
     const downloadedFilePaths = await downloadedFilePathCache;
     downloadedFilePaths.add(fileName);
   }
-  return { id: file.id, url: fileUrl };
+  return { id: file?.id ?? fileId, url: fileUrl };
 };
 
 // src/files/uploadFile.ts
@@ -2799,7 +2837,8 @@ var uploadFile = async ({
   fileClient,
   fileUrl,
   directory,
-  fileId
+  fileId,
+  warnIfLocalCopyMissing = true
 }) => {
   const key = `${fileId}-${fileUrl}`;
   if (uploadQueueByKey.has(key)) {
@@ -2822,9 +2861,11 @@ var uploadFile = async ({
       const expectedFilePath = join11(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
       const fileInspect = await fsj3.inspectAsync(expectedFilePath);
       if (fileInspect?.type !== "file") {
-        console.warn(
-          `Skipping file ${fileUrl} as we couldn't find a local copy (looked at ${expectedFilePath})`
-        );
+        if (warnIfLocalCopyMissing) {
+          console.warn(
+            `Skipping file ${fileUrl} as we couldn't find a local copy (looked at ${expectedFilePath})`
+          );
+        }
         return null;
       }
       const fileName = getFileNameFromUrl(fileUrl);
@@ -2985,27 +3026,37 @@ var downloadFileForAsset = async ({
   directory,
   fileClient
 }) => {
-  if (asset.asset.fields?.file?.value === void 0 || asset.asset.fields.url?.value === void 0) {
+  const fields = asset.asset.fields;
+  if (!fields) {
     return null;
   }
-  const fileId = asset.asset.fields?.file?.value;
-  const fileUrl = asset.asset.fields.url?.value;
-  if (fileId === "" || fileUrl === "") {
+  const fileId = fields.file?.value;
+  if (!fileId) {
     return null;
   }
-  return downloadFile({ fileUrl, directory, fileClient });
+  const fileUrl = fields.url?.value;
+  if (!fileUrl) {
+    return null;
+  }
+  return downloadFile({ fileUrl, fileId, directory, fileClient });
 };
 var uploadFileForAsset = async ({
   asset,
   directory,
   fileClient
 }) => {
-  if (asset.asset.fields?.file?.value === void 0 || asset.asset.fields.url?.value === void 0) {
+  const fileId = asset.asset.fields?.file?.value;
+  const fileUrl = asset.asset.fields?.url?.value;
+  if (fileId === void 0 || !fileUrl) {
     return null;
   }
-  const fileUrl = asset.asset.fields.url.value;
-  const fileId = asset.asset.fields.file.value;
-  return uploadFile({ fileUrl, directory, fileClient, fileId });
+  return uploadFile({
+    fileUrl,
+    directory,
+    fileClient,
+    fileId,
+    warnIfLocalCopyMissing: false
+  });
 };
 var removeUrlsFromAssetParameters = (entity) => {
   const treeWalker = ({ node }) => {
@@ -3307,6 +3358,25 @@ function writeCanvasPackage(filename, packageContents) {
 
 // src/commands/canvas/commands/asset/pull.ts
 var ASSET_PULL_ACTION_CONCURRENCY = 10;
+var prepareAssetForPull = async ({
+  sourceObject,
+  directory,
+  fileClient
+}) => {
+  delete sourceObject.object.asset._author;
+  if (!sourceObject.object.asset.fields?.file) {
+    return sourceObject;
+  }
+  const downloadedFile = await downloadFileForAsset({
+    asset: sourceObject.object,
+    directory,
+    fileClient
+  });
+  if (downloadedFile?.id) {
+    sourceObject.object.asset.fields.file.value = downloadedFile.id;
+  }
+  return sourceObject;
+};
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
@@ -3413,27 +3483,70 @@ var AssetPullModule = {
         return sourceObject;
       },
       compareContents: compareAssetsWithoutUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        delete sourceObject.object.asset._author;
-        if (!sourceObject.object.asset.fields?.file) {
-          return sourceObject;
-        }
-        const downloadedFile = await downloadFileForAsset({
-          asset: sourceObject.object,
-          directory,
-          fileClient
-        });
-        if (downloadedFile?.id) {
-          sourceObject.object.asset.fields.file.value = downloadedFile.id;
-        }
-        return sourceObject;
-      }
+      onBeforeWriteObject: (sourceObject) => prepareAssetForPull({
+        sourceObject,
+        directory,
+        fileClient
+      })
     });
   }
 };
 
 // src/commands/canvas/commands/asset/push.ts
+import { join as join13 } from "path";
 var ASSET_PUSH_ACTION_CONCURRENCY = 10;
+var getExpectedFilePath = (directory, fileUrl) => {
+  if (!fileUrl) {
+    return "Unavailable because the asset has no file URL";
+  }
+  try {
+    return join13(getFilesDirectory(directory), FILES_DIRECTORY_NAME, urlToFileName(fileUrl));
+  } catch {
+    return "Unavailable because the asset file URL is invalid";
+  }
+};
+var prepareAssetForPush = async ({
+  sourceObject,
+  directory,
+  fileClient,
+  targetProjectId
+}) => {
+  const fields = sourceObject.object.asset.fields;
+  const fileId = fields?.file?.value;
+  if (!fields || !fileId) {
+    return sourceObject;
+  }
+  const uploadedFile = await uploadFileForAsset({
+    asset: sourceObject.object,
+    directory,
+    fileClient
+  });
+  if (!uploadedFile) {
+    const assetId = sourceObject.object.asset._id;
+    const fileUrl = fields.url?.value;
+    const expectedFilePath = getExpectedFilePath(directory, fileUrl);
+    throw new Error(
+      [
+        `Unable to push asset "${sourceObject.displayName ?? assetId}" (${assetId}) because its file could not be uploaded.`,
+        `Source project ID: ${sourceObject.object.projectId ?? "Unavailable"}`,
+        `Target project ID: ${targetProjectId}`,
+        `File ID: ${fileId}`,
+        `File URL: ${fileUrl || "Missing"}`,
+        `Expected local path: ${expectedFilePath}`,
+        `Remove the asset with the ID ${assetId} before pushing again.`
+      ].join("\n")
+    );
+  }
+  fields.file = {
+    type: "file",
+    value: uploadedFile.id
+  };
+  fields.url = {
+    type: "text",
+    value: uploadedFile.url
+  };
+  return sourceObject;
+};
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
@@ -3519,27 +3632,12 @@ var AssetPushModule = {
         return sourceObject;
       },
       compareContents: compareAssetsWithoutUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        const uploadedFile = await uploadFileForAsset({
-          asset: sourceObject.object,
-          directory,
-          fileClient
-        });
-        if (uploadedFile !== null) {
-          if (sourceObject.object.asset.fields === void 0) {
-            sourceObject.object.asset.fields = {};
-          }
-          sourceObject.object.asset.fields.file = {
-            type: "file",
-            value: uploadedFile.id
-          };
-          sourceObject.object.asset.fields.url = {
-            type: "text",
-            value: uploadedFile.url
-          };
-        }
-        return sourceObject;
-      }
+      onBeforeWriteObject: (sourceObject) => prepareAssetForPush({
+        sourceObject,
+        directory,
+        fileClient,
+        targetProjectId: projectId
+      })
     });
   }
 };
@@ -12069,7 +12167,7 @@ var PolicyDocumentsPullModule = {
 // src/commands/policy-documents/commands/push.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync4 } from "fs";
 import { readdir as readdir2 } from "fs/promises";
-import { extname as extname3, join as join13 } from "path";
+import { extname as extname3, join as join14 } from "path";
 async function readLocalPolicyDocuments(directory, format, verbose) {
   const files = await readdir2(directory);
   const policyDocuments = {};
@@ -12079,7 +12177,7 @@ async function readLocalPolicyDocuments(directory, format, verbose) {
     if (ext !== `.${format}` && ext !== ".yaml" && ext !== ".yml" && ext !== ".json") {
       continue;
     }
-    const filePath = join13(directory, filename);
+    const filePath = join14(directory, filename);
     try {
       let roleId = filename.replace(ext, "");
       const fileContent = readFileToObject(filePath);
@@ -14087,14 +14185,14 @@ import { existsSync as existsSync9, promises as fs8 } from "fs";
 import { get as getHttp } from "http";
 import { get as getHttps } from "https";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import registryUrl from "registry-url";
 import { URL as URL2 } from "url";
 var compareVersions = (a, b) => a.localeCompare(b, "en-US", { numeric: true });
 var encode = (value) => encodeURIComponent(value).replace(/^%40/, "@");
 var getFile = async (details, distTag) => {
   const rootDir = tmpdir2();
-  const subDir = join14(rootDir, "update-check");
+  const subDir = join15(rootDir, "update-check");
   if (!existsSync9(subDir)) {
     await fs8.mkdir(subDir);
   }
@@ -14102,7 +14200,7 @@ var getFile = async (details, distTag) => {
   if (details.scope) {
     name = `${details.scope}-${name}`;
   }
-  return join14(subDir, name);
+  return join15(subDir, name);
 };
 var evaluateCache = async (file, time, interval) => {
   if (existsSync9(file)) {
@@ -14257,7 +14355,7 @@ var checkForUpdateMiddleware = async ({ verbose }) => {
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red8 } from "colorette";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 var uniformStrictVersions = [
   "@uniformdev/canvas",
   "@uniformdev/canvas-next",
@@ -14279,7 +14377,7 @@ var checkLocalDepsVersions = async (args) => {
   try {
     let isOutside = false;
     let warning = `${magenta("Warning:")} Installed Uniform packages should be the same version`;
-    const localPackages = await tryReadJSON(join15(process.cwd(), "package.json"));
+    const localPackages = await tryReadJSON(join16(process.cwd(), "package.json"));
     if (!localPackages) return;
     let firstVersion;
     const allDependencies = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.75.1-alpha.0+effbce0886",
+  "version": "20.75.1-alpha.11+745b427b33",
   "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.75.1-alpha.0+effbce0886",
-    "@uniformdev/automations-sdk": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/canvas": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/context": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/files": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/project-map": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/redirect": "20.75.1-alpha.0+effbce0886",
-    "@uniformdev/richtext": "20.75.1-alpha.0+effbce0886",
+    "@uniformdev/assets": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/automations-sdk": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/canvas": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/context": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/files": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/project-map": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/redirect": "20.75.1-alpha.11+745b427b33",
+    "@uniformdev/richtext": "20.75.1-alpha.11+745b427b33",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.2",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "effbce0886d68a0e9a4f9b492b5f263eafa73813"
+  "gitHead": "745b427b339b7cae41df5381eeb6d49c733f4ce1"
 }