@uniformdev/cli 19.58.1-alpha.16 → 19.58.2-alpha.0

package/dist/index.mjs

@@ -9,17 +9,17 @@ var __dirname = /* @__PURE__ */ getDirname();
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs25 from "yargs";
+import yargs24 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs9 from "yargs";
+import yargs8 from "yargs";
 
-// src/commands/canvas/commands/asset.ts
+// src/commands/canvas/commands/category.ts
 import yargs from "yargs";
 
-// src/commands/canvas/commands/asset/get.ts
-import { UncachedAssetClient } from "@uniformdev/assets";
+// src/commands/canvas/commands/category/get.ts
+import { UncachedCategoryClient } from "@uniformdev/canvas";
 
 // src/sync/arraySyncEngineDataSource.ts
 async function createArraySyncEngineDataSource({
@@ -126,14 +126,14 @@ import httpsProxyAgent from "https-proxy-agent";
 import unfetch from "isomorphic-unfetch";
 import { dump, load } from "js-yaml";
 import { dirname, extname, isAbsolute, resolve, sep } from "path";
-function withConfiguration(yargs26) {
-  return yargs26.option("serialization", {
+function withConfiguration(yargs25) {
+  return yargs25.option("serialization", {
     skipValidation: true,
     hidden: true
   });
 }
-function withApiOptions(yargs26) {
-  return yargs26.option("apiKey", {
+function withApiOptions(yargs25) {
+  return yargs25.option("apiKey", {
     describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_API_KEY ?? // deprecated
     process.env.CANVAS_CLI_API_KEY ?? // deprecated
@@ -172,8 +172,8 @@ function nodeFetchProxy(proxy) {
   };
   return wrappedFetch;
 }
-function withProjectOptions(yargs26) {
-  return yargs26.option("project", {
+function withProjectOptions(yargs25) {
+  return yargs25.option("project", {
     describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_PROJECT_ID ?? // deprecated
     process.env.CANVAS_CLI_PROJECT_ID ?? // deprecated
@@ -183,8 +183,8 @@ function withProjectOptions(yargs26) {
     alias: ["p"]
   });
 }
-function withFormatOptions(yargs26) {
-  return yargs26.option("format", {
+function withFormatOptions(yargs25) {
+  return yargs25.option("format", {
     alias: ["f"],
     describe: "Output format",
     default: "yaml",
@@ -196,8 +196,8 @@ function withFormatOptions(yargs26) {
     type: "string"
   });
 }
-function withDiffOptions(yargs26) {
-  return yargs26.option("diff", {
+function withDiffOptions(yargs25) {
+  return yargs25.option("diff", {
     describe: "Whether to show diffs in stdout. off = no diffs; update = on for updates; on = updates, creates, deletes. Can be set by UNIFORM_CLI_DIFF_MODE environment variable.",
     default: process.env.UNIFORM_CLI_DIFF_MODE ?? "off",
     type: "string",
@@ -613,569 +613,15 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
   };
 }
 
-// src/commands/canvas/commands/asset/get.ts
-var AssetGetModule = {
-  command: "get <id>",
-  describe: "Get an asset`",
-  builder: (yargs26) => withConfiguration(
-    withFormatOptions(
-      withApiOptions(
-        withProjectOptions(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs26.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
-        )
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.get({ offset: 0, limit: 1, assetId: id });
-    if (!res) {
-      throw new Error(`Asset with ID ${id} not found`);
-    }
-    emitWithFormat(res, format, filename);
-  }
-};
-
-// src/commands/canvas/commands/asset/list.ts
-import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets";
-var AssetListModule = {
-  command: "list",
-  describe: "List assets",
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
-  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.get({ offset: 0, limit: 1e3 });
-    emitWithFormat(res.assets, format, filename);
-  }
-};
-
-// src/commands/canvas/commands/asset/pull.ts
-import { UncachedAssetClient as UncachedAssetClient3 } from "@uniformdev/assets";
-
-// src/files/index.ts
-import { preferredType } from "@thi.ng/mime";
-import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
-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";
-var FILES_DIRECTORY_NAME = "files";
-var urlToHash = (url) => {
-  const hash = createHash("sha256");
-  hash.update(url);
-  return hash.digest("hex");
-};
-var urlToFileName = (url) => {
-  const fileName = urlToHash(url);
-  const fileNameChunks = url.split(".");
-  const fileExtension = fileNameChunks.length > 1 ? fileNameChunks.at(-1) : "";
-  return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
-};
-var extractAndDownloadUniformFilesForObject = async (object, options) => {
-  const objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
-  if (uniformFileUrlMatches) {
-    const fileDownloadQueue = new PQueue({ concurrency: 10 });
-    for (const match of uniformFileUrlMatches) {
-      const url = new URL(match[1]);
-      fileDownloadQueue.add(async () => {
-        try {
-          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)
-          );
-          if (fileAlreadyExists) {
-            return;
-          }
-          const response = await fetch(fetchUrl);
-          if (!response.ok) {
-            return;
-          }
-          const fileBuffer = await response.arrayBuffer();
-          await fsj.writeAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, fileName),
-            Buffer.from(fileBuffer)
-          );
-        } catch {
-          console.warn(`Failed to download file ${url}`);
-        }
-      });
-    }
-    await fileDownloadQueue.onIdle();
-  }
-  return object;
-};
-var extractAndUploadUniformFilesForObject = async (object, options) => {
-  let objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
-  if (uniformFileUrlMatches) {
-    const fileUploadQueue = new PQueue({ concurrency: 3 });
-    for (const match of uniformFileUrlMatches) {
-      const url = match[1];
-      const hash = urlToHash(url);
-      fileUploadQueue.add(async () => {
-        try {
-          const fileAlreadyExistsChecks = await Promise.all([
-            options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
-          ]);
-          if (fileAlreadyExistsChecks.some((check) => check !== null)) {
-            return;
-          }
-          const localFileName = urlToFileName(url);
-          const fileExistsLocally = await fsj.existsAsync(
-            join2(options.directory, 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),
-            "buffer"
-          );
-          if (!fileBuffer) {
-            console.warn(`Skipping file ${url} as we couldn't read it`);
-            return;
-          }
-          const fileName = getFileNameFromUrl(url);
-          const { width, height } = (() => {
-            try {
-              return sizeOf(fileBuffer);
-            } catch {
-              return {
-                width: void 0,
-                height: void 0
-              };
-            }
-          })();
-          const { id, method, uploadUrl } = await options.fileClient.insert({
-            name: fileName,
-            mediaType: preferredType(url.split(".").at(-1) ?? ""),
-            size: fileBuffer.length,
-            width,
-            height,
-            sourceId: hash
-          });
-          const uploadResponse = await fetch(uploadUrl, {
-            method,
-            body: fileBuffer
-          });
-          if (!uploadResponse.ok) {
-            console.warn(`Failed to upload file ${url}`);
-            return;
-          }
-          const checkForFile = async () => {
-            const file = await options.fileClient.get({ id });
-            if (!file || file.state !== FILE_READY_STATE || !file.url) {
-              await new Promise((resolve2) => setTimeout(resolve2, 500));
-              return checkForFile();
-            }
-            return file.url;
-          };
-          const abortTimeout = setTimeout(() => {
-            throw new Error(`Failed to upload file ${url}`);
-          }, 1e4);
-          const uploadedFileUrl = await checkForFile();
-          clearTimeout(abortTimeout);
-          objectAsString = objectAsString.replaceAll(`"${url}"`, `"${uploadedFileUrl}"`);
-        } catch {
-          console.warn(`Failed to upload file ${url}`);
-        }
-      });
-    }
-    await fileUploadQueue.onIdle();
-  }
-  return JSON.parse(objectAsString);
-};
-var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
-  let objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
-  if (uniformFileUrlMatches) {
-    const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
-    for (const match of uniformFileUrlMatches) {
-      const url = match[1];
-      const hash = urlToHash(url);
-      fileUrlReplacementQueue.add(async () => {
-        try {
-          const fileAlreadyExistsChecks = await Promise.all([
-            options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
-          ]);
-          const file = fileAlreadyExistsChecks.find((check) => check !== null);
-          if (!file) {
-            return;
-          }
-          objectAsString = objectAsString.replaceAll(`"${url}"`, `"${file.url}"`);
-        } catch {
-        }
-      });
-    }
-    await fileUrlReplacementQueue.onIdle();
-  }
-  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) {
-    return asset;
-  }
-  const file = await options.fileClient.get({ url: fileUrl }).catch(() => null);
-  if (!file) {
-    return asset;
-  }
-  asset.asset.file.value = file.id;
-  return asset;
-};
-
-// src/commands/canvas/assetEngineDataSource.ts
-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)})`;
-};
-
-// src/commands/canvas/util.ts
-import {
-  CANVAS_DRAFT_STATE,
-  CANVAS_PUBLISHED_STATE
-} from "@uniformdev/canvas";
-function prepCompositionForDisk(composition) {
-  const prepped = {
-    ...composition
-  };
-  delete prepped.projectId;
-  delete prepped.state;
-  return prepped;
-}
-function withStateOptions(yargs26) {
-  return yargs26.option("state", {
-    type: "string",
-    describe: `Composition state to fetch.`,
-    choices: ["preview", "published"],
-    default: "preview"
-  });
-}
-function convertCompositionState(state) {
-  const number = Number(state);
-  if (!isNaN(number)) {
-    return number;
-  }
-  if (!state) {
-    return CANVAS_PUBLISHED_STATE;
-  }
-  if (typeof state !== "string") {
-    throw new Error('state must be "published", "preview", or a number');
-  }
-  return state === "preview" ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE;
-}
-
-// src/commands/canvas/assetEngineDataSource.ts
-function createAssetEngineDataSource({
-  client
-}) {
-  async function* getObjects() {
-    const assets = paginateAsync(
-      async (offset, limit) => (await client.get({
-        limit,
-        offset
-      })).assets,
-      { pageSize: 100 }
-    );
-    for await (const e of assets) {
-      const result = {
-        id: selectAssetIdentifier(e),
-        displayName: selectAssetDisplayName(e),
-        providerId: e.asset._id,
-        object: prepCompositionForDisk(e)
-      };
-      yield result;
-    }
-  }
-  return {
-    objects: getObjects(),
-    deleteObject: async (providerId) => {
-      await client.delete({ assetId: providerId });
-    },
-    writeObject: async ({ object }) => {
-      await client.upsert(convertAssetToPutAsset(object));
-    }
-  };
-}
-
-// src/commands/canvas/package.ts
-function readCanvasPackage(filename, assertExists) {
-  return readUniformPackage(filename, assertExists);
-}
-function writeCanvasPackage(filename, packageContents) {
-  writeUniformPackage(filename, packageContents);
-}
-
-// src/commands/canvas/commands/asset/pull.ts
-var AssetPullModule = {
-  command: "pull <directory>",
-  describe: "Pulls all assets to local files in a directory",
-  builder: (yargs26) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withDiffOptions(
-          yargs26.positional("directory", {
-            describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-            type: "string"
-          }).option("format", {
-            alias: ["f"],
-            describe: "Output format",
-            default: "yaml",
-            choices: ["yaml", "json"],
-            type: "string"
-          }).option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes no files",
-            default: false,
-            type: "boolean"
-          }).option("mode", {
-            alias: ["m"],
-            describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-            choices: ["create", "createOrUpdate", "mirror"],
-            default: "mirror",
-            type: "string"
-          })
-        )
-      )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    format,
-    mode,
-    whatIf,
-    project: projectId,
-    diff: diffMode
-  }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient3({
-      apiKey,
-      apiHost,
-      fetch: fetch3,
-      projectId
-    });
-    const source = createAssetEngineDataSource({ client });
-    let target;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, false);
-      target = await createArraySyncEngineDataSource({
-        objects: packageContents.assets ?? [],
-        selectIdentifier: selectAssetIdentifier,
-        selectDisplayName: selectAssetDisplayName,
-        onSyncComplete: async (_, synced) => {
-          packageContents.assets = synced;
-          writeCanvasPackage(directory, packageContents);
-        }
-      });
-    } else {
-      target = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectAssetIdentifier,
-        selectDisplayName: selectAssetDisplayName,
-        format
-      });
-    }
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource: true,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeWriteObject: async (sourceObject) => {
-        return extractAndDownloadUniformFilesForObject(sourceObject, {
-          directory
-        });
-      }
-    });
-  }
-};
-
-// src/commands/canvas/commands/asset/push.ts
-import { UncachedAssetClient as UncachedAssetClient4 } from "@uniformdev/assets";
-import { UncachedFileClient } from "@uniformdev/files";
-var AssetPushModule = {
-  command: "push <directory>",
-  describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs26) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withDiffOptions(
-          yargs26.positional("directory", {
-            describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
-            type: "string"
-          }).option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes nothing",
-            default: false,
-            type: "boolean"
-          }).option("mode", {
-            alias: ["m"],
-            describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-            choices: ["create", "createOrUpdate", "mirror"],
-            default: "mirror",
-            type: "string"
-          })
-        )
-      )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    mode,
-    whatIf,
-    project: projectId,
-    diff: diffMode
-  }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient4({
-      apiKey,
-      apiHost,
-      fetch: fetch3,
-      projectId
-    });
-    let source;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, true);
-      source = await createArraySyncEngineDataSource({
-        objects: packageContents.assets ?? [],
-        selectIdentifier: selectAssetIdentifier,
-        selectDisplayName: selectAssetDisplayName
-      });
-    } else {
-      source = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectAssetIdentifier,
-        selectDisplayName: selectAssetDisplayName
-      });
-    }
-    const target = createAssetEngineDataSource({ client });
-    const fileClient = new UncachedFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject) => {
-        const sourceObjectWithNewFileUrls = await swapOutUniformFileUrlsForTargetProject(sourceObject, {
-          fileClient
-        });
-        sourceObjectWithNewFileUrls.object = await updateAssetFileIdBasedOnUrl(
-          sourceObjectWithNewFileUrls.object,
-          {
-            fileClient
-          }
-        );
-        return sourceObjectWithNewFileUrls;
-      },
-      onBeforeWriteObject: async (sourceObject) => {
-        const sourceObjectWithNewFileUrls = await extractAndUploadUniformFilesForObject(sourceObject, {
-          directory,
-          fileClient
-        });
-        sourceObjectWithNewFileUrls.object = await updateAssetFileIdBasedOnUrl(
-          sourceObjectWithNewFileUrls.object,
-          {
-            fileClient
-          }
-        );
-        return sourceObjectWithNewFileUrls;
-      }
-    });
-  }
-};
-
-// src/commands/canvas/commands/asset/remove.ts
-import { UncachedAssetClient as UncachedAssetClient5 } from "@uniformdev/assets";
-var AssetRemoveModule = {
-  command: "remove <id>",
-  aliases: ["delete", "rm"],
-  describe: "Delete an asset",
-  builder: (yargs26) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(yargs26.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient5({ apiKey, apiHost, fetch: fetch3, projectId });
-    await client.delete({ assetId: id });
-  }
-};
-
-// src/commands/canvas/commands/asset/update.ts
-import { UncachedAssetClient as UncachedAssetClient6 } from "@uniformdev/assets";
-var AssetUpdateModule = {
-  command: "update <filename>",
-  aliases: ["put"],
-  describe: "Insert or update an asset",
-  builder: (yargs26) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Asset file to put" })
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAssetClient6({ apiKey, apiHost, fetch: fetch3, projectId });
-    const file = readFileToObject(filename);
-    await client.upsert(file);
-  }
-};
-
-// src/commands/canvas/commands/asset.ts
-var AssetModule = {
-  command: "asset <command>",
-  describe: "Commands for Assets",
-  builder: (yargs26) => yargs26.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
-  handler: () => {
-    yargs.help();
-  }
-};
-
-// src/commands/canvas/commands/category.ts
-import yargs2 from "yargs";
-
 // src/commands/canvas/commands/category/get.ts
-import { UncachedCategoryClient } from "@uniformdev/canvas";
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -1200,7 +646,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26.options({}))))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25.options({}))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1245,15 +691,23 @@ function createCategoriesEngineDataSource({
   };
 }
 
+// src/commands/canvas/package.ts
+function readCanvasPackage(filename, assertExists) {
+  return readUniformPackage(filename, assertExists);
+}
+function writeCanvasPackage(filename, packageContents) {
+  writeUniformPackage(filename, packageContents);
+}
+
 // src/commands/canvas/commands/category/pull.ts
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the categories to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1329,11 +783,11 @@ import { UncachedCategoryClient as UncachedCategoryClient4 } from "@uniformdev/c
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1397,10 +851,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -1417,10 +871,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -1437,14 +891,14 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs26) => yargs26.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
-    yargs2.help();
+    yargs.help();
   }
 };
 
 // src/commands/canvas/commands/component.ts
-import yargs3 from "yargs";
+import yargs2 from "yargs";
 
 // src/commands/canvas/commands/component/get.ts
 import { UncachedCanvasClient } from "@uniformdev/canvas";
@@ -1458,11 +912,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", {
+          yargs25.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -1496,11 +950,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.options({
+          yargs25.options({
             offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
             limit: { describe: "Number of rows to fetch", type: "number", default: 20 }
           })
@@ -1555,11 +1009,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1636,11 +1090,11 @@ import { UncachedCanvasClient as UncachedCanvasClient4 } from "@uniformdev/canva
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1705,10 +1159,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1725,10 +1179,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1745,26 +1199,63 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs26) => yargs26.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
-    yargs3.help();
+    yargs2.help();
+  }
+};
+
+// src/commands/canvas/commands/composition.ts
+import yargs3 from "yargs";
+
+// src/commands/canvas/commands/composition/get.ts
+import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canvas";
+
+// src/commands/canvas/util.ts
+import {
+  CANVAS_DRAFT_STATE,
+  CANVAS_PUBLISHED_STATE
+} from "@uniformdev/canvas";
+function prepCompositionForDisk(composition) {
+  const prepped = {
+    ...composition
+  };
+  delete prepped.projectId;
+  delete prepped.state;
+  return prepped;
+}
+function withStateOptions(yargs25) {
+  return yargs25.option("state", {
+    type: "string",
+    describe: `Composition state to fetch.`,
+    choices: ["preview", "published"],
+    default: "preview"
+  });
+}
+function convertCompositionState(state) {
+  const number = Number(state);
+  if (!isNaN(number)) {
+    return number;
   }
-};
-
-// src/commands/canvas/commands/composition.ts
-import yargs4 from "yargs";
+  if (!state) {
+    return CANVAS_PUBLISHED_STATE;
+  }
+  if (typeof state !== "string") {
+    throw new Error('state must be "published", "preview", or a number');
+  }
+  return state === "preview" ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE;
+}
 
 // src/commands/canvas/commands/composition/get.ts
-import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canvas";
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs26) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs26.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
+            yargs25.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
               resolvePatterns: {
                 type: "boolean",
                 default: false,
@@ -1835,12 +1326,12 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs26) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs26.options({
+            yargs25.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
               resolvePatterns: {
@@ -1961,11 +1452,11 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("ids", {
+          yargs25.positional("ids", {
             describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2037,15 +1528,189 @@ var CompositionPublishModule = {
 
 // src/commands/canvas/commands/composition/pull.ts
 import { UncachedCanvasClient as UncachedCanvasClient10 } from "@uniformdev/canvas";
+
+// src/files/index.ts
+import { preferredType } from "@thi.ng/mime";
+import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
+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";
+var FILES_DIRECTORY_NAME = "files";
+var urlToHash = (url) => {
+  const hash = createHash("sha256");
+  hash.update(url);
+  return hash.digest("hex");
+};
+var urlToFileName = (url) => {
+  const fileName = urlToHash(url);
+  const fileNameChunks = url.split(".");
+  const fileExtension = fileNameChunks.length > 1 ? fileNameChunks.at(-1) : "";
+  return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
+};
+var extractAndDownloadUniformFilesForObject = async (object, options) => {
+  const objectAsString = JSON.stringify(object);
+  const uniformFileUrlMatches = objectAsString.matchAll(
+    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
+  );
+  if (uniformFileUrlMatches) {
+    const fileDownloadQueue = new PQueue({ concurrency: 10 });
+    for (const match of uniformFileUrlMatches) {
+      const url = new URL(match[1]);
+      fileDownloadQueue.add(async () => {
+        try {
+          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)
+          );
+          if (fileAlreadyExists) {
+            return;
+          }
+          const response = await fetch(fetchUrl);
+          if (!response.ok) {
+            return;
+          }
+          const fileBuffer = await response.arrayBuffer();
+          await fsj.writeAsync(
+            join2(options.directory, FILES_DIRECTORY_NAME, fileName),
+            Buffer.from(fileBuffer)
+          );
+        } catch {
+          console.warn(`Failed to download file ${url}`);
+        }
+      });
+    }
+    await fileDownloadQueue.onIdle();
+  }
+  return object;
+};
+var extractAndUploadUniformFilesForObject = async (object, options) => {
+  let objectAsString = JSON.stringify(object);
+  const uniformFileUrlMatches = objectAsString.matchAll(
+    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
+  );
+  if (uniformFileUrlMatches) {
+    const fileUploadQueue = new PQueue({ concurrency: 3 });
+    for (const match of uniformFileUrlMatches) {
+      const url = match[1];
+      const hash = urlToHash(url);
+      fileUploadQueue.add(async () => {
+        try {
+          const fileAlreadyExistsChecks = await Promise.all([
+            options.fileClient.get({ url }).catch(() => null),
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
+          ]);
+          if (fileAlreadyExistsChecks.some((check) => check !== null)) {
+            return;
+          }
+          const localFileName = urlToFileName(url);
+          const fileExistsLocally = await fsj.existsAsync(
+            join2(options.directory, 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),
+            "buffer"
+          );
+          if (!fileBuffer) {
+            console.warn(`Skipping file ${url} as we couldn't read it`);
+            return;
+          }
+          const fileName = getFileNameFromUrl(url);
+          const { width, height } = (() => {
+            try {
+              return sizeOf(fileBuffer);
+            } catch {
+              return {
+                width: void 0,
+                height: void 0
+              };
+            }
+          })();
+          const { id, method, uploadUrl } = await options.fileClient.insert({
+            name: fileName,
+            mediaType: preferredType(url.split(".").at(-1) ?? ""),
+            size: fileBuffer.length,
+            width,
+            height,
+            sourceId: hash
+          });
+          const uploadResponse = await fetch(uploadUrl, {
+            method,
+            body: fileBuffer
+          });
+          if (!uploadResponse.ok) {
+            console.warn(`Failed to upload file ${url}`);
+            return;
+          }
+          const checkForFile = async () => {
+            const file = await options.fileClient.get({ id });
+            if (!file || file.state !== FILE_READY_STATE || !file.url) {
+              await new Promise((resolve2) => setTimeout(resolve2, 500));
+              return checkForFile();
+            }
+            return file.url;
+          };
+          const abortTimeout = setTimeout(() => {
+            throw new Error(`Failed to upload file ${url}`);
+          }, 1e4);
+          const uploadedFileUrl = await checkForFile();
+          clearTimeout(abortTimeout);
+          objectAsString = objectAsString.replaceAll(`"${url}"`, `"${uploadedFileUrl}"`);
+        } catch {
+          console.warn(`Failed to upload file ${url}`);
+        }
+      });
+    }
+    await fileUploadQueue.onIdle();
+  }
+  return JSON.parse(objectAsString);
+};
+var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
+  let objectAsString = JSON.stringify(object);
+  const uniformFileUrlMatches = objectAsString.matchAll(
+    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
+  );
+  if (uniformFileUrlMatches) {
+    const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
+    for (const match of uniformFileUrlMatches) {
+      const url = match[1];
+      const hash = urlToHash(url);
+      fileUrlReplacementQueue.add(async () => {
+        try {
+          const fileAlreadyExistsChecks = await Promise.all([
+            options.fileClient.get({ url }).catch(() => null),
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
+          ]);
+          const file = fileAlreadyExistsChecks.find((check) => check !== null);
+          if (!file) {
+            return;
+          }
+          objectAsString = objectAsString.replaceAll(`"${url}"`, `"${file.url}"`);
+        } catch {
+        }
+      });
+    }
+    await fileUrlReplacementQueue.onIdle();
+  }
+  return JSON.parse(objectAsString);
+};
+
+// src/commands/canvas/commands/composition/pull.ts
 var CompositionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -2136,16 +1801,16 @@ var CompositionPullModule = {
 
 // src/commands/canvas/commands/composition/push.ts
 import { UncachedCanvasClient as UncachedCanvasClient11 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
+import { FileClient as FileClient2 } from "@uniformdev/files";
 var CompositionPushModule = {
   command: "push <directory>",
   describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -2206,7 +1871,7 @@ var CompositionPushModule = {
       });
     }
     const target = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
-    const fileClient = new UncachedFileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = new FileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
@@ -2215,13 +1880,15 @@ var CompositionPushModule = {
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
         return swapOutUniformFileUrlsForTargetProject(sourceObject, {
-          fileClient
+          fileClient,
+          projectId
         });
       },
       onBeforeWriteObject: async (sourceObject) => {
         return extractAndUploadUniformFilesForObject(sourceObject, {
           directory,
-          fileClient
+          fileClient,
+          projectId
         });
       }
     });
@@ -2234,10 +1901,10 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
       )
     )
   ),
@@ -2254,10 +1921,10 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("ids", {
+        yargs25.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2351,11 +2018,11 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs26.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+          yargs25.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
         )
       )
     )
@@ -2373,26 +2040,26 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs26) => yargs26.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
-    yargs4.help();
+    yargs3.help();
   }
 };
 
 // src/commands/canvas/commands/contentType.ts
-import yargs5 from "yargs";
+import yargs4 from "yargs";
 
 // src/commands/canvas/commands/contentType/get.ts
 import { ContentClient } from "@uniformdev/canvas";
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs26.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
         )
       )
     )
@@ -2414,7 +2081,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2461,11 +2128,11 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -2547,11 +2214,11 @@ import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -2621,10 +2288,10 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
       )
     )
   ),
@@ -2641,10 +2308,10 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Content type file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Content type file to put" })
       )
     )
   ),
@@ -2661,14 +2328,14 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs26) => yargs26.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
-    yargs5.help();
+    yargs4.help();
   }
 };
 
 // src/commands/canvas/commands/dataType.ts
-import yargs6 from "yargs";
+import yargs5 from "yargs";
 
 // src/commands/canvas/commands/dataType/get.ts
 import { DataTypeClient } from "@uniformdev/canvas";
@@ -2676,12 +2343,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs26.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -2704,7 +2371,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2757,11 +2424,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the data types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -2843,11 +2510,11 @@ import { DataTypeClient as DataTypeClient4 } from "@uniformdev/canvas";
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the data types from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -2917,10 +2584,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -2937,10 +2604,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -2957,26 +2624,26 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs26) => yargs26.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
-    yargs6.help();
+    yargs5.help();
   }
 };
 
 // src/commands/canvas/commands/entry.ts
-import yargs7 from "yargs";
+import yargs6 from "yargs";
 
 // src/commands/canvas/commands/entry/get.ts
 import { ContentClient as ContentClient7 } from "@uniformdev/canvas";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs26.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
         )
       )
     )
@@ -2997,7 +2664,7 @@ import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3054,12 +2721,12 @@ function createEntryEngineDataSource({
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3143,12 +2810,12 @@ import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -3220,10 +2887,10 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
       )
     )
   ),
@@ -3240,10 +2907,10 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Entry file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Entry file to put" })
       )
     )
   ),
@@ -3259,14 +2926,14 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs26) => yargs26.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).demandCommand(),
   handler: () => {
-    yargs7.help();
+    yargs6.help();
   }
 };
 
 // src/commands/canvas/commands/pattern.ts
-import yargs8 from "yargs";
+import yargs7 from "yargs";
 
 // src/commands/canvas/commands/pattern/get.ts
 var PatternGetModule = {
@@ -3278,12 +2945,12 @@ var PatternGetModule = {
 var PatternListModule = {
   ...CompositionListModule,
   describe: "List patterns",
-  builder: (yargs26) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs26.options({
+            yargs25.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
               resolvePatterns: {
@@ -3321,11 +2988,11 @@ var PatternListModule = {
 var PatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes pattern(s)",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("ids", {
+          yargs25.positional("ids", {
             describe: "Publishes pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -3363,12 +3030,12 @@ var PatternPublishModule = {
 var PatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all patterns to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3406,12 +3073,12 @@ var PatternPullModule = {
 var PatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all patterns from files in a directory to Uniform Canvas",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs26.positional("directory", {
+            yargs25.positional("directory", {
               describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -3449,10 +3116,10 @@ var PatternRemoveModule = {
 var PatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a pattern(s)",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("ids", {
+        yargs25.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -3491,9 +3158,9 @@ var PatternUpdateModule = {
 var PatternModule = {
   command: "pattern <command>",
   describe: "Commands for Canvas patterns",
-  builder: (yargs26) => yargs26.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs8.help();
+    yargs7.help();
   }
 };
 
@@ -3502,28 +3169,28 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs26) => yargs26.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(CategoryModule).command(PatternModule).command(ContentTypeModule).command(EntryModule).command(AssetModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(CategoryModule).command(PatternModule).command(ContentTypeModule).command(EntryModule).demandCommand(),
   handler: () => {
-    yargs9.showHelp();
+    yargs8.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs16 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs10 from "yargs";
+import yargs9 from "yargs";
 
 // src/commands/context/commands/aggregate/get.ts
 import { UncachedAggregateClient } from "@uniformdev/context/api";
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -3547,7 +3214,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -3613,11 +3280,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the aggregates to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -3692,11 +3359,11 @@ import { UncachedAggregateClient as UncachedAggregateClient4 } from "@uniformdev
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -3761,10 +3428,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -3781,10 +3448,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -3801,25 +3468,25 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs26) => yargs26.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs10.help();
+    yargs9.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs11 from "yargs";
+import yargs10 from "yargs";
 
 // src/commands/context/commands/enrichment/get.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs26) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -3844,7 +3511,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -3945,11 +3612,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the enrichments to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4024,11 +3691,11 @@ import { UncachedEnrichmentClient as UncachedEnrichmentClient4 } from "@uniformd
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4092,10 +3759,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -4111,14 +3778,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs26) => yargs26.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs11.help();
+    yargs10.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs12 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
@@ -4129,10 +3796,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.option("preview", {
+        yargs25.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -4194,7 +3861,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs26) => withConfiguration(withApiOptions(withProjectOptions(yargs26))),
+  builder: (yargs25) => withConfiguration(withApiOptions(withProjectOptions(yargs25))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -4227,25 +3894,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs26) => yargs26.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs12.help();
+    yargs11.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs13 from "yargs";
+import yargs12 from "yargs";
 
 // src/commands/context/commands/quirk/get.ts
 import { UncachedQuirkClient } from "@uniformdev/context/api";
 var QuirkGetModule = {
   command: "get <id>",
   describe: "Fetch a quirk",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -4269,11 +3936,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.option("withIntegrations", {
+          yargs25.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -4330,11 +3997,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the quirks to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4409,11 +4076,11 @@ import { UncachedQuirkClient as UncachedQuirkClient4 } from "@uniformdev/context
 var QuirkPushModule = {
   command: "push <directory>",
   describe: "Pushes all quirks from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4477,10 +4144,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -4497,10 +4164,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -4517,25 +4184,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs26) => yargs26.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs12.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs14 from "yargs";
+import yargs13 from "yargs";
 
 // src/commands/context/commands/signal/get.ts
 import { UncachedSignalClient } from "@uniformdev/context/api";
 var SignalGetModule = {
   command: "get <id>",
   describe: "Fetch a signal",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -4559,7 +4226,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4608,11 +4275,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the signals to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4687,11 +4354,11 @@ import { UncachedSignalClient as UncachedSignalClient4 } from "@uniformdev/conte
 var SignalPushModule = {
   command: "push <directory>",
   describe: "Pushes all signals from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4755,10 +4422,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -4775,10 +4442,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -4795,25 +4462,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs26) => yargs26.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs14.help();
+    yargs13.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs15 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/context/commands/test/get.ts
 import { UncachedTestClient } from "@uniformdev/context/api";
 var TestGetModule = {
   command: "get <id>",
   describe: "Fetch a test",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -4837,7 +4504,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4886,11 +4553,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save the tests to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4965,11 +4632,11 @@ import { UncachedTestClient as UncachedTestClient4 } from "@uniformdev/context/a
 var TestPushModule = {
   command: "push <directory>",
   describe: "Pushes all tests from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5033,10 +4700,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -5053,9 +4720,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs26.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs25.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -5070,9 +4737,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs26) => yargs26.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs14.help();
   }
 };
 
@@ -5081,9 +4748,9 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs26) => yargs26.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs16.showHelp();
+    yargs15.showHelp();
   }
 };
 
@@ -5111,7 +4778,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.58.0",
+  version: "19.58.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -5128,7 +4795,6 @@ var package_default = {
   },
   dependencies: {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "workspace:*",
     "@uniformdev/canvas": "workspace:*",
     "@uniformdev/context": "workspace:*",
     "@uniformdev/files": "workspace:*",
@@ -5147,7 +4813,7 @@ var package_default = {
     "image-size": "^1.0.2",
     inquirer: "9.2.11",
     "isomorphic-git": "1.24.5",
-    "isomorphic-unfetch": "^3.1.0",
+    "isomorphic-unfetch": "^4.0.0",
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
     "lodash.isequalwith": "^4.4.0",
@@ -5161,7 +4827,7 @@ var package_default = {
     zod: "3.21.4"
   },
   devDependencies: {
-    "@types/diff": "5.0.4",
+    "@types/diff": "5.0.5",
     "@types/inquirer": "9.0.3",
     "@types/js-yaml": "4.0.6",
     "@types/jsonwebtoken": "9.0.3",
@@ -6156,10 +5822,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs18 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs17 from "yargs";
+import yargs16 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
 import { gray as gray4, green as green3, red as red5, yellow as yellow2 } from "colorette";
@@ -6174,7 +5840,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs26) => yargs26.option("apiKey", {
+  builder: (yargs25) => yargs25.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -6275,10 +5941,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs17.command(download_default);
+    return yargs16.command(download_default);
   },
   handler: () => {
-    yargs17.showHelp();
+    yargs16.showHelp();
   }
 };
 var manifest_default = module2;
@@ -6289,29 +5955,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs18.command(manifest_default);
+    return yargs17.command(manifest_default);
   },
   handler: () => {
-    yargs18.showHelp();
+    yargs17.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs21 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs19 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/get.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs26) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -6335,7 +6001,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6392,11 +6058,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -6471,11 +6137,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient4 } from "@uniformd
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6539,9 +6205,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs26.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs25.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -6557,10 +6223,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -6576,25 +6242,25 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs26) => yargs26.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs18.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs20 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 import { UncachedProjectMapClient as UncachedProjectMapClient7 } from "@uniformdev/project-map";
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs25.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -6620,11 +6286,11 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("projectMapId", {
+          yargs25.positional("projectMapId", {
             demandOption: true,
             describe: "ProjectMap UUID to fetch from"
           })
@@ -6695,11 +6361,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -6778,11 +6444,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniform
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6855,10 +6521,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs25.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -6875,10 +6541,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs25.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -6894,9 +6560,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs26) => yargs26.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs20.help();
+    yargs19.help();
   }
 };
 
@@ -6905,28 +6571,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs26) => yargs26.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs21.showHelp();
+    yargs20.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs23 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs22 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs26.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -6950,7 +6616,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs26) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs26)))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -7016,11 +6682,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to save redirects to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -7096,11 +6762,11 @@ import { UncachedRedirectClient as UncachedRedirectClient4 } from "@uniformdev/r
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.positional("directory", {
+          yargs25.positional("directory", {
             describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -7164,9 +6830,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs26.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs25.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -7182,10 +6848,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs26.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -7201,9 +6867,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs26) => yargs26.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs21.help();
   }
 };
 
@@ -7212,14 +6878,14 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs26) => yargs26.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs23.showHelp();
+    yargs22.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs24 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/sync/commands/util.ts
 import ora2 from "ora";
@@ -7250,11 +6916,11 @@ function spin(entityType) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.option("what-if", {
+          yargs25.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes no files",
             default: false,
@@ -7339,11 +7005,11 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs26) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs26.option("what-if", {
+          yargs25.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes nothing",
             default: false,
@@ -7435,9 +7101,9 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs26) => yargs26.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs24.showHelp();
+    yargs23.showHelp();
   }
 };
 
@@ -7553,7 +7219,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs25(hideBin(process.argv));
+var yarggery = yargs24(hideBin(process.argv));
 var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
 var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {