@uniformdev/cli 19.38.3-alpha.70 → 19.38.3-alpha.78

package/dist/index.mjs

@@ -1,15 +1,12 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { cosmiconfigSync } from "cosmiconfig";
-import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
 import * as dotenv from "dotenv";
-import fs5 from "fs";
-import yargs22 from "yargs";
+import yargs24 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs6 from "yargs";
+import yargs8 from "yargs";
 
 // src/commands/canvas/commands/category.ts
 import yargs from "yargs";
@@ -78,6 +75,9 @@ import { readdir, unlink } from "fs/promises";
 import { extname as extname2, join } from "path";
 
 // src/util.ts
+import { cosmiconfigSync } from "cosmiconfig";
+import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
+import fs from "fs";
 var omit = (object, keys) => {
   const result = keys.reduce((current, key) => {
     const { [key]: _, ...rest } = current;
@@ -88,6 +88,30 @@ var omit = (object, keys) => {
 var cleanFileName = (proposedFileName) => {
   return proposedFileName.replace(/[/<>$+%>!`&*'|{}?"=:\\@]/g, "-");
 };
+var loadConfig = (configPath) => {
+  const moduleName = "uniform";
+  const syncCosmicExplorer = cosmiconfigSync("uniform", {
+    searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.json`],
+    loaders: {
+      ".ts": TypeScriptLoader()
+    }
+  });
+  if (configPath) {
+    if (!fs.existsSync(configPath)) {
+      throw new Error(`Invalid configuration file path: ${configPath}. File does not exist.`);
+    }
+    const configFile = syncCosmicExplorer.load(configPath);
+    if (!(configFile == null ? void 0 : configFile.config.serialization)) {
+      throw new Error(
+        `Invalid configuration file: ${configPath}. Missing config.serialization configuration.`
+      );
+    }
+    return applyDefaultSyncConfiguration((configFile == null ? void 0 : configFile.config) ?? {});
+  } else {
+    const searchedForm = syncCosmicExplorer.search();
+    return applyDefaultSyncConfiguration((searchedForm == null ? void 0 : searchedForm.config) ?? {});
+  }
+};
 
 // src/sync/util.ts
 import { readFileSync, writeFileSync } from "fs";
@@ -95,14 +119,14 @@ import httpsProxyAgent from "https-proxy-agent";
 import unfetch from "isomorphic-unfetch";
 import { dump, load } from "js-yaml";
 import { extname } from "path";
-function withConfiguration(yargs23) {
-  return yargs23.option("serialization", {
+function withConfiguration(yargs25) {
+  return yargs25.option("serialization", {
     skipValidation: true,
     hidden: true
   });
 }
-function withApiOptions(yargs23) {
-  return yargs23.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
@@ -141,8 +165,8 @@ function nodeFetchProxy(proxy) {
   };
   return wrappedFetch;
 }
-function withProjectOptions(yargs23) {
-  return yargs23.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
@@ -152,8 +176,8 @@ function withProjectOptions(yargs23) {
     alias: ["p"]
   });
 }
-function withFormatOptions(yargs23) {
-  return yargs23.option("format", {
+function withFormatOptions(yargs25) {
+  return yargs25.option("format", {
     alias: ["f"],
     describe: "Output format",
     default: "yaml",
@@ -165,8 +189,8 @@ function withFormatOptions(yargs23) {
     type: "string"
   });
 }
-function withDiffOptions(yargs23) {
-  return yargs23.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",
@@ -228,7 +252,7 @@ async function* paginateAsync(fetchPage, options) {
 }
 var defaultSyncConfiguration = {
   entitiesConfig: {},
-  filename: "uniform-data",
+  directory: "uniform-data",
   format: "yaml",
   mode: "mirror"
 };
@@ -248,8 +272,10 @@ var applyDefaultSyncConfiguration = (config2) => {
     const entityTypeCasted = entityType;
     const entityConfig = mergedConfig.serialization.entitiesConfig[entityTypeCasted];
     if (Object.keys(entityConfig).length === 0) {
-      const separator = mergedConfig.serialization.filename[mergedConfig.serialization.filename.length - 1] === "/" ? "" : "/";
-      mergedConfig.serialization.entitiesConfig[entityTypeCasted].filename = `${mergedConfig.serialization.filename}${separator}${entityTypeCasted}`;
+      const separator = mergedConfig.serialization.directory[mergedConfig.serialization.directory.length - 1] === "/" ? "" : "/";
+      mergedConfig.serialization.entitiesConfig[entityTypeCasted].directory = isPathAPackageFile(
+        mergedConfig.serialization.directory
+      ) ? mergedConfig.serialization.directory : `${mergedConfig.serialization.directory}${separator}${entityTypeCasted}`;
     }
   }
   return mergedConfig;
@@ -278,17 +304,17 @@ var getDirectoryOrFilename = ({
   operation
 }) => {
   var _a, _b, _c, _d, _e, _f;
-  if ((_b = (_a = config2.entitiesConfig[entityType]) == null ? void 0 : _a[operation]) == null ? void 0 : _b.filename) {
-    return (_d = (_c = config2.entitiesConfig[entityType]) == null ? void 0 : _c[operation]) == null ? void 0 : _d.filename;
+  if ((_b = (_a = config2.entitiesConfig[entityType]) == null ? void 0 : _a[operation]) == null ? void 0 : _b.directory) {
+    return (_d = (_c = config2.entitiesConfig[entityType]) == null ? void 0 : _c[operation]) == null ? void 0 : _d.directory;
   }
-  if ((_e = config2.entitiesConfig[entityType]) == null ? void 0 : _e.filename) {
-    return (_f = config2.entitiesConfig[entityType]) == null ? void 0 : _f.filename;
+  if ((_e = config2.entitiesConfig[entityType]) == null ? void 0 : _e.directory) {
+    return (_f = config2.entitiesConfig[entityType]) == null ? void 0 : _f.directory;
   }
-  const isPackage = isPathAPackageFile(config2.filename);
+  const isPackage = isPathAPackageFile(config2.directory);
   if (isPackage) {
-    return config2.filename;
+    return config2.directory;
   }
-  return `${config2.filename}/${entityType}`;
+  return `${config2.directory}/${entityType}`;
 };
 
 // src/sync/fileSyncEngineDataSource.ts
@@ -352,9 +378,9 @@ ${e == null ? void 0 : e.message}`));
 }
 
 // src/sync/package.ts
-import fs from "fs";
+import fs2 from "fs";
 function readUniformPackage(filename, assertExists) {
-  if (!assertExists && !fs.existsSync(filename)) {
+  if (!assertExists && !fs2.existsSync(filename)) {
     return {};
   }
   const packageContents = readFileToObject(filename);
@@ -385,7 +411,9 @@ async function syncEngine({
   whatIf = false,
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   log = () => {
-  }
+  },
+  onBeforeCompareObjects,
+  onBeforeWriteObject
 }) {
   var _a, _b;
   const targetItems = /* @__PURE__ */ new Map();
@@ -419,18 +447,20 @@ async function syncEngine({
   }
   const actions = [];
   let sourceHasItems = false;
-  for await (const sourceObject of source.objects) {
+  for await (let sourceObject of source.objects) {
     sourceHasItems = true;
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => (o == null ? void 0 : o.object) !== (targetObject == null ? void 0 : targetObject.object));
     if (targetObject && invalidTargetObjects.length == 0) {
+      sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           const process2 = async (sourceObject2, targetObject2) => {
             if (!whatIf) {
               try {
-                await target.writeObject(sourceObject2, targetObject2);
+                const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
+                await target.writeObject(finalSourceObject, targetObject2);
               } catch (e) {
                 throw new SyncEngineError(e, sourceObject2);
               }
@@ -452,7 +482,8 @@ async function syncEngine({
       const process2 = async (sourceObject2, id) => {
         if (!whatIf) {
           try {
-            await target.writeObject(sourceObject2);
+            const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
+            await target.writeObject(finalSourceObject);
           } catch (e) {
             throw new SyncEngineError(e, sourceObject2);
           }
@@ -548,11 +579,11 @@ function createSyncEngineConsoleLogger(options) {
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -577,7 +608,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23.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 });
@@ -634,11 +665,11 @@ function writeCanvasPackage(filename, packageContents) {
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -713,11 +744,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -781,10 +812,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -801,10 +832,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -821,7 +852,7 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs23) => yargs23.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: () => {
     yargs.help();
   }
@@ -842,11 +873,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", {
+          yargs25.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -880,11 +911,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.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 }
           })
@@ -939,11 +970,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -1019,11 +1050,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -1088,10 +1119,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1108,10 +1139,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1128,7 +1159,7 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs23) => yargs23.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: () => {
     yargs2.help();
   }
@@ -1150,8 +1181,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs23) {
-  return yargs23.option("state", {
+function withStateOptions(yargs25) {
+  return yargs25.option("state", {
     type: "string",
     describe: `Composition state to fetch.`,
     choices: ["preview", "published"],
@@ -1176,12 +1207,12 @@ function convertCompositionState(state) {
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs23) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs23.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,
@@ -1252,12 +1283,12 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs23) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs23.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: {
@@ -1377,13 +1408,13 @@ function createComponentInstanceEngineDataSource({
 // src/commands/canvas/commands/composition/publish.ts
 var CompositionPublishModule = {
   command: "publish [ids]",
-  describe: "Publishes compositions",
-  builder: (yargs23) => withConfiguration(
+  describe: "Publishes composition(s)",
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.positional("ids", {
-            describe: "Publishes composition/pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+          yargs25.positional("ids", {
+            describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
             alias: ["a"],
@@ -1395,12 +1426,32 @@ var CompositionPublishModule = {
             describe: "What-if mode reports what would be done but does not perform any publishing",
             default: false,
             type: "boolean"
+          }).option("onlyCompositions", {
+            describe: "Only publishing compositions and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not compositions",
+            default: false,
+            type: "boolean",
+            hidden: true
           })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, whatIf, project: projectId, diff: diffMode }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    onlyCompositions,
+    onlyPatterns
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
       process.exit(1);
@@ -1411,17 +1462,22 @@ var CompositionPublishModule = {
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "preview",
-      compositionIDs: compositionIDsArray
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
     });
     const target = createComponentInstanceEngineDataSource({
       client,
       state: "published",
-      compositionIDs: compositionIDsArray
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
     });
     await syncEngine({
       source,
       target,
-      mode: "mirror",
+      // Publishing is one-direction operation, so no need to support automatic un-publishing
+      mode: "createOrUpdate",
       whatIf,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
@@ -1430,15 +1486,190 @@ 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.getFile({ projectId: options.projectId, url }).catch(() => null),
+            options.fileClient.getFile({ projectId: options.projectId, 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.createNewProjectFile({
+            name: fileName,
+            mediaType: preferredType(url.split(".").at(-1) ?? ""),
+            size: fileBuffer.length,
+            width,
+            height,
+            projectId: options.projectId,
+            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.getFile({ id });
+            if (!file || file.state !== FILE_READY_STATE) {
+              await new Promise((resolve) => setTimeout(resolve, 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.getFile({ projectId: options.projectId, url }).catch(() => null),
+            options.fileClient.getFile({ projectId: options.projectId, 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs23.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", {
@@ -1516,22 +1747,28 @@ var CompositionPullModule = {
       target,
       mode,
       whatIf,
-      log: createSyncEngineConsoleLogger({ diffMode })
+      log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeWriteObject: async (sourceObject) => {
+        return extractAndDownloadUniformFilesForObject(sourceObject, {
+          directory
+        });
+      }
     });
   }
 };
 
 // src/commands/canvas/commands/composition/push.ts
 import { UncachedCanvasClient as UncachedCanvasClient11 } from "@uniformdev/canvas";
+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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs23.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", {
@@ -1592,12 +1829,26 @@ var CompositionPushModule = {
       });
     }
     const target = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
+    const fileClient = new FileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
       mode,
       whatIf,
-      log: createSyncEngineConsoleLogger({ diffMode })
+      log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return swapOutUniformFileUrlsForTargetProject(sourceObject, {
+          fileClient,
+          projectId
+        });
+      },
+      onBeforeWriteObject: async (sourceObject) => {
+        return extractAndUploadUniformFilesForObject(sourceObject, {
+          directory,
+          fileClient,
+          projectId
+        });
+      }
     });
   }
 };
@@ -1608,10 +1859,10 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
       )
     )
   ),
@@ -1624,23 +1875,99 @@ var CompositionRemoveModule = {
 
 // src/commands/canvas/commands/composition/unpublish.ts
 import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2, UncachedCanvasClient as UncachedCanvasClient13 } from "@uniformdev/canvas";
+import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
-  command: "unpublish <id>",
-  describe: "Unpublish a composition",
-  builder: (yargs23) => withConfiguration(
+  command: "unpublish [ids]",
+  describe: "Unpublish a composition(s)",
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", {
-          demandOption: true,
-          describe: "Composition/pattern public ID to unpublish"
+        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", {
+          alias: ["a"],
+          describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+          default: false,
+          type: "boolean"
+        }).option("what-if", {
+          alias: ["w"],
+          describe: "What-if mode reports what would be done but does not perform any publishing",
+          default: false,
+          type: "boolean"
+        }).option("onlyCompositions", {
+          describe: "Only publishing compositions and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only pulling patterns and not compositions",
+          default: false,
+          type: "boolean",
+          hidden: true
         })
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    onlyCompositions,
+    onlyPatterns,
+    project: projectId,
+    diff,
+    whatIf
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or composition ID(s) to publish.`);
+      process.exit(1);
+    }
+    const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const targetItems = /* @__PURE__ */ new Map();
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient13({ apiKey, apiHost, fetch: fetch3, projectId });
-    await client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 });
+    const source = createComponentInstanceEngineDataSource({
+      client,
+      state: "published",
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
+    });
+    const target = createComponentInstanceEngineDataSource({
+      client,
+      state: "preview",
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
+    });
+    const actions = [];
+    const log = createSyncEngineConsoleLogger({ diffMode: diff });
+    for await (const obj of target.objects) {
+      if (Array.isArray(obj.id)) {
+        obj.id.forEach((o) => targetItems.set(o, obj));
+      } else {
+        targetItems.set(obj.id, obj);
+      }
+    }
+    for await (const sourceObject of source.objects) {
+      const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
+      const targetObject = targetItems.get(id);
+      if (!targetObject) {
+        console.log(`Composition ${id} was not found`);
+        return;
+      }
+      actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
+      log({
+        action: "update",
+        id,
+        providerId: sourceObject.providerId,
+        displayName: sourceObject.displayName ?? sourceObject.providerId,
+        whatIf,
+        diff: diffJson2(targetObject.object, sourceObject.object)
+      });
+    }
   }
 };
 
@@ -1650,11 +1977,11 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs23.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+          yargs25.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
         )
       )
     )
@@ -1672,14 +1999,291 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs23) => yargs23.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: () => {
+    yargs3.help();
+  }
+};
+
+// src/commands/canvas/commands/contentType.ts
+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: (yargs25) => withFormatOptions(
+    withApiOptions(
+      withProjectOptions(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        yargs25.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
+    const found = res.contentTypes.find((f) => f.id === id);
+    if (!found) {
+      throw new Error(`Content type with ID ${id} not found`);
+    }
+    emitWithFormat(found, format, filename);
+  }
+};
+
+// src/commands/canvas/commands/contentType/list.ts
+import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
+var ContentTypeListModule = {
+  command: "list",
+  describe: "List content types",
+  builder: (yargs25) => 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 });
+    const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
+    emitWithFormat(res.contentTypes, format, filename);
+  }
+};
+
+// src/commands/canvas/commands/contentType/pull.ts
+import { ContentClient as ContentClient3 } from "@uniformdev/canvas";
+
+// src/commands/canvas/commands/contentType/_util.ts
+var selectContentTypeIdentifier = (ct) => ct.id;
+var selectContentTypeDisplayName = (ct) => `${ct.name} (pid: ${ct.id})`;
+
+// src/commands/canvas/contentTypeEngineDataSource.ts
+function createContentTypeEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const { contentTypes } = await client.getContentTypes({ offset: 0, limit: 1e3 });
+    for await (const ct of contentTypes) {
+      const result = {
+        id: selectContentTypeIdentifier(ct),
+        displayName: selectContentTypeDisplayName(ct),
+        providerId: ct.id,
+        object: ct
+      };
+      yield result;
+    }
+  }
+  return {
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.deleteContentType({ contentTypeId: providerId });
+    },
+    writeObject: async ({ object }) => {
+      await client.upsertContentType({ contentType: object });
+    }
+  };
+}
+
+// src/commands/canvas/commands/contentType/pull.ts
+var ContentTypePullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all content types to local files in a directory",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      withDiffOptions(
+        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", {
+          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 ContentClient3({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    const source = createContentTypeEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        objects: packageContents.contentTypes ?? [],
+        selectIdentifier: selectContentTypeIdentifier,
+        selectDisplayName: selectContentTypeDisplayName,
+        onSyncComplete: async (_, synced) => {
+          packageContents.contentTypes = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectContentTypeIdentifier,
+        selectDisplayName: selectContentTypeDisplayName,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/contentType/push.ts
+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: (yargs25) => withApiOptions(
+    withProjectOptions(
+      withDiffOptions(
+        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", {
+          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 ContentClient4({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        objects: packageContents.contentTypes ?? [],
+        selectIdentifier: selectContentTypeIdentifier,
+        selectDisplayName: selectContentTypeDisplayName
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectContentTypeIdentifier,
+        selectDisplayName: selectContentTypeDisplayName
+      });
+    }
+    const target = createContentTypeEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/contentType/remove.ts
+import { ContentClient as ContentClient5 } from "@uniformdev/canvas";
+var ContentTypeRemoveModule = {
+  command: "remove <id>",
+  aliases: ["delete", "rm"],
+  describe: "Delete a content type",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      yargs25.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.deleteContentType({ contentTypeId: id });
+  }
+};
+
+// src/commands/canvas/commands/contentType/update.ts
+import { ContentClient as ContentClient6 } from "@uniformdev/canvas";
+var ContentTypeUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update a content type",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      yargs25.positional("filename", { demandOption: true, describe: "Content type file to put" })
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const file = readFileToObject(filename);
+    await client.upsertContentType({ contentType: file });
+  }
+};
+
+// src/commands/canvas/commands/contentType.ts
+var ContentTypeModule = {
+  command: "contenttype <command>",
+  aliases: ["ct"],
+  describe: "Commands for Content Types",
+  builder: (yargs25) => yargs25.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
-    yargs3.help();
+    yargs4.help();
   }
 };
 
 // src/commands/canvas/commands/dataType.ts
-import yargs4 from "yargs";
+import yargs5 from "yargs";
 
 // src/commands/canvas/commands/dataType/get.ts
 import { DataTypeClient } from "@uniformdev/canvas";
@@ -1687,12 +2291,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs23.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -1715,7 +2319,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -1764,11 +2368,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -1849,11 +2453,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -1923,10 +2527,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -1943,10 +2547,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -1963,14 +2567,287 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs4.help();
+    yargs5.help();
+  }
+};
+
+// src/commands/canvas/commands/entry.ts
+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: (yargs25) => withFormatOptions(
+    withApiOptions(
+      withProjectOptions(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        yargs25.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient7({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const res = await client.getEntries({ offset: 0, limit: 1, entryIDs: [id] });
+    if (res.entries.length !== 1) {
+      throw new Error(`Entry with ID ${id} not found`);
+    }
+    emitWithFormat(res.entries[0], format, filename);
+  }
+};
+
+// src/commands/canvas/commands/entry/list.ts
+import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
+var EntryListModule = {
+  command: "list",
+  describe: "List entries",
+  builder: (yargs25) => 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 });
+    const res = await client.getEntries({ offset: 0, limit: 1e3 });
+    emitWithFormat(res.entries, format, filename);
+  }
+};
+
+// src/commands/canvas/commands/entry/pull.ts
+import { ContentClient as ContentClient9 } from "@uniformdev/canvas";
+
+// src/commands/canvas/commands/entry/_util.ts
+var selectEntryIdentifier = (e) => e.entry._id;
+var selectEntryDisplayName = (e) => `${e.entry._name ?? "Untitled"} (pid: ${e.entry._id})`;
+
+// src/commands/canvas/entryEngineDataSource.ts
+function createEntryEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const { entries } = await client.getEntries({ offset: 0, limit: 1e3 });
+    for await (const e of entries) {
+      const result = {
+        id: selectEntryIdentifier(e),
+        displayName: selectEntryDisplayName(e),
+        providerId: e.entry._id,
+        object: e
+      };
+      yield result;
+    }
+  }
+  return {
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.deleteEntry({ entryId: providerId });
+    },
+    writeObject: async ({ object }) => {
+      await client.upsertEntry(object);
+    }
+  };
+}
+
+// src/commands/canvas/commands/entry/pull.ts
+var EntryPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all entries to local files in a directory",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      withDiffOptions(
+        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", {
+          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 ContentClient9({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    const source = createEntryEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        objects: packageContents.entries ?? [],
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName,
+        onSyncComplete: async (_, synced) => {
+          packageContents.entries = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/entry/push.ts
+import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
+var EntryPushModule = {
+  command: "push <directory>",
+  describe: "Pushes all entries from files in a directory to Uniform",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      withDiffOptions(
+        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", {
+          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 ContentClient10({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        objects: packageContents.entries ?? [],
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName
+      });
+    }
+    const target = createEntryEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/entry/remove.ts
+import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
+var EntryRemoveModule = {
+  command: "remove <id>",
+  aliases: ["delete", "rm"],
+  describe: "Delete an entry",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(
+      yargs25.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient11({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.deleteEntry({ entryId: id });
+  }
+};
+
+// src/commands/canvas/commands/entry/update.ts
+import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
+var EntryUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update an entry",
+  builder: (yargs25) => withApiOptions(
+    withProjectOptions(yargs25.positional("filename", { demandOption: true, describe: "Entry file to put" }))
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const file = readFileToObject(filename);
+    await client.upsertEntry(file);
+  }
+};
+
+// src/commands/canvas/commands/entry.ts
+var EntryModule = {
+  command: "entry <command>",
+  describe: "Commands for Entries",
+  builder: (yargs25) => yargs25.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).demandCommand(),
+  handler: () => {
+    yargs6.help();
   }
 };
 
 // src/commands/canvas/commands/pattern.ts
-import yargs5 from "yargs";
+import yargs7 from "yargs";
 
 // src/commands/canvas/commands/pattern/get.ts
 var PatternGetModule = {
@@ -1982,12 +2859,12 @@ var PatternGetModule = {
 var PatternListModule = {
   ...CompositionListModule,
   describe: "List patterns",
-  builder: (yargs23) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs23.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: {
@@ -2024,19 +2901,55 @@ var PatternListModule = {
 // src/commands/canvas/commands/pattern/publish.ts
 var PatternPublishModule = {
   ...CompositionPublishModule,
-  describe: "Publishes patterns"
+  describe: "Publishes pattern(s)",
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs25.positional("ids", {
+            describe: "Publishes pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Publishes all patterns. Use compositionId to publish one instead.",
+            default: false,
+            type: "boolean"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but does not perform any un-publishing",
+            default: false,
+            type: "boolean"
+          }).option("publishingState", {
+            describe: 'Publishing state to update to. Can be "published" or "preview".',
+            default: "published",
+            type: "string",
+            hidden: true
+          }).option("onlyCompositions", {
+            describe: "Only publishing compositions and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not compositions",
+            default: true,
+            type: "boolean",
+            hidden: true
+          })
+        )
+      )
+    )
+  )
 };
 
 // src/commands/canvas/commands/pattern/pull.ts
 var PatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all patterns to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs23.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", {
@@ -2074,12 +2987,12 @@ var PatternPullModule = {
 var PatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all patterns from files in a directory to Uniform Canvas",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs23.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", {
@@ -2115,8 +3028,38 @@ var PatternRemoveModule = {
 
 // src/commands/canvas/commands/pattern/unpublish.ts
 var PatternUnpublishModule = {
-  ...CompositionUnpublishModule,
-  describe: "Unpublish a pattern"
+  command: "unpublish [ids]",
+  describe: "Unpublish a pattern(s)",
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        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", {
+          alias: ["a"],
+          describe: "Un-pPublishes all compositions. Use compositionId to publish one instead.",
+          default: false,
+          type: "boolean"
+        }).option("what-if", {
+          alias: ["w"],
+          describe: "What-if mode reports what would be done but does not perform any publishing",
+          default: false,
+          type: "boolean"
+        }).option("onlyCompositions", {
+          describe: "Only publishing compositions and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only pulling patterns and not compositions",
+          default: true,
+          type: "boolean",
+          hidden: true
+        })
+      )
+    )
+  ),
+  handler: CompositionUnpublishModule.handler
 };
 
 // src/commands/canvas/commands/pattern/update.ts
@@ -2129,9 +3072,9 @@ var PatternUpdateModule = {
 var PatternModule = {
   command: "pattern <command>",
   describe: "Commands for Canvas patterns",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs5.help();
+    yargs7.help();
   }
 };
 
@@ -2140,28 +3083,28 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs23) => yargs23.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(CategoryModule).command(PatternModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(CategoryModule).command(PatternModule).command(ContentTypeModule).command(EntryModule).demandCommand(),
   handler: () => {
-    yargs6.showHelp();
+    yargs8.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs13 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs7 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -2185,7 +3128,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -2251,11 +3194,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -2330,11 +3273,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -2399,10 +3342,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -2419,10 +3362,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -2439,25 +3382,25 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs7.help();
+    yargs9.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs8 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: (yargs23) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -2482,7 +3425,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -2583,11 +3526,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -2662,11 +3605,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -2730,10 +3673,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -2749,14 +3692,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs8.help();
+    yargs10.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs9 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
@@ -2767,10 +3710,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.option("preview", {
+        yargs25.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -2832,7 +3775,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs23) => withConfiguration(withApiOptions(withProjectOptions(yargs23))),
+  builder: (yargs25) => withConfiguration(withApiOptions(withProjectOptions(yargs25))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -2865,25 +3808,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs23) => yargs23.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs9.help();
+    yargs11.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs10 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -2907,11 +3850,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.option("withIntegrations", {
+          yargs25.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -2968,11 +3911,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3047,11 +3990,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3115,10 +4058,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -3135,10 +4078,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -3155,25 +4098,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs10.help();
+    yargs12.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs11 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -3197,7 +4140,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -3246,11 +4189,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3325,11 +4268,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3393,10 +4336,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -3413,10 +4356,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -3433,25 +4376,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs11.help();
+    yargs13.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs12 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -3475,7 +4418,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -3524,11 +4467,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3603,11 +4546,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -3671,10 +4614,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs25.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -3691,9 +4634,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs23.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 }) => {
@@ -3708,9 +4651,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs12.help();
+    yargs14.help();
   }
 };
 
@@ -3719,9 +4662,9 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs13.showHelp();
+    yargs15.showHelp();
   }
 };
 
@@ -3749,7 +4692,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.38.2",
+  version: "19.46.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3757,7 +4700,7 @@ var package_default = {
   sideEffects: false,
   scripts: {
     uniform: "node ./cli.js",
-    build: "tsup",
+    build: "tsc --noEmit && tsup",
     dev: "tsup --watch",
     clean: "rimraf dist",
     test: "jest --maxWorkers=1 --passWithNoTests",
@@ -3765,8 +4708,10 @@ var package_default = {
     format: 'prettier --write "src/**/*.{js,ts,tsx}"'
   },
   dependencies: {
+    "@thi.ng/mime": "^2.2.23",
     "@uniformdev/canvas": "workspace:*",
     "@uniformdev/context": "workspace:*",
+    "@uniformdev/files": "workspace:*",
     "@uniformdev/project-map": "workspace:*",
     "@uniformdev/redirect": "workspace:*",
     colorette: "2.0.20",
@@ -3776,10 +4721,11 @@ var package_default = {
     dotenv: "^16.0.3",
     execa: "5.1.1",
     "fs-jetpack": "5.1.0",
-    graphql: "16.7.1",
+    graphql: "16.8.0",
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
-    inquirer: "9.2.9",
+    "image-size": "^1.0.2",
+    inquirer: "9.2.10",
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
@@ -3787,6 +4733,7 @@ var package_default = {
     "lodash.isequalwith": "^4.4.0",
     open: "9.1.0",
     ora: "6.3.1",
+    "p-queue": "7.3.4",
     "posthog-node": "3.1.1",
     slugify: "1.6.6",
     "update-check": "^1.5.4",
@@ -3799,7 +4746,7 @@ var package_default = {
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.17.1",
+    "@types/node": "18.17.5",
     "@types/yargs": "17.0.24"
   },
   bin: {
@@ -4123,8 +5070,8 @@ ${err.message}`);
 
 // src/projects/cloneStarter.ts
 import crypto2 from "crypto";
-import fs2 from "fs";
-import fsj from "fs-jetpack";
+import fs3 from "fs";
+import fsj2 from "fs-jetpack";
 import * as git from "isomorphic-git";
 import * as http from "isomorphic-git/http/node/index.js";
 import os from "os";
@@ -4140,7 +5087,7 @@ async function cloneStarter({
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
     await git.clone({
-      fs: fs2,
+      fs: fs3,
       http,
       url: `https://github.com/${user}/${repo}`,
       dir: cloneDir,
@@ -4151,13 +5098,13 @@ async function cloneStarter({
     throw new Error(`Failed to fetch starter code: ${err.message}`);
   }
   await done();
-  if (fs2.existsSync(targetDir) && fs2.readdirSync(targetDir).length > 0) {
+  if (fs3.existsSync(targetDir) && fs3.readdirSync(targetDir).length > 0) {
     throw new Error(`"${targetDir}" is not empty`);
   }
   const starterDir = path.join(cloneDir, ...pathSegments);
-  fsj.copy(starterDir, targetDir, { overwrite: true });
+  fsj2.copy(starterDir, targetDir, { overwrite: true });
   if (dotEnvFile) {
-    fs2.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+    fs3.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
   console.log(`
 Your project now lives in ${targetDir} \u2728`);
@@ -4173,7 +5120,7 @@ Installing project dependencies...
 }
 
 // src/projects/getOrCreateProject.ts
-import fs3, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
+import fs4, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import inquirer2 from "inquirer";
 import path2 from "path";
 import slugify from "slugify";
@@ -4300,9 +5247,9 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
     if (!existsSync2(targetDir)) {
       mkdirSync2(targetDir, { recursive: true });
     }
-    if (fs3.readdirSync(targetDir).length > 0) {
+    if (fs4.readdirSync(targetDir).length > 0) {
       targetDir = path2.resolve(targetDir, projectNameSlug);
-      if (fs3.existsSync(targetDir)) {
+      if (fs4.existsSync(targetDir)) {
         throw new Error(`${targetDir} already exists, choose a different name.`);
       }
     }
@@ -4787,10 +5734,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs15 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs14 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";
@@ -4805,7 +5752,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs23) => yargs23.option("apiKey", {
+  builder: (yargs25) => yargs25.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -4906,10 +5853,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs14.command(download_default);
+    return yargs16.command(download_default);
   },
   handler: () => {
-    yargs14.showHelp();
+    yargs16.showHelp();
   }
 };
 var manifest_default = module2;
@@ -4920,29 +5867,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs15.command(manifest_default);
+    return yargs17.command(manifest_default);
   },
   handler: () => {
-    yargs15.showHelp();
+    yargs17.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs18 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs16 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: (yargs23) => withFormatOptions(
+  builder: (yargs25) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -4966,7 +5913,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -5023,11 +5970,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5102,11 +6049,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5170,9 +6117,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs23.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 }) => {
@@ -5188,10 +6135,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -5207,25 +6154,25 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs16.help();
+    yargs18.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs17 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.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" })
         )
       )
     )
@@ -5251,11 +6198,11 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("projectMapId", {
+          yargs25.positional("projectMapId", {
             demandOption: true,
             describe: "ProjectMap UUID to fetch from"
           })
@@ -5326,11 +6273,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5409,11 +6356,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5486,10 +6433,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.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" })
       )
     )
   ),
@@ -5506,10 +6453,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.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" })
       )
     )
   ),
@@ -5525,9 +6472,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs17.help();
+    yargs19.help();
   }
 };
 
@@ -5536,28 +6483,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs23) => yargs23.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs18.showHelp();
+    yargs20.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs20 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs19 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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs23.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs25.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -5581,7 +6528,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs23) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs23)))),
+  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 });
@@ -5647,11 +6594,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5727,11 +6674,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: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.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", {
@@ -5795,9 +6742,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs23.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 }) => {
@@ -5813,10 +6760,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs25.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -5832,9 +6779,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs23) => yargs23.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: () => {
-    yargs19.help();
+    yargs21.help();
   }
 };
 
@@ -5843,24 +6790,24 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs23) => yargs23.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs20.showHelp();
+    yargs22.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs21 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/sync/commands/pull.ts
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.option("what-if", {
+          yargs25.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes no files",
             default: false,
@@ -5894,6 +6841,7 @@ var SyncPullModule = {
       await module3.handler({
         ...otherParams,
         state: 0,
+        format: getFormat(entityType, config2),
         onlyCompositions: entityType === "composition" ? true : void 0,
         onlyPatterns: entityType === "pattern" ? true : void 0,
         mode: getPullMode(entityType, config2),
@@ -5917,16 +6865,24 @@ var getPullFilename = (entityType, config2) => {
     entityType
   });
 };
+var getFormat = (entityType, config2) => {
+  return getEntityOption({
+    optionName: "format",
+    operation: "pull",
+    config: config2,
+    entityType
+  });
+};
 
 // src/commands/sync/commands/push.ts
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs23) => withConfiguration(
+  builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs23.option("what-if", {
+          yargs25.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes nothing",
             default: false,
@@ -5961,6 +6917,7 @@ var SyncPushModule = {
       await module3.handler({
         ...otherParams,
         state: 0,
+        format: getFormat2(entityType, config2),
         onlyCompositions: entityType === "composition" ? true : void 0,
         onlyPatterns: entityType === "pattern" ? true : void 0,
         mode: getPushMode(entityType, config2),
@@ -5990,14 +6947,22 @@ var getPushFilename = (entityType, config2) => {
     entityType
   });
 };
+var getFormat2 = (entityType, config2) => {
+  return getEntityOption({
+    optionName: "format",
+    operation: "push",
+    config: config2,
+    entityType
+  });
+};
 
 // src/commands/sync/index.ts
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs23) => yargs23.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs25) => yargs25.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs21.showHelp();
+    yargs23.showHelp();
   }
 };
 
@@ -6041,17 +7006,17 @@ async function checkForUpdateMiddleware() {
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red6 } from "colorette";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 
 // src/fs.ts
-import { promises as fs4 } from "fs";
+import { promises as fs5 } from "fs";
 async function readJSON(path4) {
-  const fileContents = await fs4.readFile(path4, "utf-8");
+  const fileContents = await fs5.readFile(path4, "utf-8");
   return JSON.parse(fileContents);
 }
 async function tryReadJSON(path4, missingValue = null) {
   try {
-    const stat = await fs4.stat(path4);
+    const stat = await fs5.stat(path4);
     return stat.isFile() ? await readJSON(path4) : missingValue;
   } catch (e) {
     return missingValue;
@@ -6080,7 +7045,7 @@ var checkLocalDepsVersions = async (args) => {
   try {
     let isOutside = false;
     let warning = `${magenta("Warning:")} Installed Uniform packages should be the same version`;
-    const localPackages = await tryReadJSON(join2(process.cwd(), "package.json"));
+    const localPackages = await tryReadJSON(join3(process.cwd(), "package.json"));
     if (!localPackages)
       return;
     let firstVersion;
@@ -6113,30 +7078,13 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs22(hideBin(process.argv));
-var moduleName = "uniform";
-var syncCosmicExplorer = cosmiconfigSync("uniform", {
-  searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.json`],
-  loaders: {
-    ".ts": TypeScriptLoader()
-  }
-});
-var searchedForm = syncCosmicExplorer.search();
-var cosmicConfig = applyDefaultSyncConfiguration((searchedForm == null ? void 0 : searchedForm.config) ?? {});
+var yarggery = yargs24(hideBin(process.argv));
+var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
+var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {
   describe: "Include verbose logging",
   default: false,
   type: "boolean"
-}).scriptName("uniform").config(cosmicConfig).config("config", function(configPath) {
-  if (!fs5.existsSync(configPath)) {
-    throw new Error(`Invalid configuration file path: ${configPath}. File does not exist.`);
-  }
-  const config2 = syncCosmicExplorer.load(configPath);
-  if (!(config2 == null ? void 0 : config2.config.serialization)) {
-    throw new Error(
-      `Invalid configuration file: ${configPath}. Missing config.serialization configuration.`
-    );
-  }
-  const configuration = applyDefaultSyncConfiguration((config2 == null ? void 0 : config2.config) ?? {});
-  return { serialization: configuration.serialization };
+}).scriptName("uniform").config(configuration).config("config", function() {
+  return {};
 }).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(RedirectCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(OptimizeCommand).demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).argv;