@uniformdev/cli 19.201.1 → 19.202.1-alpha.9

package/dist/{chunk-KSB3SFPP.mjs → chunk-KAJUBJZI.mjs}

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@8.2.4_@microsoft+api-extractor@7.43.2_tsx@4.17.0_typescript@5.5.4/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_@microsoft+api-extractor@7.43.2_postcss@8.4.47_tsx@4.19.2_typescript@5.6.3/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -65,14 +65,30 @@ function nodeFetchProxy(proxy, verbose) {
     console.log(`\u{1F991} Using proxy ${proxy}`);
   }
   const wrappedFetch = (input, init) => {
+    const handleFetchError = (e) => {
+      if (e instanceof Error) {
+        e.message = `Error fetching ${input.toString()}
+${e.message}`;
+        if (e.cause) {
+          let cause = "Root cause: " + e.cause.toString();
+          if (e.cause instanceof AggregateError) {
+            cause = "Root causes: \n" + e.cause.errors.map((err) => err.toString()).join("\n");
+          }
+          e.message = e.message + " \n" + cause;
+        }
+      }
+      throw e;
+    };
     if (proxy) {
       const wrappedInit = {
         ...init,
         dispatcher: new ProxyAgent(proxy)
       };
-      return undiciFetch(input, wrappedInit);
+      return undiciFetch(input, wrappedInit).catch(handleFetchError);
     }
-    return undiciFetch(input, init);
+    return undiciFetch(input, init).catch(
+      handleFetchError
+    );
   };
   if (verbose) {
     return async function fetchWithVerboseLogging(input, init) {
@@ -91,7 +107,7 @@ function nodeFetchProxy(proxy, verbose) {
             } else {
               message = responseText;
             }
-          } catch (e) {
+          } catch {
             message = responseText;
           }
         } catch {
@@ -283,10 +299,10 @@ var getDirectoryOrFilename = ({
   defaultEntityFolderName = entityType
 }) => {
   if (config.entitiesConfig[entityType]?.[operation]?.directory) {
-    return config.entitiesConfig[entityType]?.[operation]?.directory;
+    return config.entitiesConfig[entityType][operation].directory;
   }
   if (config.entitiesConfig[entityType]?.directory) {
-    return config.entitiesConfig[entityType]?.directory;
+    return config.entitiesConfig[entityType].directory;
   }
   const isPackage = isPathAPackageFile(config.directory);
   if (isPackage) {

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-KSB3SFPP.mjs";
+import "./chunk-KAJUBJZI.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -16,7 +16,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-KSB3SFPP.mjs";
+} from "./chunk-KAJUBJZI.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -320,7 +320,7 @@ async function syncEngine({
               });
             }
           };
-          actions.push(process2(sourceObject, targetObject));
+          actions.push(() => process2(sourceObject, targetObject));
         }
       }
       ids.forEach((i) => targetItems.delete(i));
@@ -352,15 +352,15 @@ async function syncEngine({
         [...invalidTargetObjects, targetObject].forEach((o) => {
           (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
-        const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map(async (io) => {
-          await processDelete(io);
+        const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map((io) => {
+          return () => processDelete(io);
         });
         if (targetObject) {
-          deletes.push(processDelete(targetObject));
+          deletes.push(() => processDelete(targetObject));
         }
-        actions.push(Promise.all(deletes).then(() => process2(sourceObject, ids[0])));
+        actions.push(() => Promise.all(deletes.map((d) => d())).then(() => process2(sourceObject, ids[0])));
       } else {
-        actions.push(process2(sourceObject, ids[0]));
+        actions.push(() => process2(sourceObject, ids[0]));
       }
     }
   }
@@ -371,12 +371,12 @@ async function syncEngine({
       );
     }
     const deletes = [];
-    targetItems.forEach(async (object) => {
-      deletes.push(processDelete(object));
+    targetItems.forEach((object) => {
+      deletes.push(() => processDelete(object));
     });
-    await Promise.all(deletes);
+    await Promise.all(deletes.map((d) => d()));
   }
-  await Promise.all(actions);
+  await Promise.all(actions.map((a) => a()));
   await Promise.all([source.onSyncComplete?.(false), target.onSyncComplete?.(true)]);
 }
 var SyncEngineError = class _SyncEngineError extends Error {
@@ -481,6 +481,7 @@ import { UncachedFileClient } from "@uniformdev/files";
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
 import { createHash } from "crypto";
+import { fileTypeFromBuffer } from "file-type";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
 import PQueue from "p-queue";
@@ -505,7 +506,9 @@ var hashToPartialPathname = (hash) => {
 };
 var findUrlMatchingPartialPathname = (source, pathname) => {
   const escapedPathname = escapeRegExp(pathname);
-  const regex = new RegExp(`"(https://([^"]*?)?img.uniform.(rocks|global)${escapedPathname}([^"]*?))"`);
+  const regex = new RegExp(
+    `"(https://([^"]*?)?(img|files).uniform.(rocks|global)${escapedPathname}([^"]*?))"`
+  );
   const match = source.match(regex);
   if (match && match[1]) {
     return match[1];
@@ -536,7 +539,7 @@ var getFilesDirectory = (directory) => {
   );
 };
 var getUniformFileUrlMatches = (string) => {
-  return string.matchAll(/"(https:\/\/([^"]*?)?img\.uniform\.(rocks|global)\/([^"]*?))"/g);
+  return string.matchAll(/"(https:\/\/([^"]*?)?(img|files)\.uniform\.(rocks|global)\/([^"]*?))"/g);
 };
 var deleteDownloadedFileByUrl = async (url, options) => {
   const writeDirectory = getFilesDirectory(options.directory);
@@ -641,7 +644,20 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             return;
           }
           const fileName = getFileNameFromUrl(url);
+          let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromBuffer(fileBuffer))?.mime;
+          if (!mimeType) {
+            mimeType = preferredType(url.split(".").at(-1) ?? "");
+          }
+          if (mimeType === "audio/x-flac") {
+            mimeType = "audio/flac";
+          }
           const { width, height } = (() => {
+            if (!mimeType.startsWith("image/")) {
+              return {
+                width: void 0,
+                height: void 0
+              };
+            }
             try {
               return sizeOf(fileBuffer);
             } catch {
@@ -651,7 +667,6 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
               };
             }
           })();
-          const mimeType = preferredType(url.split(".").at(-1) ?? "");
           const { id, method, uploadUrl } = await options.fileClient.insert({
             name: fileName,
             mediaType: mimeType,
@@ -8378,7 +8393,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.201.1",
+  version: "19.207.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -8418,6 +8433,7 @@ var package_default = {
     diff: "^5.0.0",
     dotenv: "^16.0.3",
     execa: "5.1.1",
+    "file-type": "^19.6.0",
     "fs-jetpack": "5.1.0",
     graphql: "16.9.0",
     "graphql-request": "6.1.0",
@@ -8434,7 +8450,7 @@ var package_default = {
     "registry-auth-token": "^5.0.0",
     "registry-url": "^6.0.0",
     slugify: "1.6.6",
-    undici: "^6.10.1",
+    undici: "^6.20.1",
     yargs: "^17.6.2",
     zod: "3.23.8"
   },
@@ -8444,7 +8460,7 @@ var package_default = {
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.9",
-    "@types/node": "20.10.6",
+    "@types/node": "22.7.8",
     "@types/yargs": "17.0.32"
   },
   bin: {
@@ -8597,8 +8613,7 @@ var makeApiKey = (teamId, projectId, name, permissions) => ({
     {
       projectId,
       permissions,
-      roles: [],
-      useCustom: true
+      roles: []
     }
   ],
   email: "",
@@ -10599,7 +10614,6 @@ var SyncPullModule = {
       contentType: ContentTypePullModule,
       previewUrl: PreviewUrlPullModule,
       previewViewport: PreviewViewportPullModule
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.pull?.disabled !== true;
     });
@@ -10636,7 +10650,7 @@ var SyncPullModule = {
             }
           }
         );
-      } catch (e) {
+      } catch {
         process.exit(1);
       }
     }
@@ -10698,7 +10712,6 @@ var SyncPushModule = {
       entryPattern: EntryPatternPushModule,
       previewUrl: PreviewUrlPushModule,
       previewViewport: PreviewViewportPushModule
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.push?.disabled !== true;
     });
@@ -10731,7 +10744,7 @@ var SyncPushModule = {
             }
           }
         );
-      } catch (e) {
+      } catch {
         process.exit(1);
       }
     }
@@ -10976,7 +10989,7 @@ async function tryReadJSON(path4, missingValue = null) {
   try {
     const stat = await fs6.stat(path4);
     return stat.isFile() ? await readJSON(path4) : missingValue;
-  } catch (e) {
+  } catch {
     return missingValue;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.201.1",
+  "version": "19.202.1-alpha.9+63c059770a",
   "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.201.1",
-    "@uniformdev/canvas": "19.201.1",
-    "@uniformdev/context": "19.201.1",
-    "@uniformdev/files": "19.201.1",
-    "@uniformdev/project-map": "19.201.1",
-    "@uniformdev/redirect": "19.201.1",
+    "@uniformdev/assets": "19.202.1-alpha.9+63c059770a",
+    "@uniformdev/canvas": "19.202.1-alpha.9+63c059770a",
+    "@uniformdev/context": "19.202.1-alpha.9+63c059770a",
+    "@uniformdev/files": "19.202.1-alpha.9+63c059770a",
+    "@uniformdev/project-map": "19.202.1-alpha.9+63c059770a",
+    "@uniformdev/redirect": "19.202.1-alpha.9+63c059770a",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -40,6 +40,7 @@
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
     "execa": "5.1.1",
+    "file-type": "^19.6.0",
     "fs-jetpack": "5.1.0",
     "graphql": "16.9.0",
     "graphql-request": "6.1.0",
@@ -56,7 +57,7 @@
     "registry-auth-token": "^5.0.0",
     "registry-url": "^6.0.0",
     "slugify": "1.6.6",
-    "undici": "^6.10.1",
+    "undici": "^6.20.1",
     "yargs": "^17.6.2",
     "zod": "3.23.8"
   },
@@ -66,7 +67,7 @@
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.9",
-    "@types/node": "20.10.6",
+    "@types/node": "22.7.8",
     "@types/yargs": "17.0.32"
   },
   "bin": {
@@ -78,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e20dee3fc5ce005f6d73eddf939cc89cbad83de"
+  "gitHead": "63c059770a54fc063a12af0f74eba059143e8074"
 }