@uniformdev/cli 19.78.1 → 19.79.1-alpha.11

package/dist/index.mjs

@@ -677,7 +677,7 @@ import { createHash } from "crypto";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
 import PQueue from "p-queue";
-import { join as join2 } from "path";
+import { dirname as dirname2, join as join2 } from "path";
 var FILES_DIRECTORY_NAME = "files";
 var urlToHash = (url) => {
   const hash = createHash("sha256");
@@ -691,8 +691,10 @@ var urlToFileName = (url) => {
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
 var deleteDownloadedFileByUrl = async (url, options) => {
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   const fileName = urlToFileName(url);
-  const fileToDelete = join2(options.directory, FILES_DIRECTORY_NAME, fileName);
+  const fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileName);
   try {
     await fsj.removeAsync(fileToDelete);
   } catch {
@@ -704,6 +706,8 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
   const uniformFileUrlMatches = objectAsString.matchAll(
     /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
   );
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileDownloadQueue = new PQueue({ concurrency: 10 });
     for (const match of uniformFileUrlMatches) {
@@ -713,7 +717,7 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
           const fetchUrl = `${url.origin}${url.pathname}?format=original`;
           const fileName = urlToFileName(url.toString());
           const fileAlreadyExists = await fsj.existsAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, fileName)
+            join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
           );
           if (fileAlreadyExists) {
             return;
@@ -723,10 +727,7 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
             return;
           }
           const fileBuffer = await response.arrayBuffer();
-          await fsj.writeAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, fileName),
-            Buffer.from(fileBuffer)
-          );
+          await fsj.writeAsync(join2(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
         } catch {
           console.warn(`Failed to download file ${url}`);
         }
@@ -741,6 +742,8 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   const uniformFileUrlMatches = objectAsString.matchAll(
     /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
   );
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
@@ -757,14 +760,14 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
           }
           const localFileName = urlToFileName(url);
           const fileExistsLocally = await fsj.existsAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, localFileName)
+            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
           );
           if (!fileExistsLocally) {
             console.warn(`Skipping file ${url} as we couldn't find a local copy`);
             return;
           }
           const fileBuffer = await fsj.readAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, localFileName),
+            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName),
             "buffer"
           );
           if (!fileBuffer) {
@@ -782,9 +785,10 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
               };
             }
           })();
+          const mimeType = preferredType(url.split(".").at(-1) ?? "");
           const { id, method, uploadUrl } = await options.fileClient.insert({
             name: fileName,
-            mediaType: preferredType(url.split(".").at(-1) ?? ""),
+            mediaType: mimeType,
             size: fileBuffer.length,
             width,
             height,
@@ -792,7 +796,11 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
           });
           const uploadResponse = await fetch(uploadUrl, {
             method,
-            body: fileBuffer
+            body: fileBuffer,
+            headers: {
+              "Content-Type": mimeType,
+              "Content-Length": fileBuffer.length.toString()
+            }
           });
           if (!uploadResponse.ok) {
             console.warn(`Failed to upload file ${url}`);
@@ -851,16 +859,16 @@ var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
   return JSON.parse(objectAsString);
 };
 var updateAssetFileIdBasedOnUrl = async (asset, options) => {
-  var _a;
-  const fileUrl = (_a = asset.asset.url) == null ? void 0 : _a.value;
-  if (!fileUrl || !asset.asset.file) {
+  var _a, _b, _c;
+  const fileUrl = (_b = (_a = asset.asset.fields) == null ? void 0 : _a.url) == null ? void 0 : _b.value;
+  if (!fileUrl || !((_c = asset.asset.fields) == null ? void 0 : _c.file)) {
     return asset;
   }
   const file = await options.fileClient.get({ url: fileUrl }).catch(() => null);
   if (!file) {
     return asset;
   }
-  asset.asset.file.value = file.id;
+  asset.asset.fields.file.value = file.id;
   return asset;
 };
 
@@ -870,8 +878,8 @@ import { convertAssetToPutAsset } from "@uniformdev/assets";
 // src/commands/canvas/commands/asset/_util.ts
 var selectAssetIdentifier = (e) => e.asset._id;
 var selectAssetDisplayName = (e) => {
-  var _a;
-  return `${((_a = e.asset.title) == null ? void 0 : _a.value) ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
+  var _a, _b;
+  return `${((_b = (_a = e.asset.fields) == null ? void 0 : _a.title) == null ? void 0 : _b.value) ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
 };
 
 // src/commands/canvas/util.ts
@@ -1005,12 +1013,12 @@ var AssetPullModule = {
     let target;
     const isPackage = isPathAPackageFile(directory);
     const onBeforeDeleteObject = async (id, object) => {
-      var _a;
+      var _a, _b;
       const asset = object.object;
-      if (!((_a = asset.asset.url) == null ? void 0 : _a.value)) {
+      if (!((_b = (_a = asset.asset.fields) == null ? void 0 : _a.url) == null ? void 0 : _b.value)) {
         return;
       }
-      await deleteDownloadedFileByUrl(asset.asset.url.value, {
+      await deleteDownloadedFileByUrl(asset.asset.fields.url.value, {
         directory
       });
     };
@@ -3024,7 +3032,12 @@ var EntryGetModule = {
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient7({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    const res = await client.getEntries({ offset: 0, limit: 1, entryIDs: [id] });
+    const res = await client.getEntries({
+      offset: 0,
+      limit: 1,
+      entryIDs: [id],
+      skipOverridesResolution: true
+    });
     if (res.entries.length !== 1) {
       throw new Error(`Entry with ID ${id} not found`);
     }
@@ -3041,7 +3054,7 @@ var EntryListModule = {
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    const res = await client.getEntries({ offset: 0, limit: 1e3 });
+    const res = await client.getEntries({ offset: 0, limit: 1e3, skipOverridesResolution: true });
     emitWithFormat(res.entries, format, filename);
   }
 };
@@ -3067,6 +3080,7 @@ function createEntryEngineDataSource({
       offset: 0,
       limit: 1e3,
       skipDataResolution: true,
+      skipOverridesResolution: true,
       state: stateId,
       withComponentIDs: true
     });
@@ -5441,7 +5455,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.78.1",
+  version: "19.79.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -5495,8 +5509,8 @@ var package_default = {
   devDependencies: {
     "@types/diff": "5.0.8",
     "@types/inquirer": "9.0.3",
-    "@types/js-yaml": "4.0.6",
-    "@types/jsonwebtoken": "9.0.3",
+    "@types/js-yaml": "4.0.9",
+    "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.7",
     "@types/node": "18.17.18",
     "@types/yargs": "17.0.24"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.78.1",
+  "version": "19.79.1-alpha.11+4547ef846",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.78.1",
-    "@uniformdev/canvas": "19.78.1",
-    "@uniformdev/context": "19.78.1",
-    "@uniformdev/files": "19.78.1",
-    "@uniformdev/project-map": "19.78.1",
-    "@uniformdev/redirect": "19.78.1",
+    "@uniformdev/assets": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/canvas": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/context": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/files": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/project-map": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/redirect": "19.79.1-alpha.11+4547ef846",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -54,8 +54,8 @@
   "devDependencies": {
     "@types/diff": "5.0.8",
     "@types/inquirer": "9.0.3",
-    "@types/js-yaml": "4.0.6",
-    "@types/jsonwebtoken": "9.0.3",
+    "@types/js-yaml": "4.0.9",
+    "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.7",
     "@types/node": "18.17.18",
     "@types/yargs": "17.0.24"
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "757c51b80cc39640bcedef7fb5334f36a00c4761"
+  "gitHead": "4547ef8469f21f7f2341bcd87203372c4646bc08"
 }