@uniformdev/cli 19.135.1-alpha.10 → 19.135.1-alpha.12

package/dist/index.mjs

@@ -1,26 +1,29 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// ../../node_modules/.pnpm/tsup@8.0.2_@microsoft+api-extractor@7.43.2_postcss@8.4.38_typescript@5.3.3/node_modules/tsup/assets/esm_shims.js
-import { fileURLToPath } from "url";
-import path from "path";
-var getFilename = () => fileURLToPath(import.meta.url);
-var getDirname = () => path.dirname(getFilename());
-var __dirname = /* @__PURE__ */ getDirname();
+import {
+  __require,
+  applyDefaultSyncConfiguration,
+  emitWithFormat,
+  getDirectoryOrFilename,
+  getEntityOption,
+  isPathAPackageFile,
+  nodeFetchProxy,
+  paginateAsync,
+  readFileToObject,
+  withApiOptions,
+  withConfiguration,
+  withDiffOptions,
+  withFormatOptions,
+  withProjectOptions,
+  withTeamOptions
+} from "./chunk-VMUNHMVI.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs33 from "yargs";
+import yargs35 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs14 from "yargs";
+import yargs16 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
 import yargs from "yargs";
@@ -59,8 +62,7 @@ async function createArraySyncEngineDataSource({
   );
   async function* getObjects() {
     for (const item of Object.values(objectIndex)) {
-      if (typeof item === "object")
-        yield item;
+      if (typeof item === "object") yield item;
     }
   }
   function extractCurrent() {
@@ -90,9 +92,9 @@ async function createArraySyncEngineDataSource({
 
 // src/sync/fileSyncEngineDataSource.ts
 import { red } from "colorette";
-import { existsSync, mkdirSync as mkdirSync2 } from "fs";
+import { existsSync, mkdirSync } from "fs";
 import { readdir, unlink } from "fs/promises";
-import { extname as extname2, join } from "path";
+import { extname, join } from "path";
 
 // src/util.ts
 import { cosmiconfigSync } from "cosmiconfig";
@@ -121,254 +123,16 @@ var loadConfig = (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)) {
+    if (!configFile?.config.serialization) {
       throw new Error(
         `Invalid configuration file: ${configPath}. Missing config.serialization configuration.`
       );
     }
-    return applyDefaultSyncConfiguration((configFile == null ? void 0 : configFile.config) ?? {});
+    return applyDefaultSyncConfiguration(configFile?.config ?? {});
   } else {
     const searchedForm = syncCosmicExplorer.search();
-    return applyDefaultSyncConfiguration((searchedForm == null ? void 0 : searchedForm.config) ?? {});
-  }
-};
-
-// src/sync/util.ts
-import { mkdirSync, readFileSync, writeFileSync } from "fs";
-import { dump, load } from "js-yaml";
-import { dirname, extname, isAbsolute, resolve, sep } from "path";
-import { fetch as undiciFetch, ProxyAgent } from "undici";
-function withConfiguration(yargs34) {
-  return yargs34.option("serialization", {
-    skipValidation: true,
-    hidden: true
-  });
-}
-function withApiOptions(yargs34) {
-  return yargs34.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
-    process.env.UPM_CLI_API_KEY ?? process.env.UNIFORM_API_KEY,
-    demandOption: true,
-    type: "string"
-  }).option("apiHost", {
-    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var or https://uniform.app. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app",
-    demandOption: true,
-    type: "string"
-  }).option("edgeApiHost", {
-    describe: "Uniform edge host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env var or https://uniform.global. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_BASE_EDGE_URL || "https://uniform.global",
-    demandOption: true,
-    type: "string"
-  }).option("proxy", {
-    describe: "HTTPS proxy to use for Uniform API calls. Defaults to HTTPS_PROXY, https_proxy, ALL_PROXY, or all_proxy env vars (in that order). Supports dotenv.",
-    default: process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy,
-    type: "string"
-  });
-}
-function nodeFetchProxy(proxy) {
-  if (proxy) {
-    console.log(`\u{1F991} Using proxy ${proxy}`);
-  }
-  const wrappedFetch = (input, init) => {
-    if (proxy) {
-      const wrappedInit = {
-        ...init,
-        dispatcher: new ProxyAgent(proxy)
-      };
-      return undiciFetch(input, wrappedInit);
-    }
-    return undiciFetch(input, init);
-  };
-  return wrappedFetch;
-}
-function withProjectOptions(yargs34) {
-  return yargs34.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
-    process.env.UPM_CLI_PROJECT_ID ?? process.env.UNIFORM_PROJECT_ID,
-    demandOption: true,
-    type: "string",
-    alias: ["p"]
-  });
-}
-function withTeamOptions(yargs34) {
-  return yargs34.option("team", {
-    describe: "Uniform team ID. Defaults to UNIFORM_CLI_TEAM_ID or UNIFORM_TEAM_ID env. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_TEAM_ID ?? process.env.UNIFORM_TEAM_ID,
-    demandOption: true,
-    type: "string",
-    alias: ["p"]
-  });
-}
-function withFormatOptions(yargs34) {
-  return yargs34.option("format", {
-    alias: ["f"],
-    describe: "Output format",
-    default: "yaml",
-    choices: ["yaml", "json"],
-    type: "string"
-  }).option("filename", {
-    alias: ["o"],
-    describe: "Output filename. If not specified, write to stdout.",
-    type: "string"
-  });
-}
-function withDiffOptions(yargs34) {
-  return yargs34.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",
-    choices: ["off", "update", "on"],
-    alias: ["d"]
-  });
-}
-function isPathAPackageFile(path5) {
-  const extension = extname(path5);
-  return extension === ".yaml" || extension === ".yml" || extension === ".json";
-}
-function emitWithFormat(object, format, filename) {
-  let content;
-  if (filename && !format) {
-    const extension = extname(filename);
-    if (extension === ".yaml" || extension === ".yml") {
-      format = "yaml";
-    } else if (extension === ".json") {
-      format = "json";
-    }
-  } else if (!format) {
-    throw new Error("Format must be specified when no filename is passed");
-  }
-  switch (format) {
-    case "json":
-      content = JSON.stringify(object, null, 2);
-      break;
-    case "yaml":
-      content = dump(object);
-      if ("$schema" in object) {
-        content = `# yaml-language-server: $schema=<${object["$schema"]}>
-${content}`;
-      }
-      break;
-    default:
-      throw new Error(`Unsupported format: ${format}`);
-  }
-  if (filename) {
-    const directory = dirname(filename);
-    mkDirByPathSync(directory);
-    writeFileSync(filename, content, "utf8");
-  } else {
-    console.log(content);
-  }
-}
-function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
-  const initDir = isAbsolute(targetDir) ? sep : "";
-  const baseDir = isRelativeToScript ? __dirname : ".";
-  return targetDir.split(sep).reduce((parentDir, childDir) => {
-    const curDir = resolve(baseDir, parentDir, childDir);
-    try {
-      mkdirSync(curDir);
-    } catch (err) {
-      if (err.code === "EEXIST") {
-        return curDir;
-      }
-      if (err.code === "ENOENT") {
-        throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
-      }
-      const caughtErr = ["EACCES", "EPERM", "EISDIR"].indexOf(err.code) > -1;
-      if (!caughtErr || caughtErr && curDir === resolve(targetDir)) {
-        throw err;
-      }
-    }
-    return curDir;
-  }, initDir);
-}
-function readFileToObject(filename) {
-  const file = readFileSync(filename, "utf8");
-  return load(file, { filename, json: true });
-}
-async function* paginateAsync(fetchPage, options) {
-  const perPage = options.pageSize || 100;
-  let offset = 0;
-  let pageData = [];
-  do {
-    pageData = await fetchPage(offset, perPage);
-    for (const item of pageData) {
-      yield item;
-    }
-    offset += perPage;
-  } while (pageData.length === perPage);
-}
-var defaultSyncConfiguration = {
-  entitiesConfig: {},
-  directory: "uniform-data",
-  allowEmptySource: false,
-  format: "yaml",
-  mode: "mirror"
-};
-var applyDefaultSyncConfiguration = (config2) => {
-  var _a;
-  const mergedConfig = {
-    serialization: {
-      ...defaultSyncConfiguration,
-      ...(config2 == null ? void 0 : config2.serialization) ?? {},
-      entitiesConfig: {
-        ...defaultSyncConfiguration.entitiesConfig,
-        ...((_a = config2 == null ? void 0 : config2.serialization) == null ? void 0 : _a.entitiesConfig) ?? {}
-      }
-    }
-  };
-  for (const entityType in mergedConfig.serialization.entitiesConfig) {
-    const entityTypeCasted = entityType;
-    const entityConfig = mergedConfig.serialization.entitiesConfig[entityTypeCasted];
-    if (Object.keys(entityConfig).length === 0) {
-      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;
-};
-var getEntityOption = ({
-  optionName,
-  config: config2,
-  entityType,
-  operation
-}) => {
-  var _a, _b, _c, _d, _e, _f;
-  if ((_b = (_a = config2.entitiesConfig[entityType]) == null ? void 0 : _a[operation]) == null ? void 0 : _b[optionName]) {
-    return (_d = (_c = config2.entitiesConfig[entityType]) == null ? void 0 : _c[operation]) == null ? void 0 : _d[optionName];
-  }
-  if ((_e = config2.entitiesConfig[entityType]) == null ? void 0 : _e[optionName]) {
-    return (_f = config2.entitiesConfig[entityType]) == null ? void 0 : _f[optionName];
-  }
-  if (config2[optionName]) {
-    return config2[optionName];
-  }
-  throw `No ${optionName} option specified for ${entityType} ${operation}`;
-};
-var getDirectoryOrFilename = ({
-  config: config2,
-  entityType,
-  operation,
-  defaultEntityFolderName = entityType
-}) => {
-  var _a, _b, _c, _d, _e, _f;
-  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.directory) {
-    return (_f = config2.entitiesConfig[entityType]) == null ? void 0 : _f.directory;
-  }
-  const isPackage = isPathAPackageFile(config2.directory);
-  if (isPackage) {
-    return config2.directory;
+    return applyDefaultSyncConfiguration(searchedForm?.config ?? {});
   }
-  return `${config2.directory}/${defaultEntityFolderName}`;
 };
 
 // src/sync/fileSyncEngineDataSource.ts
@@ -383,12 +147,12 @@ async function createFileSyncEngineDataSource({
 }) {
   const dirExists = existsSync(directory);
   if (!dirExists) {
-    mkdirSync2(directory, { recursive: true });
+    mkdirSync(directory, { recursive: true });
   }
   const rawFilenames = await readdir(directory, "utf-8");
   const filenames = new Set(
     rawFilenames.filter((filename) => {
-      const ext = extname2(filename);
+      const ext = extname(filename);
       return ext === `.json` || ext === `.yaml` || ext === `.yml`;
     })
   );
@@ -408,7 +172,7 @@ async function createFileSyncEngineDataSource({
         yield object;
       } catch (e) {
         console.error(red(`Failed to read ${fullFilename}, data is likely invalid.
-${e == null ? void 0 : e.message}`));
+${e?.message}`));
         throw e;
       }
     }
@@ -472,30 +236,33 @@ async function syncEngine({
   log = () => {
   },
   onBeforeCompareObjects,
-  onBeforeWriteObject
+  onBeforeWriteObject,
+  onError
 }) {
-  var _a, _b;
   const targetItems = /* @__PURE__ */ new Map();
   const deleteTracker = /* @__PURE__ */ new Set();
   const processDelete = async (object) => {
-    if (deleteTracker.has(object))
-      return;
+    if (deleteTracker.has(object)) return;
     deleteTracker.add(object);
     if (!whatIf) {
       try {
         await target.deleteObject(object.providerId, object);
+        log({
+          action: "delete",
+          id: object.id[0],
+          providerId: object.providerId,
+          displayName: object.displayName ?? object.providerId,
+          whatIf,
+          diff: diffLines(JSON.stringify(object.object, null, 2), "")
+        });
       } catch (e) {
-        throw new SyncEngineError(e, object);
+        if (onError) {
+          onError(e, object);
+        } else {
+          throw new SyncEngineError(e, object);
+        }
       }
     }
-    log({
-      action: "delete",
-      id: object.id[0],
-      providerId: object.providerId,
-      displayName: object.displayName ?? object.providerId,
-      whatIf,
-      diff: diffLines(JSON.stringify(object.object, null, 2), "")
-    });
   };
   for await (const obj of target.objects) {
     if (Array.isArray(obj.id)) {
@@ -510,7 +277,7 @@ async function syncEngine({
     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));
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o?.object !== targetObject?.object);
     if (targetObject && invalidTargetObjects.length == 0) {
       sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       if (!compareContents(sourceObject, targetObject)) {
@@ -520,18 +287,22 @@ async function syncEngine({
               try {
                 const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
                 await target.writeObject(finalSourceObject, targetObject2);
+                log({
+                  action: "update",
+                  id: ids[0],
+                  providerId: sourceObject2.providerId,
+                  displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+                  whatIf,
+                  diff: diffJson(targetObject2.object, sourceObject2.object)
+                });
               } catch (e) {
-                throw new SyncEngineError(e, sourceObject2);
+                if (onError) {
+                  onError(e, sourceObject2);
+                } else {
+                  throw new SyncEngineError(e, sourceObject2);
+                }
               }
             }
-            log({
-              action: "update",
-              id: ids[0],
-              providerId: sourceObject2.providerId,
-              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-              whatIf,
-              diff: diffJson(targetObject2.object, sourceObject2.object)
-            });
           };
           actions.push(process2(sourceObject, targetObject));
         }
@@ -543,23 +314,26 @@ async function syncEngine({
           try {
             const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
             await target.writeObject(finalSourceObject);
+            log({
+              action: "create",
+              id,
+              providerId: id,
+              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+              whatIf,
+              diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+            });
           } catch (e) {
-            throw new SyncEngineError(e, sourceObject2);
+            if (onError) {
+              onError(e, sourceObject2);
+            } else {
+              throw new SyncEngineError(e, sourceObject2);
+            }
           }
         }
-        log({
-          action: "create",
-          id,
-          providerId: id,
-          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-          whatIf,
-          diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
-        });
       };
       if (invalidTargetObjects.length > 0) {
         [...invalidTargetObjects, targetObject].forEach((o) => {
-          var _a2;
-          (_a2 = Array.isArray(o == null ? void 0 : o.id) ? o == null ? void 0 : o.id : [o == null ? void 0 : o.id]) == null ? void 0 : _a2.forEach((i) => i && targetItems.delete(i));
+          (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
         const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map(async (io) => {
           await processDelete(io);
@@ -586,7 +360,7 @@ async function syncEngine({
     });
     await Promise.all(deletes);
   }
-  await Promise.all([(_a = source.onSyncComplete) == null ? void 0 : _a.call(source, false), (_b = target.onSyncComplete) == null ? void 0 : _b.call(target, true)]);
+  await Promise.all([source.onSyncComplete?.(false), target.onSyncComplete?.(true)]);
 }
 var SyncEngineError = class _SyncEngineError extends Error {
   constructor(innerError, sourceObject) {
@@ -645,12 +419,12 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs34.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
         )
       )
     )
@@ -671,7 +445,7 @@ import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets"
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -691,7 +465,7 @@ import { createHash } from "crypto";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
 import PQueue from "p-queue";
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname, join as join2 } from "path";
 var FILES_DIRECTORY_NAME = "files";
 var escapeRegExp = (string) => {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -735,7 +509,7 @@ var urlToFileName = (url, hash) => {
 };
 var getFilesDirectory = (directory) => {
   const isPackage = isPathAPackageFile(directory);
-  return isPackage ? dirname2(directory) : (
+  return isPackage ? dirname(directory) : (
     // If we are syncing to a directory, we want to write all files into a
     // top-lvl folder. That way any entities that contain files will sync to the
     // same directory, so there is no duplication
@@ -809,7 +583,7 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   const writeDirectory = getFilesDirectory(options.directory);
   const isPackage = isPathAPackageFile(options.directory);
-  const legacyWriteDirectory = isPackage ? dirname2(options.directory) : options.directory;
+  const legacyWriteDirectory = isPackage ? dirname(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
@@ -886,7 +660,7 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             }
             const file2 = await options.fileClient.get({ id });
             if (!file2 || file2.state !== FILE_READY_STATE || !file2.url) {
-              await new Promise((resolve2) => setTimeout(resolve2, 1e3));
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
               return checkForFile();
             }
             return file2.url;
@@ -975,11 +749,10 @@ var replaceRemoteUrlsWithLocalReferences = async (sourceObject, targetObject, op
   return JSON.parse(sourceObjectAsString);
 };
 var updateAssetFileIdBasedOnUrl = async (asset, options) => {
-  var _a;
   if (!asset.asset.fields) {
     return asset;
   }
-  const fileUrl = (_a = asset.asset.fields.url) == null ? void 0 : _a.value;
+  const fileUrl = asset.asset.fields.url?.value;
   if (!fileUrl) {
     return asset;
   }
@@ -1009,10 +782,7 @@ import { convertAssetToPutAsset } from "@uniformdev/assets";
 
 // src/commands/canvas/commands/asset/_util.ts
 var selectAssetIdentifier = (e) => e.asset._id;
-var selectAssetDisplayName = (e) => {
-  var _a, _b;
-  return `${((_b = (_a = e.asset.fields) == null ? void 0 : _a.title) == null ? void 0 : _b.value) ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
-};
+var selectAssetDisplayName = (e) => `${e.asset.fields?.title?.value ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
 
 // src/commands/canvas/util.ts
 import {
@@ -1027,8 +797,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs34, defaultState = "preview") {
-  return yargs34.option("state", {
+function withStateOptions(yargs36, defaultState = "preview") {
+  return yargs36.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -1095,11 +865,11 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1148,9 +918,8 @@ var AssetPullModule = {
     let target;
     const isPackage = isPathAPackageFile(directory);
     const onBeforeDeleteObject = async (id, object) => {
-      var _a, _b;
       const asset = object.object;
-      if (!((_b = (_a = asset.asset.fields) == null ? void 0 : _a.url) == null ? void 0 : _b.value)) {
+      if (!asset.asset.fields?.url?.value) {
         return;
       }
       await deleteDownloadedFileByUrl(asset.asset.fields.url.value, {
@@ -1187,7 +956,6 @@ var AssetPullModule = {
       allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
-        var _a, _b;
         delete sourceObject.object.asset._author;
         const sourceObjectWithPotentiallySwappedUrl = await replaceRemoteUrlsWithLocalReferences(
           sourceObject,
@@ -1197,7 +965,7 @@ var AssetPullModule = {
             fileClient
           }
         );
-        if (((_a = sourceObjectWithPotentiallySwappedUrl.object.asset.fields) == null ? void 0 : _a.url) && ((_b = targetObject.object.asset.fields) == null ? void 0 : _b.url) && sourceObjectWithPotentiallySwappedUrl.object.asset.fields.url.value === targetObject.object.asset.fields.url.value) {
+        if (sourceObjectWithPotentiallySwappedUrl.object.asset.fields?.url && targetObject.object.asset.fields?.url && sourceObjectWithPotentiallySwappedUrl.object.asset.fields.url.value === targetObject.object.asset.fields.url.value) {
           targetObject.object.asset.fields.file = sourceObjectWithPotentiallySwappedUrl.object.asset.fields.file;
         }
         return sourceObjectWithPotentiallySwappedUrl;
@@ -1219,11 +987,11 @@ import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1324,9 +1092,9 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -1342,10 +1110,10 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Asset file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Asset file to put" })
       )
     )
   ),
@@ -1361,7 +1129,7 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs34) => yargs34.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
     yargs.help();
   }
@@ -1375,11 +1143,11 @@ import { UncachedCategoryClient } from "@uniformdev/canvas";
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -1404,7 +1172,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34.options({}))))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36.options({}))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1454,11 +1222,11 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -1536,11 +1304,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -1607,10 +1375,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -1627,10 +1395,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -1647,7 +1415,7 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs34) => yargs34.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
     yargs2.help();
   }
@@ -1668,11 +1436,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", {
+          yargs36.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -1706,11 +1474,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.options({
+          yargs36.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 }
           })
@@ -1766,11 +1534,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -1849,11 +1617,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -1921,10 +1689,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1941,10 +1709,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1961,7 +1729,7 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs34) => yargs34.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
     yargs3.help();
   }
@@ -1975,12 +1743,12 @@ import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canva
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs34) => withFormatOptions(
+  builder: (yargs36) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs34.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
+            yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
               resolvePatterns: {
                 type: "boolean",
                 default: false,
@@ -2005,6 +1773,11 @@ var CompositionGetModule = {
                 type: "boolean",
                 default: false,
                 describe: "Include diagnostics information when resolving data"
+              },
+              resolutionDepth: {
+                type: "number",
+                default: 1,
+                describe: "Controls how many levels deep content references should be resolved"
               }
             })
           )
@@ -2026,7 +1799,8 @@ var CompositionGetModule = {
     resolveOverrides,
     componentIDs,
     resolveData,
-    diagnostics
+    diagnostics,
+    resolutionDepth
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient7({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
@@ -2038,7 +1812,8 @@ var CompositionGetModule = {
         skipOverridesResolution: !resolveOverrides,
         withComponentIDs: componentIDs,
         skipDataResolution: !resolveData,
-        diagnostics
+        diagnostics: resolveData ? diagnostics : void 0,
+        resolutionDepth: resolveData ? resolutionDepth : void 0
       })
     );
     emitWithFormat(res, format, filename);
@@ -2057,12 +1832,12 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs34) => withFormatOptions(
+  builder: (yargs36) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs34.options({
+            yargs36.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 },
               search: { describe: "Search query", type: "string", default: "" },
@@ -2109,6 +1884,7 @@ var CompositionListModule = {
     filename,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     project: projectId,
     state,
     resolvePatterns,
@@ -2120,8 +1896,9 @@ var CompositionListModule = {
     const res = await client.getCompositionList({
       limit,
       offset,
-      search: search.length > 0 ? search : void 0,
+      search: search && search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
+      patternType,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
@@ -2135,12 +1912,12 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs34) => withFormatOptions(
+  builder: (yargs36) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs34.options({
+            yargs36.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: {
@@ -2160,6 +1937,11 @@ var ComponentPatternListModule = {
                 type: "boolean",
                 hidden: true
               },
+              patternType: {
+                default: "component",
+                choices: ["all", "component", "composition"],
+                hidden: true
+              },
               componentIDs: {
                 alias: ["componentIDs"],
                 type: "boolean",
@@ -2187,6 +1969,7 @@ function createComponentInstanceEngineDataSource({
   state,
   onlyCompositions,
   onlyPatterns,
+  patternType,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
@@ -2200,7 +1983,8 @@ function createComponentInstanceEngineDataSource({
         state: stateId,
         skipPatternResolution: true,
         skipOverridesResolution: true,
-        withComponentIDs: true
+        withComponentIDs: true,
+        patternType
       })).compositions,
       { pageSize: 100 }
     );
@@ -2230,11 +2014,11 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("ids", {
+          yargs36.positional("ids", {
             describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2270,7 +2054,8 @@ var CompositionPublishModule = {
     whatIf,
     project: projectId,
     onlyCompositions,
-    onlyPatterns
+    onlyPatterns,
+    patternType
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -2284,14 +2069,16 @@ var CompositionPublishModule = {
       state: "preview",
       compositionIDs: compositionIDsArray,
       onlyCompositions,
-      onlyPatterns
+      onlyPatterns,
+      patternType
     });
     const target = createComponentInstanceEngineDataSource({
       client,
       state: "published",
       compositionIDs: compositionIDsArray,
       onlyCompositions,
-      onlyPatterns
+      onlyPatterns,
+      patternType
     });
     await syncEngine({
       source,
@@ -2308,11 +2095,11 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("ids", {
+          yargs36.positional("ids", {
             describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2339,6 +2126,10 @@ var ComponentPatternPublishModule = {
             default: true,
             type: "boolean",
             hidden: true
+          }).option("patternType", {
+            default: "component",
+            choices: ["all", "component", "composition"],
+            hidden: true
           })
         )
       )
@@ -2352,12 +2143,12 @@ import { UncachedFileClient as UncachedFileClient3 } from "@uniformdev/files";
 var CompositionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -2400,6 +2191,7 @@ var CompositionPullModule = {
     format,
     onlyCompositions,
     onlyPatterns,
+    patternType = "all",
     mode,
     whatIf,
     state,
@@ -2410,14 +2202,20 @@ var CompositionPullModule = {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId });
     const fileClient = new UncachedFileClient3({ apiKey, apiHost, fetch: fetch3, projectId });
-    const source = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
+    const source = createComponentInstanceEngineDataSource({
+      client,
+      state,
+      onlyCompositions,
+      onlyPatterns,
+      patternType
+    });
     const isPackage = isPathAPackageFile(directory);
     let target;
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: (packageContents == null ? void 0 : packageContents.compositions) ?? [],
+        objects: packageContents?.compositions ?? [],
         selectIdentifier: selectIdentifier3,
         selectDisplayName: selectDisplayName3,
         onSyncComplete: async (_, synced) => {
@@ -2460,12 +2258,12 @@ var CompositionPullModule = {
 var ComponentPatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -2480,6 +2278,10 @@ var ComponentPatternPullModule = {
               default: true,
               type: "boolean",
               hidden: true
+            }).option("patternType", {
+              default: "component",
+              choices: ["all", "component", "composition"],
+              hidden: true
             }).option("what-if", {
               alias: ["w"],
               describe: "What-if mode reports what would be done but changes no files",
@@ -2505,12 +2307,12 @@ import { UncachedFileClient as UncachedFileClient4 } from "@uniformdev/files";
 var CompositionPushModule = {
   command: "push <directory>",
   describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -2550,6 +2352,7 @@ var CompositionPushModule = {
     project: projectId,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     diff: diffMode,
     allowEmptySource
   }) => {
@@ -2572,7 +2375,13 @@ var CompositionPushModule = {
         selectDisplayName: selectDisplayName3
       });
     }
-    const target = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
+    const target = createComponentInstanceEngineDataSource({
+      client,
+      state,
+      onlyCompositions,
+      onlyPatterns,
+      patternType
+    });
     const fileClient = new UncachedFileClient4({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
@@ -2600,12 +2409,12 @@ var CompositionPushModule = {
 var ComponentPatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.positional("directory", {
               describe: "Directory to read the compositions/component patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -2625,6 +2434,10 @@ var ComponentPatternPushModule = {
               default: true,
               type: "boolean",
               hidden: true
+            }).option("patternType", {
+              default: "component",
+              choices: ["all", "component", "composition"],
+              hidden: true
             })
           )
         )
@@ -2639,10 +2452,10 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
       )
     )
   ),
@@ -2660,15 +2473,18 @@ var ComponentPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2, UncachedCanvasClient as UncachedCanvasClient13 } from "@uniformdev/canvas";
+import {
+  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2,
+  UncachedCanvasClient as UncachedCanvasClient13
+} from "@uniformdev/canvas";
 import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("ids", {
+        yargs36.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2702,6 +2518,7 @@ var CompositionUnpublishModule = {
     all,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     project: projectId,
     whatIf
   }) => {
@@ -2718,14 +2535,16 @@ var CompositionUnpublishModule = {
       state: "published",
       compositionIDs: compositionIDsArray,
       onlyCompositions,
-      onlyPatterns
+      onlyPatterns,
+      patternType
     });
     const target = createComponentInstanceEngineDataSource({
       client,
       state: "preview",
       compositionIDs: compositionIDsArray,
       onlyCompositions,
-      onlyPatterns
+      onlyPatterns,
+      patternType
     });
     const actions = [];
     const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
@@ -2760,15 +2579,15 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("ids", {
+        yargs36.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.",
+          describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
           default: false,
           type: "boolean"
         }).option("what-if", {
@@ -2777,14 +2596,18 @@ var ComponentPatternUnpublishModule = {
           default: false,
           type: "boolean"
         }).option("onlyCompositions", {
-          describe: "Only publishing compositions and not component patterns",
+          describe: "Only un-publishing compositions and not component patterns",
           default: false,
           type: "boolean"
         }).option("onlyPatterns", {
-          describe: "Only pulling component patterns and not compositions",
+          describe: "Only un-publishing component patterns and not compositions",
           default: true,
           type: "boolean",
           hidden: true
+        }).option("patternType", {
+          default: "component",
+          choices: ["all", "component", "composition"],
+          hidden: true
         })
       )
     )
@@ -2798,11 +2621,11 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs34.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+          yargs36.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
         )
       )
     )
@@ -2824,9 +2647,8 @@ var ComponentPatternUpdateModule = {
 // src/commands/canvas/commands/componentPattern.ts
 var ComponentPatternModule = {
   command: "component-pattern <command>",
-  aliases: ["pattern"],
   describe: "Commands for Canvas component patterns",
-  builder: (yargs34) => yargs34.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs4.help();
   }
@@ -2838,133 +2660,384 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs34) => yargs34.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
     yargs5.help();
   }
 };
 
-// src/commands/canvas/commands/contentType.ts
+// src/commands/canvas/commands/compositionPattern.ts
 import yargs6 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: (yargs34) => withConfiguration(
-    withFormatOptions(
+// src/commands/canvas/commands/compositionPattern/get.ts
+var CompositionPatternGetModule = {
+  ...CompositionGetModule,
+  describe: "Fetch a composition pattern"
+};
+
+// src/commands/canvas/commands/compositionPattern/list.ts
+var CompositionPatternListModule = {
+  ...CompositionListModule,
+  describe: "List composition patterns",
+  builder: (yargs36) => withFormatOptions(
+    withConfiguration(
       withApiOptions(
         withProjectOptions(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs34.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          withStateOptions(
+            yargs36.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: {
+                type: "boolean",
+                default: false,
+                describe: "Resolve composition pattern references in the composition"
+              },
+              resolveOverrides: {
+                type: "boolean",
+                default: false,
+                describe: "Resolves composition pattern overrides in the composition and removes override definition data"
+              },
+              onlyPatterns: {
+                describe: "Only pulling composition patterns and not compositions",
+                // This default differentiate this list command from composition list command
+                default: true,
+                type: "boolean",
+                hidden: true
+              },
+              patternType: {
+                default: "composition",
+                choices: ["all", "component", "composition"],
+                hidden: true
+              },
+              componentIDs: {
+                alias: ["componentIDs"],
+                type: "boolean",
+                default: false,
+                describe: "Include individual composition pattern UIDs"
+              }
+            })
+          )
         )
       )
     )
-  ),
-  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: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
-  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 {
-    name: "Uniform API",
-    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: (yargs34) => withConfiguration(
+// src/commands/canvas/commands/compositionPattern/publish.ts
+var CompositionPatternPublishModule = {
+  ...CompositionPublishModule,
+  describe: "Publishes composition pattern(s)",
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.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"],
+          yargs36.positional("ids", {
+            describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Publishes all composition 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 changes no files",
+            describe: "What-if mode reports what would be done but does not perform any un-publishing",
             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"
+          }).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 composition patterns",
+            default: false,
+            type: "boolean",
+            hidden: true
+          }).option("patternType", {
+            default: "composition",
+            choices: ["all", "component", "composition"],
+            hidden: true
+          }).option("onlyPatterns", {
+            describe: "Only pulling composition patterns and not compositions",
+            default: true,
+            type: "boolean",
+            hidden: true
           })
         )
       )
     )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    format,
-    mode,
-    whatIf,
-    project: projectId,
+  )
+};
+
+// src/commands/canvas/commands/compositionPattern/pull.ts
+var CompositionPatternPullModule = {
+  ...CompositionPullModule,
+  describe: "Pulls all composition patterns to local files in a directory",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withStateOptions(
+          withDiffOptions(
+            yargs36.positional("directory", {
+              describe: "Directory to save the composition patterns 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("onlyPatterns", {
+              describe: "Only pulling composition patterns and not compositions",
+              // This default differentiates this list command from composition list command
+              default: true,
+              type: "boolean",
+              hidden: true
+            }).option("patternType", {
+              default: "composition",
+              choices: ["all", "component", "composition"],
+              hidden: true
+            }).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"
+            })
+          )
+        )
+      )
+    )
+  )
+};
+
+// src/commands/canvas/commands/compositionPattern/push.ts
+var CompositionPatternPushModule = {
+  ...CompositionPushModule,
+  describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withStateOptions(
+          withDiffOptions(
+            yargs36.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", {
+              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"
+            }).option("onlyPatterns", {
+              describe: "Only pulling composition patterns and not compositions",
+              // This default differentiate this list command from composition list command
+              default: true,
+              type: "boolean",
+              hidden: true
+            }).option("patternType", {
+              default: "composition",
+              choices: ["all", "component", "composition"],
+              hidden: true
+            })
+          )
+        )
+      )
+    )
+  )
+};
+
+// src/commands/canvas/commands/compositionPattern/remove.ts
+var CompositionPatternRemoveModule = {
+  ...CompositionRemoveModule,
+  describe: "Delete a composition pattern"
+};
+
+// src/commands/canvas/commands/compositionPattern/unpublish.ts
+var CompositionPatternUnpublishModule = {
+  command: "unpublish [ids]",
+  describe: "Unpublish a composition pattern(s)",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs36.positional("ids", {
+          describe: "Un-publishes composition pattern(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 un-publishing compositions and not composition patterns",
+          default: false,
+          type: "boolean",
+          hidden: true
+        }).option("onlyPatterns", {
+          describe: "Only un-publishing composition patterns and not compositions",
+          default: true,
+          type: "boolean",
+          hidden: true
+        })
+      )
+    )
+  ),
+  handler: CompositionUnpublishModule.handler
+};
+
+// src/commands/canvas/commands/compositionPattern/update.ts
+var CompositionPatternUpdateModule = {
+  ...CompositionUpdateModule,
+  describe: "Insert or update a composition pattern"
+};
+
+// src/commands/canvas/commands/compositionPattern.ts
+var CompositionPatternModule = {
+  command: "composition-pattern <command>",
+  describe: "Commands for Canvas composition patterns",
+  builder: (yargs36) => yargs36.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
+  handler: () => {
+    yargs6.help();
+  }
+};
+
+// src/commands/canvas/commands/contentType.ts
+import yargs7 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: (yargs36) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          yargs36.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: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  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 {
+    name: "Uniform API",
+    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: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs36.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,
     allowEmptySource
   }) => {
@@ -3015,11 +3088,11 @@ import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -3092,10 +3165,10 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
       )
     )
   ),
@@ -3112,10 +3185,10 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Content type file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Content type file to put" })
       )
     )
   ),
@@ -3132,25 +3205,25 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs34) => yargs34.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
-    yargs6.help();
+    yargs7.help();
   }
 };
 
 // src/commands/canvas/commands/dataSource.ts
-import yargs7 from "yargs";
+import yargs8 from "yargs";
 
 // src/commands/canvas/commands/dataSource/get.ts
 import { DataSourceClient } from "@uniformdev/canvas";
 var DataSourceGetModule = {
   command: "get <id>",
   describe: "Get a data source by ID and writes to stdout. Please note this may contain secret data, use discretion.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yargs34.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+        yargs36.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
       )
     )
   ),
@@ -3168,10 +3241,10 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
       )
     )
   ),
@@ -3188,10 +3261,10 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+        yargs36.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
           describe: "Integration type that exposes the connector type for this data source (as defined in integration manifest).",
           type: "string",
           demandOption: true
@@ -3211,14 +3284,14 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs34) => yargs34.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
-    yargs7.help();
+    yargs8.help();
   }
 };
 
 // src/commands/canvas/commands/dataType.ts
-import yargs8 from "yargs";
+import yargs9 from "yargs";
 
 // src/commands/canvas/commands/dataType/get.ts
 import { DataTypeClient } from "@uniformdev/canvas";
@@ -3226,12 +3299,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs34.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -3254,7 +3327,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3304,11 +3377,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -3392,11 +3465,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -3469,10 +3542,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -3489,10 +3562,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -3509,27 +3582,42 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs34) => yargs34.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
-    yargs8.help();
+    yargs9.help();
   }
 };
 
 // src/commands/canvas/commands/entry.ts
-import yargs9 from "yargs";
+import yargs10 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            yargs34.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }),
+            yargs36.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
+              resolveData: {
+                type: "boolean",
+                default: false,
+                describe: "Resolve all data resources used by the entry"
+              },
+              diagnostics: {
+                type: "boolean",
+                default: false,
+                describe: "Include diagnostics information when resolving data"
+              },
+              resolutionDepth: {
+                type: "number",
+                default: 1,
+                describe: "Controls how many levels deep content references should be resolved"
+              }
+            }),
             // for backwards compatibility, we default to the "published" state, unlike compositions
             "published"
           )
@@ -3546,7 +3634,10 @@ var EntryGetModule = {
     format,
     filename,
     project: projectId,
-    state
+    state,
+    resolveData,
+    diagnostics,
+    resolutionDepth
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient7({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3557,7 +3648,9 @@ var EntryGetModule = {
       state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
-      skipDataResolution: true
+      skipDataResolution: !resolveData,
+      diagnostics: resolveData ? diagnostics : void 0,
+      resolutionDepth: resolveData ? resolutionDepth : void 0
     });
     if (res.entries.length !== 1) {
       throw new Error(`Entry with ID ${id} not found`);
@@ -3572,12 +3665,12 @@ var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs34.options({
+            yargs36.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: LEGACY_DEFAULT_LIMIT },
               search: { describe: "Search query", type: "string", default: "" }
@@ -3678,11 +3771,11 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("ids", {
+          yargs36.positional("ids", {
             describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -3737,12 +3830,12 @@ import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -3842,12 +3935,12 @@ import { UncachedFileClient as UncachedFileClient6 } from "@uniformdev/files";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -3934,10 +4027,10 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
       )
     )
   ),
@@ -3954,10 +4047,10 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("ids", {
+        yargs36.positional("ids", {
           describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -4030,11 +4123,11 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs34.positional("filename", { demandOption: true, describe: "Entry file to put" })
+          yargs36.positional("filename", { demandOption: true, describe: "Entry file to put" })
         )
       )
     )
@@ -4051,27 +4144,26 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs34) => yargs34.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
-    yargs9.help();
+    yargs10.help();
   }
 };
 
 // src/commands/canvas/commands/entryPattern.ts
-import yargs10 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/canvas/commands/entryPattern/get.ts
 import { ContentClient as ContentClient16 } from "@uniformdev/canvas";
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            yargs34.positional("id", {
+            yargs36.positional("id", {
               demandOption: true,
               describe: "Entry pattern public ID to fetch"
             }),
@@ -4106,8 +4198,8 @@ import { ContentClient as ContentClient17 } from "@uniformdev/canvas";
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs34) => withConfiguration(
-    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs34, "published"))))
+  builder: (yargs36) => withConfiguration(
+    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs36, "published"))))
   ),
   handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -4130,11 +4222,11 @@ import { ContentClient as ContentClient18 } from "@uniformdev/canvas";
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("ids", {
+          yargs36.positional("ids", {
             describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -4189,12 +4281,12 @@ import { UncachedFileClient as UncachedFileClient7 } from "@uniformdev/files";
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.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", {
@@ -4294,12 +4386,12 @@ import { UncachedFileClient as UncachedFileClient8 } from "@uniformdev/files";
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.positional("directory", {
               describe: "Directory to read the entry patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -4386,10 +4478,10 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
       )
     )
   ),
@@ -4406,10 +4498,10 @@ import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry patterns",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("ids", {
+        yargs36.positional("ids", {
           describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -4482,11 +4574,11 @@ var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry pattern",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs34.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+          yargs36.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
         )
       )
     )
@@ -4503,14 +4595,14 @@ var EntryPatternUpdateModule = {
 var EntryPatternModule = {
   command: "entry-pattern <command>",
   describe: "Commands for Entry patterns",
-  builder: (yargs34) => yargs34.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs10.help();
+    yargs11.help();
   }
 };
 
 // src/commands/canvas/commands/locale.ts
-import yargs11 from "yargs";
+import yargs12 from "yargs";
 
 // src/commands/canvas/commands/locale/pull.ts
 import { LocaleClient } from "@uniformdev/canvas";
@@ -4549,11 +4641,11 @@ function createLocaleEngineDataSource({
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to save the locales 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", {
@@ -4577,161 +4669,398 @@ var LocalePullModule = {
         )
       )
     )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    format,
-    mode,
-    whatIf,
-    project: projectId,
-    diff: diffMode,
-    allowEmptySource
-  }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new LocaleClient({
-      apiKey,
-      apiHost,
-      fetch: fetch3,
-      projectId,
-      bypassCache: true
-    });
-    const source = createLocaleEngineDataSource({ client });
-    let target;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, false);
-      target = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents.locales ?? [],
-        selectIdentifier: (i) => i.locale,
-        selectDisplayName: (i) => i.displayName,
-        onSyncComplete: async (_, synced) => {
-          packageContents.locales = synced;
-          writeCanvasPackage(directory, packageContents);
-        }
-      });
-    } else {
-      target = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: (i) => i.locale,
-        selectDisplayName: (i) => i.displayName,
-        format
-      });
-    }
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource: allowEmptySource ?? true,
-      log: createSyncEngineConsoleLogger({ diffMode })
-    });
-  }
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    directory,
+    format,
+    mode,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    allowEmptySource
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new LocaleClient({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    const source = createLocaleEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.locales ?? [],
+        selectIdentifier: (i) => i.locale,
+        selectDisplayName: (i) => i.displayName,
+        onSyncComplete: async (_, synced) => {
+          packageContents.locales = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: (i) => i.locale,
+        selectDisplayName: (i) => i.displayName,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource: allowEmptySource ?? true,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/locale/push.ts
+import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
+var LocalePushModule = {
+  command: "push <directory>",
+  describe: "Pushes all locales from files in a directory to Uniform",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs36.positional("directory", {
+            describe: "Directory to read the locales 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,
+    allowEmptySource
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new LocaleClient2({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.locales ?? [],
+        selectIdentifier: (locale) => locale.locale,
+        selectDisplayName: (locale) => locale.displayName
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: (locale) => locale.locale,
+        selectDisplayName: (locale) => locale.displayName
+      });
+    }
+    const target = createLocaleEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/locale.ts
+var LocaleModule = {
+  command: "locale <command>",
+  describe: "Commands for locale definitions",
+  builder: (yargs36) => yargs36.command(LocalePullModule).command(LocalePushModule),
+  handler: () => {
+    yargs12.help();
+  }
+};
+
+// src/commands/canvas/commands/pattern.ts
+import yargs13 from "yargs";
+
+// src/commands/canvas/commands/pattern/get.ts
+var PatternGetModule = {
+  ...CompositionGetModule,
+  describe: "Fetch a pattern"
+};
+
+// src/commands/canvas/commands/pattern/list.ts
+var PatternListModule = {
+  ...CompositionListModule,
+  describe: "List patterns",
+  builder: (yargs36) => withFormatOptions(
+    withConfiguration(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            yargs36.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: {
+                type: "boolean",
+                default: false,
+                describe: "Resolve pattern references in the composition"
+              },
+              resolveOverrides: {
+                type: "boolean",
+                default: false,
+                describe: "Resolves pattern overrides in the pattern and removes override definition data"
+              },
+              onlyPatterns: {
+                describe: "Only pulling patterns and not compositions",
+                // This default differentiate this list command from composition list command
+                default: true,
+                type: "boolean",
+                hidden: true
+              },
+              componentIDs: {
+                alias: ["componentIDs"],
+                type: "boolean",
+                default: false,
+                describe: "Include individual component UIDs"
+              }
+            })
+          )
+        )
+      )
+    )
+  )
+};
+
+// src/commands/canvas/commands/pattern/publish.ts
+var PatternPublishModule = {
+  ...CompositionPublishModule,
+  describe: "Publishes pattern(s)",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs36.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: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withStateOptions(
+          withDiffOptions(
+            yargs36.positional("directory", {
+              describe: "Directory to save the 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", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("onlyPatterns", {
+              describe: "Only pulling patterns and not compositions",
+              // This default differentiate this list command from composition list command
+              default: true,
+              type: "boolean",
+              hidden: true
+            }).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"
+            })
+          )
+        )
+      )
+    )
+  )
+};
+
+// src/commands/canvas/commands/pattern/push.ts
+var PatternPushModule = {
+  ...CompositionPushModule,
+  describe: "Pushes all patterns from files in a directory to Uniform Canvas",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withStateOptions(
+          withDiffOptions(
+            yargs36.positional("directory", {
+              describe: "Directory to read the patterns 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"
+            }).option("onlyPatterns", {
+              describe: "Only pulling patterns and not compositions",
+              // This default differentiate this list command from composition list command
+              default: true,
+              type: "boolean",
+              hidden: true
+            }).option("patternType", {
+              default: "all",
+              choices: ["all", "component", "composition"],
+              hidden: true
+            })
+          )
+        )
+      )
+    )
+  )
 };
 
-// src/commands/canvas/commands/locale/push.ts
-import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
-var LocalePushModule = {
-  command: "push <directory>",
-  describe: "Pushes all locales from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+// src/commands/canvas/commands/pattern/remove.ts
+var PatternRemoveModule = {
+  ...CompositionRemoveModule,
+  describe: "Delete a pattern"
+};
+
+// src/commands/canvas/commands/pattern/unpublish.ts
+var PatternUnpublishModule = {
+  command: "unpublish [ids]",
+  describe: "Unpublish a pattern(s)",
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs34.positional("directory", {
-            describe: "Directory to read the locales 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"
-          })
-        )
+        yargs36.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 un-publishing compositions and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only un-publishing patterns and not compositions",
+          default: true,
+          type: "boolean",
+          hidden: true
+        })
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    mode,
-    whatIf,
-    project: projectId,
-    diff: diffMode,
-    allowEmptySource
-  }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new LocaleClient2({
-      apiKey,
-      apiHost,
-      fetch: fetch3,
-      projectId,
-      bypassCache: true
-    });
-    let source;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, true);
-      source = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents.locales ?? [],
-        selectIdentifier: (locale) => locale.locale,
-        selectDisplayName: (locale) => locale.displayName
-      });
-    } else {
-      source = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: (locale) => locale.locale,
-        selectDisplayName: (locale) => locale.displayName
-      });
-    }
-    const target = createLocaleEngineDataSource({ client });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode })
-    });
-  }
+  handler: CompositionUnpublishModule.handler
 };
 
-// src/commands/canvas/commands/locale.ts
-var LocaleModule = {
-  command: "locale <command>",
-  describe: "Commands for locale definitions",
-  builder: (yargs34) => yargs34.command(LocalePullModule).command(LocalePushModule),
+// src/commands/canvas/commands/pattern/update.ts
+var PatternUpdateModule = {
+  ...CompositionUpdateModule,
+  describe: "Insert or update a pattern"
+};
+
+// src/commands/canvas/commands/pattern.ts
+var PatternModule = {
+  command: "pattern <command>",
+  describe: "Commands for Canvas patterns",
+  deprecated: 'will be removed in a future major release. Use "component-pattern" and "composition-pattern" instead.',
+  builder: (yargs36) => yargs36.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs11.help();
+    yargs13.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs12 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/canvas/commands/prompts/get.ts
 import { PromptClient } from "@uniformdev/canvas";
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs34.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
         )
       )
     )
@@ -4752,7 +5081,7 @@ import { PromptClient as PromptClient2 } from "@uniformdev/canvas";
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -4800,12 +5129,12 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.positional("directory", {
               describe: "Directory to save the prompts 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", {
@@ -4890,12 +5219,12 @@ import { PromptClient as PromptClient4 } from "@uniformdev/canvas";
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs34.positional("directory", {
+            yargs36.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -4969,9 +5298,9 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -4987,10 +5316,10 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Prompt file to put" })
       )
     )
   ),
@@ -5007,14 +5336,14 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs34) => yargs34.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs12.help();
+    yargs14.help();
   }
 };
 
 // src/commands/canvas/commands/workflow.ts
-import yargs13 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/canvas/commands/workflow/pull.ts
 import { WorkflowClient } from "@uniformdev/canvas";
@@ -5058,11 +5387,11 @@ function createWorkflowEngineDataSource({
 var WorkflowPullModule = {
   command: "pull <directory>",
   describe: "Pulls all workflows to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to save 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", {
@@ -5140,11 +5469,11 @@ import { WorkflowClient as WorkflowClient2 } from "@uniformdev/canvas";
 var WorkflowPushModule = {
   command: "push <directory>",
   describe: "Pushes all workflows from files in a directory to Uniform Canvas",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to read from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5210,9 +5539,9 @@ var WorkflowModule = {
   command: "workflow <command>",
   aliases: ["wf"],
   describe: "Commands for Canvas workflows",
-  builder: (yargs34) => yargs34.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs15.help();
   }
 };
 
@@ -5221,28 +5550,28 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs34) => yargs34.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).command(WorkflowModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(PatternModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).command(WorkflowModule).demandCommand(),
   handler: () => {
-    yargs14.showHelp();
+    yargs16.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs21 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs15 from "yargs";
+import yargs17 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -5266,7 +5595,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5333,11 +5662,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -5415,11 +5744,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -5487,10 +5816,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -5507,10 +5836,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -5527,34 +5856,33 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs34) => yargs34.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs17.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs16 from "yargs";
+import yargs18 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: (yargs34) => withFormatOptions(
+  builder: (yargs36) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
-    var _a, _b;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = (_b = (_a = await client.get()) == null ? void 0 : _a.enrichments) == null ? void 0 : _b.filter((enr) => enr.id === id);
+    const res = (await client.get())?.enrichments?.filter((enr) => enr.id === id);
     if (res.length === 0) {
       console.error("Enrichment did not exist");
       process.exit(1);
@@ -5570,7 +5898,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5609,7 +5937,6 @@ function createEnrichmentEngineDataSource({
       await client.removeCategory({ enrichmentId: providerId });
     },
     writeObject: async (object, existingObject) => {
-      var _a;
       await client.upsertCategory({
         enrichment: object.object
       });
@@ -5619,7 +5946,7 @@ function createEnrichmentEngineDataSource({
       });
       const target = createEnrichmentValueEngineDataSource({
         categoryId: object.object.id,
-        values: ((_a = existingObject == null ? void 0 : existingObject.object) == null ? void 0 : _a.values) ?? [],
+        values: existingObject?.object?.values ?? [],
         client
       });
       await syncEngine({
@@ -5673,11 +6000,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -5755,11 +6082,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -5826,10 +6153,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -5845,14 +6172,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs34) => yargs34.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs16.help();
+    yargs18.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs17 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
@@ -5863,10 +6190,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.option("preview", {
+        yargs36.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -5928,7 +6255,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs34) => withConfiguration(withApiOptions(withProjectOptions(yargs34))),
+  builder: (yargs36) => withConfiguration(withApiOptions(withProjectOptions(yargs36))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -5961,25 +6288,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs34) => yargs34.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs17.help();
+    yargs19.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs18 from "yargs";
+import yargs20 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -6003,11 +6330,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.option("withIntegrations", {
+          yargs36.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -6065,11 +6392,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6147,11 +6474,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6218,10 +6545,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -6238,10 +6565,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -6258,25 +6585,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs34) => yargs34.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs20.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs19 from "yargs";
+import yargs21 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -6300,7 +6627,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6350,11 +6677,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6432,11 +6759,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6503,10 +6830,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -6523,10 +6850,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -6543,25 +6870,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs34) => yargs34.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs21.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs20 from "yargs";
+import yargs22 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -6585,7 +6912,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6635,11 +6962,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6717,11 +7044,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -6788,10 +7115,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs36.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -6808,9 +7135,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs34.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs36.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -6825,9 +7152,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs34) => yargs34.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs20.help();
+    yargs22.help();
   }
 };
 
@@ -6836,23 +7163,23 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs34) => yargs34.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs21.showHelp();
+    yargs23.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs24 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs23 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs22 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
 import { createLimitPolicy } from "@uniformdev/canvas";
@@ -6887,8 +7214,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs34) {
-  return yargs34.option("connectorType", {
+function withEdgehancerIdOptions(yargs36) {
+  return yargs36.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -6908,11 +7235,11 @@ function withEdgehancerIdOptions(yargs34) {
 var IntegrationEdgehancerDeployModule = {
   command: "deploy <filename>",
   describe: "Deploys a custom edgehancer hook to run when a data resource of a specific archetype is fetched. The API key used must have team admin permissions.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs34.positional("filename", {
+          yargs36.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           })
@@ -6923,7 +7250,7 @@ var IntegrationEdgehancerDeployModule = {
   handler: async ({ apiHost, apiKey, proxy, filename, team: teamId, archetype, connectorType, hook }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
-    const code = readFileSync2(filename, "utf8");
+    const code = readFileSync(filename, "utf8");
     await client.deploy({ archetype, code, connectorType, hook });
   }
 };
@@ -6932,7 +7259,7 @@ var IntegrationEdgehancerDeployModule = {
 var IntegrationEdgehancerRemoveModule = {
   command: "remove",
   describe: "Deletes a custom edgehancer hook from a data connector archetype. The API key used must have team admin permissions.",
-  builder: (yargs34) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
@@ -6944,9 +7271,9 @@ var IntegrationEdgehancerRemoveModule = {
 var IntegrationEdgehancerModule = {
   command: "edgehancer <command>",
   describe: "Commands for managing custom integration edgehancers at the team level.",
-  builder: (yargs34) => yargs34.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs24.help();
   }
 };
 
@@ -6986,10 +7313,10 @@ var DefinitionClient = class extends ApiClient2 {
 var IntegrationDefinitionRegisterModule = {
   command: "register <filename>",
   describe: "Registers a custom integration definition on a team. The API key used must have team admin permissions.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs34.positional("filename", {
+        yargs36.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -7008,10 +7335,10 @@ var IntegrationDefinitionRegisterModule = {
 var IntegrationDefinitionRemoveModule = {
   command: "remove <type>",
   describe: "Deletes a custom integration definition from a team. This will uninstall it on any active projects. Existing usages of the integration may break. The API key used must have team admin permissions.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs34.positional("type", {
+        yargs36.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -7029,9 +7356,9 @@ var IntegrationDefinitionRemoveModule = {
 var IntegrationDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for managing custom integration definitions at the team level.",
-  builder: (yargs34) => yargs34.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
   handler: () => {
-    yargs23.help();
+    yargs25.help();
   }
 };
 
@@ -7071,10 +7398,10 @@ var InstallClient = class extends ApiClient3 {
 var IntegrationInstallModule = {
   command: "install <type>",
   describe: "Installs an integration to a project. The integration may be built-in or custom. Custom integrations must be registered to the parent team first.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("type", {
+        yargs36.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -7096,10 +7423,10 @@ var IntegrationInstallModule = {
 var IntegrationUninstallModule = {
   command: "uninstall <type>",
   describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("type", {
+        yargs36.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -7117,9 +7444,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs34) => yargs34.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs24.showHelp();
+    yargs26.showHelp();
   }
 };
 
@@ -7131,7 +7458,7 @@ var makeSpinner = () => {
   const spin = async (text) => {
     const spinner = ora(text).start();
     spinners.push(spinner);
-    const minWait = new Promise((resolve2) => setTimeout(resolve2, 500));
+    const minWait = new Promise((resolve) => setTimeout(resolve, 500));
     return async () => {
       await minWait;
       spinner.stop();
@@ -7147,10 +7474,20 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.155.0",
+  version: "19.185.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
+  exports: {
+    ".": {
+      types: "./dist/index.d.mts",
+      default: "./cli.js"
+    },
+    "./config": {
+      types: "./dist/defaultConfig.d.mts",
+      default: "./dist/defaultConfig.mjs"
+    }
+  },
   types: "./dist/index.d.mts",
   sideEffects: false,
   scripts: {
@@ -7172,13 +7509,13 @@ var package_default = {
     "@uniformdev/redirect": "workspace:*",
     "call-bind": "^1.0.2",
     colorette: "2.0.20",
-    cosmiconfig: "8.3.6",
+    cosmiconfig: "9.0.0",
     "cosmiconfig-typescript-loader": "5.0.0",
     diff: "^5.0.0",
     dotenv: "^16.0.3",
     execa: "5.1.1",
     "fs-jetpack": "5.1.0",
-    graphql: "16.8.1",
+    graphql: "16.9.0",
     "graphql-request": "6.1.0",
     "image-size": "^1.0.2",
     inquirer: "9.2.17",
@@ -7186,7 +7523,7 @@ var package_default = {
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
     "lodash.isequalwith": "^4.4.0",
-    open: "9.1.0",
+    open: "10.1.0",
     ora: "8.0.1",
     "p-queue": "7.3.4",
     "posthog-node": "4.0.1",
@@ -7195,7 +7532,7 @@ var package_default = {
     slugify: "1.6.6",
     undici: "^6.10.1",
     yargs: "^17.6.2",
-    zod: "3.22.4"
+    zod: "3.23.8"
   },
   devDependencies: {
     "@types/diff": "5.0.9",
@@ -7249,8 +7586,7 @@ var Telemetry = class {
     this.send("logged in");
   }
   send(event, properties = {}) {
-    var _a;
-    (_a = this.posthog) == null ? void 0 : _a.capture({
+    this.posthog?.capture({
       distinctId: this.distinctId,
       event: [this.prefix, event].join(" "),
       properties: {
@@ -7260,9 +7596,8 @@ var Telemetry = class {
     });
   }
   shutdown() {
-    var _a;
     this.send("exited", { exitCode: process.exitCode });
-    return (_a = this.posthog) == null ? void 0 : _a.shutdown();
+    return this.posthog?.shutdown();
   }
 };
 
@@ -7275,7 +7610,7 @@ import jwt from "jsonwebtoken";
 import open from "open";
 
 // src/url.ts
-var makeUrl = (baseUrl, path5) => [baseUrl.trim().replace(/\/+$/, ""), path5.trim().replace(/^\/+/, "")].join("/");
+var makeUrl = (baseUrl, path4) => [baseUrl.trim().replace(/\/+$/, ""), path4.trim().replace(/^\/+/, "")].join("/");
 
 // src/auth/getBearerToken.ts
 async function getBearerToken(baseUrl) {
@@ -7380,8 +7715,8 @@ var getLimitsSchema = z.object({
   })
 });
 var createClient = (baseUrl, authToken) => {
-  const request2 = async (path5, opts, allowedNon2xxStatusCodes = []) => {
-    const res = await fetch(makeUrl(baseUrl, path5), {
+  const request2 = async (path4, opts, allowedNon2xxStatusCodes = []) => {
+    const res = await fetch(makeUrl(baseUrl, path4), {
       ...opts,
       headers: { Authorization: `Bearer ${authToken}` }
     });
@@ -7389,18 +7724,18 @@ var createClient = (baseUrl, authToken) => {
       return res;
     } else {
       throw new Error(
-        `Non-2xx API response: ${opts.method} ${path5} responded with ${res.status} ${res.statusText}`
+        `Non-2xx API response: ${opts.method} ${path4} responded with ${res.status} ${res.statusText}`
       );
     }
   };
-  const requestJson = async (path5, opts, schema2, allowedNon2xxStatusCodes = []) => {
-    const res = await request2(path5, opts, allowedNon2xxStatusCodes);
+  const requestJson = async (path4, opts, schema2, allowedNon2xxStatusCodes = []) => {
+    const res = await request2(path4, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
     const parseResult = schema2.safeParse(data);
     if (parseResult.success) {
       return parseResult.data;
     } else {
-      throw new Error(`Invalid ${opts.method} ${path5} response: ${parseResult.error.message}`);
+      throw new Error(`Invalid ${opts.method} ${path4} response: ${parseResult.error.message}`);
     }
   };
   return {
@@ -7522,7 +7857,7 @@ var runNpm = async (workDir, args, { inherit, env } = {}) => {
 ${err.message}`);
   }
   if (result.exitCode !== 0) {
-    throw new Error(`Command npm ${args.join(" ")} exitted with code ${result == null ? void 0 : result.exitCode}}: ${result.stderr}`);
+    throw new Error(`Command npm ${args.join(" ")} exitted with code ${result?.exitCode}}: ${result.stderr}`);
   }
   return result.stdout;
 };
@@ -7534,7 +7869,7 @@ 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";
-import path2 from "path";
+import path from "path";
 async function cloneStarter({
   spin,
   githubPath,
@@ -7542,7 +7877,7 @@ async function cloneStarter({
   dotEnvFile
 }) {
   const done = await spin("Fetching starter code...");
-  const cloneDir = path2.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
+  const cloneDir = path.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
     await git.clone({
@@ -7560,10 +7895,10 @@ async function cloneStarter({
   if (fs3.existsSync(targetDir) && fs3.readdirSync(targetDir).length > 0) {
     throw new Error(`"${targetDir}" is not empty`);
   }
-  const starterDir = path2.join(cloneDir, ...pathSegments);
+  const starterDir = path.join(cloneDir, ...pathSegments);
   fsj2.copy(starterDir, targetDir, { overwrite: true });
   if (dotEnvFile) {
-    fs3.writeFileSync(path2.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+    fs3.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
   console.log(`
 Your project now lives in ${targetDir} \u2728`);
@@ -7579,9 +7914,9 @@ Installing project dependencies...
 }
 
 // src/projects/getOrCreateProject.ts
-import fs4, { existsSync as existsSync2, mkdirSync as mkdirSync3 } from "fs";
+import fs4, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import inquirer2 from "inquirer";
-import path3 from "path";
+import path2 from "path";
 import slugify from "slugify";
 var newProjectId = "$new";
 async function getOrCreateProject({
@@ -7676,8 +8011,7 @@ async function chooseExistingProject({
   teamId,
   user
 }) {
-  var _a, _b;
-  const projects = (((_a = user.teams.find((t) => t.team.id === teamId)) == null ? void 0 : _a.team.sites) ?? []).map((t) => ({
+  const projects = (user.teams.find((t) => t.team.id === teamId)?.team.sites ?? []).map((t) => ({
     name: t.name,
     value: t.id
   }));
@@ -7692,7 +8026,7 @@ async function chooseExistingProject({
   ]);
   return {
     projectId: result.projectId,
-    projectName: (_b = projects.find((p) => p.value === result.projectId)) == null ? void 0 : _b.name
+    projectName: projects.find((p) => p.value === result.projectId)?.name
   };
 }
 function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
@@ -7704,10 +8038,10 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
   if (checkTargetDir) {
     let targetDir = explicitTargetDir ?? process.cwd();
     if (!existsSync2(targetDir)) {
-      mkdirSync3(targetDir, { recursive: true });
+      mkdirSync2(targetDir, { recursive: true });
     }
     if (fs4.readdirSync(targetDir).length > 0) {
-      targetDir = path3.resolve(targetDir, projectNameSlug);
+      targetDir = path2.resolve(targetDir, projectNameSlug);
       if (fs4.existsSync(targetDir)) {
         throw new Error(`${targetDir} already exists, choose a different name.`);
       }
@@ -7961,9 +8295,9 @@ npm run dev
 }
 
 // src/commands/new/commands/new-mesh-integration.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import inquirer5 from "inquirer";
-import path4 from "path";
+import path3 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
   spin,
@@ -8004,19 +8338,19 @@ async function newMeshIntegrationHandler({
     targetDir
   });
   let done = await spin("Registering integration to team...");
-  const pathToManifest = path4.resolve(targetDir, "mesh-manifest.json");
+  const pathToManifest = path3.resolve(targetDir, "mesh-manifest.json");
   if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
-  const manifestContents = readFileSync3(pathToManifest, "utf-8");
+  const manifestContents = readFileSync2(pathToManifest, "utf-8");
   const manifestJson = JSON.parse(manifestContents);
   manifestJson.type = typeSlug;
   manifestJson.displayName = name;
-  writeFileSync2(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
-  const packageJsonPath = path4.resolve(targetDir, "package.json");
-  const packageJson = JSON.parse(readFileSync3(packageJsonPath, "utf-8"));
+  writeFileSync(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
+  const packageJsonPath = path3.resolve(targetDir, "package.json");
+  const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
-  writeFileSync2(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
+  writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
   const fullMeshAppKey = await uniformClient.registerMeshIntegration({ teamId, manifest: manifestJson });
   await done();
   await runNpmInstall();
@@ -8060,10 +8394,10 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
   }
   let targetDir = explicitOutputPath ?? process.cwd();
   if (!existsSync3(targetDir)) {
-    mkdirSync4(targetDir, { recursive: true });
+    mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
-    targetDir = path4.resolve(targetDir, typeSlug);
+    targetDir = path3.resolve(targetDir, typeSlug);
     if (existsSync3(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
@@ -8156,10 +8490,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs26 from "yargs";
+import yargs28 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs25 from "yargs";
+import yargs27 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
 import { gray as gray4, green as green3, red as red5, yellow as yellow2 } from "colorette";
@@ -8174,7 +8508,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs34) => yargs34.option("apiKey", {
+  builder: (yargs36) => yargs36.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -8275,10 +8609,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs25.command(download_default);
+    return yargs27.command(download_default);
   },
   handler: () => {
-    yargs25.showHelp();
+    yargs27.showHelp();
   }
 };
 var manifest_default = module2;
@@ -8289,29 +8623,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs26.command(manifest_default);
+    return yargs28.command(manifest_default);
   },
   handler: () => {
-    yargs26.showHelp();
+    yargs28.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs29 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs27 from "yargs";
+import yargs29 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: (yargs34) => withFormatOptions(
+  builder: (yargs36) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -8335,7 +8669,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -8393,11 +8727,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -8475,11 +8809,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -8546,9 +8880,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -8564,10 +8898,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -8583,36 +8917,35 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs34) => yargs34.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs27.help();
+    yargs29.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs28 from "yargs";
+import yargs30 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs36.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, projectMapId, format, project: projectId, filename }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient7({ apiKey, apiHost, fetch: fetch3, projectId });
     console.log("Debugging params for node get", { projectMapId, id, projectId });
     const res = await client.getNodes({ projectMapId, id });
-    if (((_a = res.nodes) == null ? void 0 : _a.length) === 0) {
+    if (res.nodes?.length === 0) {
       console.error("Project map node does not exist");
       process.exit(1);
     } else {
@@ -8627,12 +8960,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs34.positional("projectMapId", {
+            yargs36.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -8705,11 +9038,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -8787,15 +9120,18 @@ var ProjectMapNodePullModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapNode/push.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniformdev/project-map";
+import {
+  __INTERNAL_MISSING_PARENT_NODE_ERROR,
+  UncachedProjectMapClient as UncachedProjectMapClient10
+} from "@uniformdev/project-map";
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -8841,7 +9177,9 @@ var ProjectMapNodePushModule = {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.projectMapNodes ?? [],
+        objects: packageContents.projectMapNodes.sort((a, b) => {
+          return a.path.length - b.path.length;
+        }) ?? [],
         selectIdentifier: expandedSelectIdentifier,
         selectDisplayName: selectDisplayName12
       });
@@ -8854,14 +9192,41 @@ var ProjectMapNodePushModule = {
       });
     }
     const target = createProjectMapNodeEngineDataSource({ client, projectId });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode })
-    });
+    const nodesFailedDueToMissingParent = /* @__PURE__ */ new Set();
+    const attemptSync = async () => {
+      const lastFailedNodesCount = nodesFailedDueToMissingParent.size;
+      nodesFailedDueToMissingParent.clear();
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onError: (error, object) => {
+          if (error.message.includes(__INTERNAL_MISSING_PARENT_NODE_ERROR)) {
+            nodesFailedDueToMissingParent.add(object.object);
+          } else {
+            throw error;
+          }
+        }
+      });
+      if (nodesFailedDueToMissingParent.size !== 0) {
+        const newFailedNodesCount = nodesFailedDueToMissingParent.size;
+        if (newFailedNodesCount !== lastFailedNodesCount) {
+          source = await createArraySyncEngineDataSource({
+            name: `Nodes re-push from ${directory}`,
+            objects: Array.from(nodesFailedDueToMissingParent),
+            selectIdentifier: expandedSelectIdentifier,
+            selectDisplayName: selectDisplayName12
+          });
+          await attemptSync();
+        } else {
+          throw new Error("Failed to push nodes due to missing parent nodes");
+        }
+      }
+    };
+    await attemptSync();
   }
 };
 
@@ -8871,10 +9236,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs36.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -8891,10 +9256,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs36.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -8910,9 +9275,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs34) => yargs34.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs28.help();
+    yargs30.help();
   }
 };
 
@@ -8921,28 +9286,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs34) => yargs34.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs29.showHelp();
+    yargs31.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs31 from "yargs";
+import yargs33 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs30 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs34.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -8966,7 +9331,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
+  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -9033,11 +9398,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.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", {
@@ -9116,11 +9481,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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          yargs36.positional("directory", {
             describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -9187,9 +9552,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -9205,10 +9570,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs34.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs36.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -9224,9 +9589,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs34) => yargs34.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs30.help();
+    yargs32.help();
   }
 };
 
@@ -9235,14 +9600,14 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs34) => yargs34.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs31.showHelp();
+    yargs33.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs32 from "yargs";
+import yargs34 from "yargs";
 
 // src/commands/sync/commands/util.ts
 import ora2 from "ora";
@@ -9302,11 +9667,11 @@ function patchConsole(fn, ora3, replay = []) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.option("what-if", {
+          yargs36.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes no files",
             default: false,
@@ -9317,13 +9682,7 @@ var SyncPullModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
-    var _a, _b;
     const config2 = serialization;
-    let isUsingDeprecatedPatternConfig = false;
-    if (config2.entitiesConfig.pattern) {
-      isUsingDeprecatedPatternConfig = true;
-      (_a = config2.entitiesConfig).componentPattern ?? (_a.componentPattern = config2.entitiesConfig.pattern);
-    }
     const enabledEntities = Object.entries({
       locale: LocalePullModule,
       asset: AssetPullModule,
@@ -9337,7 +9696,9 @@ var SyncPullModule = {
       enrichment: EnrichmentPullModule,
       aggregate: AggregatePullModule,
       component: ComponentPullModule,
+      pattern: PatternPullModule,
       componentPattern: ComponentPatternPullModule,
+      compositionPattern: CompositionPatternPullModule,
       composition: CompositionPullModule,
       projectMapDefinition: ProjectMapDefinitionPullModule,
       projectMapNode: ProjectMapNodePullModule,
@@ -9347,8 +9708,7 @@ var SyncPullModule = {
       contentType: ContentTypePullModule
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
-      var _a2, _b2, _c, _d, _e, _f;
-      return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c = (_b2 = config2.entitiesConfig) == null ? void 0 : _b2[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
+      return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.pull?.disabled !== true;
     });
     if (enabledEntities.length === 0) {
       throw new Error(
@@ -9359,7 +9719,7 @@ var SyncPullModule = {
       const entityConfigSupportsPullState = (entityConfig2) => {
         return entityConfig2 !== void 0 && "state" in entityConfig2;
       };
-      const entityConfig = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType];
+      const entityConfig = config2.entitiesConfig?.[entityType];
       try {
         await spinPromise(
           module3.handler({
@@ -9367,9 +9727,10 @@ var SyncPullModule = {
             state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
             format: getFormat(entityType, config2),
             onlyCompositions: entityType === "composition" ? true : void 0,
-            onlyPatterns: entityType === "componentPattern" ? true : void 0,
+            onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
+            patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPullMode(entityType, config2),
-            directory: getPullFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
+            directory: getPullFilename(entityType, config2),
             allowEmptySource: config2.allowEmptySource
           }),
           {
@@ -9378,7 +9739,7 @@ var SyncPullModule = {
             failText(error) {
               return `${entityType}
 
- ${error.stack}`;
+ ${error.stack ?? error.message}`;
             }
           }
         );
@@ -9396,13 +9757,11 @@ var getPullMode = (entityType, config2) => {
     entityType
   });
 };
-var getPullFilename = (entityType, config2, { isUsingDeprecatedPatternConfig }) => {
+var getPullFilename = (entityType, config2) => {
   return getDirectoryOrFilename({
     operation: "pull",
     config: config2,
-    entityType,
-    // This fallback can be removed when publishing a major release
-    defaultEntityFolderName: isUsingDeprecatedPatternConfig && entityType === "componentPattern" ? "pattern" : void 0
+    entityType
   });
 };
 var getFormat = (entityType, config2) => {
@@ -9418,11 +9777,11 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.option("what-if", {
+          yargs36.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes nothing",
             default: false,
@@ -9433,13 +9792,7 @@ var SyncPushModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const config2 = serialization;
-    let isUsingDeprecatedPatternConfig = false;
-    if (config2.entitiesConfig.pattern) {
-      isUsingDeprecatedPatternConfig = true;
-      (_a = config2.entitiesConfig).componentPattern ?? (_a.componentPattern = config2.entitiesConfig.pattern);
-    }
     const enabledEntities = Object.entries({
       locale: LocalePushModule,
       asset: AssetPushModule,
@@ -9453,7 +9806,9 @@ var SyncPushModule = {
       enrichment: EnrichmentPushModule,
       aggregate: AggregatePushModule,
       component: ComponentPushModule,
+      pattern: PatternPushModule,
       componentPattern: ComponentPatternPushModule,
+      compositionPattern: CompositionPatternPushModule,
       composition: CompositionPushModule,
       projectMapDefinition: ProjectMapDefinitionPushModule,
       projectMapNode: ProjectMapNodePushModule,
@@ -9463,8 +9818,7 @@ var SyncPushModule = {
       entryPattern: EntryPatternPushModule
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2;
-      return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c2 = (_b2 = config2.entitiesConfig) == null ? void 0 : _b2[entityType]) == null ? void 0 : _c2.disabled) !== true && ((_f2 = (_e2 = (_d2 = config2.entitiesConfig) == null ? void 0 : _d2[entityType]) == null ? void 0 : _e2.push) == null ? void 0 : _f2.disabled) !== true;
+      return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.push?.disabled !== true;
     });
     if (enabledEntities.length === 0) {
       throw new Error(
@@ -9479,9 +9833,10 @@ var SyncPushModule = {
             state: 0,
             format: getFormat2(entityType, config2),
             onlyCompositions: entityType === "composition" ? true : void 0,
-            onlyPatterns: entityType === "componentPattern" ? true : void 0,
+            onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
+            patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPushMode(entityType, config2),
-            directory: getPushFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
+            directory: getPushFilename(entityType, config2),
             allowEmptySource: config2.allowEmptySource
           }),
           {
@@ -9490,7 +9845,7 @@ var SyncPushModule = {
             failText(error) {
               return `${entityType}
 
- ${error.stack}`;
+ ${error.stack ?? error.message}`;
             }
           }
         );
@@ -9498,16 +9853,19 @@ var SyncPushModule = {
         process.exit(1);
       }
     }
-    if (((_b = config2.entitiesConfig) == null ? void 0 : _b.componentPattern) && ((_e = (_d = (_c = config2.entitiesConfig) == null ? void 0 : _c.componentPattern) == null ? void 0 : _d.push) == null ? void 0 : _e.disabled) !== true && ((_g = (_f = config2.entitiesConfig) == null ? void 0 : _f.componentPattern) == null ? void 0 : _g.publish)) {
+    if (config2.entitiesConfig?.componentPattern && config2.entitiesConfig?.componentPattern?.push?.disabled !== true && config2.entitiesConfig?.componentPattern?.publish) {
       await ComponentPatternPublishModule.handler({ ...otherParams, all: true });
     }
-    if (((_h = config2.entitiesConfig) == null ? void 0 : _h.composition) && ((_k = (_j = (_i = config2.entitiesConfig) == null ? void 0 : _i.composition) == null ? void 0 : _j.push) == null ? void 0 : _k.disabled) !== true && ((_m = (_l = config2.entitiesConfig) == null ? void 0 : _l.composition) == null ? void 0 : _m.publish)) {
+    if (config2.entitiesConfig?.compositionPattern && config2.entitiesConfig?.compositionPattern?.push?.disabled !== true && config2.entitiesConfig?.compositionPattern?.publish) {
+      await CompositionPatternPublishModule.handler({ ...otherParams, all: true });
+    }
+    if (config2.entitiesConfig?.composition && config2.entitiesConfig?.composition?.push?.disabled !== true && config2.entitiesConfig?.composition?.publish) {
       await CompositionPublishModule.handler({ ...otherParams, all: true });
     }
-    if (((_n = config2.entitiesConfig) == null ? void 0 : _n.entry) && ((_q = (_p = (_o = config2.entitiesConfig) == null ? void 0 : _o.entry) == null ? void 0 : _p.push) == null ? void 0 : _q.disabled) !== true && ((_s = (_r = config2.entitiesConfig) == null ? void 0 : _r.entry) == null ? void 0 : _s.publish)) {
+    if (config2.entitiesConfig?.entry && config2.entitiesConfig?.entry?.push?.disabled !== true && config2.entitiesConfig?.entry?.publish) {
       await EntryPublishModule.handler({ ...otherParams, all: true });
     }
-    if (((_t = config2.entitiesConfig) == null ? void 0 : _t.entryPattern) && ((_w = (_v = (_u = config2.entitiesConfig) == null ? void 0 : _u.entryPattern) == null ? void 0 : _v.push) == null ? void 0 : _w.disabled) !== true && ((_y = (_x = config2.entitiesConfig) == null ? void 0 : _x.entryPattern) == null ? void 0 : _y.publish)) {
+    if (config2.entitiesConfig?.entryPattern && config2.entitiesConfig?.entryPattern?.push?.disabled !== true && config2.entitiesConfig?.entryPattern?.publish) {
       await EntryPatternPublishModule.handler({ ...otherParams, all: true });
     }
   }
@@ -9520,13 +9878,11 @@ var getPushMode = (entityType, config2) => {
     entityType
   });
 };
-var getPushFilename = (entityType, config2, { isUsingDeprecatedPatternConfig }) => {
+var getPushFilename = (entityType, config2) => {
   return getDirectoryOrFilename({
     operation: "push",
     config: config2,
-    entityType,
-    // This fallback can be removed when publishing a major release
-    defaultEntityFolderName: isUsingDeprecatedPatternConfig && entityType === "componentPattern" ? "pattern" : void 0
+    entityType
   });
 };
 var getFormat2 = (entityType, config2) => {
@@ -9542,9 +9898,9 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs34) => yargs34.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs36) => yargs36.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs32.showHelp();
+    yargs34.showHelp();
   }
 };
 
@@ -9617,7 +9973,7 @@ var updateCache = async (file, latest, lastUpdate) => {
   });
   await fs5.writeFile(file, content, "utf8");
 };
-var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve2, reject) => {
+var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve, reject) => {
   const options = {
     host: url.hostname,
     path: url.pathname,
@@ -9648,7 +10004,7 @@ var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve2, reject)
     response.on("end", () => {
       try {
         const parsedData = JSON.parse(rawData);
-        resolve2(parsedData);
+        resolve(parsedData);
       } catch (e) {
         reject(e);
       }
@@ -9662,7 +10018,7 @@ var getMostRecent = async ({ full, scope }, distTag, timeout) => {
   try {
     spec = await loadPackage({ url, timeout });
   } catch (err) {
-    if ((err == null ? void 0 : err.code) && String(err.code).startsWith("4")) {
+    if (err?.code && String(err.code).startsWith("4")) {
       const registryAuthToken = __require("registry-auth-token");
       const authInfo = registryAuthToken(regURL, { recursive: true });
       spec = await loadPackage({ url, timeout }, authInfo);
@@ -9743,14 +10099,14 @@ import { join as join4 } from "path";
 
 // src/fs.ts
 import { promises as fs6 } from "fs";
-async function readJSON(path5) {
-  const fileContents = await fs6.readFile(path5, "utf-8");
+async function readJSON(path4) {
+  const fileContents = await fs6.readFile(path4, "utf-8");
   return JSON.parse(fileContents);
 }
-async function tryReadJSON(path5, missingValue = null) {
+async function tryReadJSON(path4, missingValue = null) {
   try {
-    const stat = await fs6.stat(path5);
-    return stat.isFile() ? await readJSON(path5) : missingValue;
+    const stat = await fs6.stat(path4);
+    return stat.isFile() ? await readJSON(path4) : missingValue;
   } catch (e) {
     return missingValue;
   }
@@ -9779,12 +10135,11 @@ var checkLocalDepsVersions = async (args) => {
     let isOutside = false;
     let warning = `${magenta("Warning:")} Installed Uniform packages should be the same version`;
     const localPackages = await tryReadJSON(join4(process.cwd(), "package.json"));
-    if (!localPackages)
-      return;
+    if (!localPackages) return;
     let firstVersion;
     const allDependencies = {
-      ...(localPackages == null ? void 0 : localPackages.dependencies) ?? {},
-      ...(localPackages == null ? void 0 : localPackages.devDependencies) ?? {}
+      ...localPackages?.dependencies ?? {},
+      ...localPackages?.devDependencies ?? {}
     };
     for (const [p, version] of Object.entries(allDependencies)) {
       if (uniformStrictVersions.includes(p)) {
@@ -9800,8 +10155,7 @@ First found was: v${firstVersion}`;
         }
       }
     }
-    if (isOutside)
-      logCallout(warning);
+    if (isOutside) logCallout(warning);
   } catch (e) {
     if (args.verbose) {
       console.warn(`There was an error validating the local project dependencies`, e);
@@ -9811,7 +10165,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs33(hideBin(process.argv));
+var yarggery = yargs35(hideBin(process.argv));
 var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
 var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {