@uniformdev/cli 19.166.1 → 19.167.2-alpha.3

package/dist/index.mjs

@@ -19,11 +19,11 @@ import {
 
 // 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";
@@ -406,12 +406,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" })
         )
       )
     )
@@ -432,7 +432,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 });
@@ -784,8 +784,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"],
@@ -852,11 +852,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", {
@@ -974,11 +974,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", {
@@ -1079,9 +1079,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 }) => {
@@ -1097,10 +1097,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" })
       )
     )
   ),
@@ -1116,7 +1116,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();
   }
@@ -1130,11 +1130,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" })
         )
       )
     )
@@ -1159,7 +1159,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 });
@@ -1209,11 +1209,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", {
@@ -1291,11 +1291,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", {
@@ -1362,10 +1362,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" })
       )
     )
   ),
@@ -1382,10 +1382,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" })
       )
     )
   ),
@@ -1402,7 +1402,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();
   }
@@ -1423,11 +1423,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"
           })
@@ -1461,11 +1461,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 }
           })
@@ -1521,11 +1521,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", {
@@ -1604,11 +1604,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", {
@@ -1676,10 +1676,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" })
       )
     )
   ),
@@ -1696,10 +1696,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" })
       )
     )
   ),
@@ -1716,7 +1716,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();
   }
@@ -1730,12 +1730,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,
@@ -1760,6 +1760,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"
               }
             })
           )
@@ -1781,7 +1786,8 @@ var CompositionGetModule = {
     resolveOverrides,
     componentIDs,
     resolveData,
-    diagnostics
+    diagnostics,
+    resolutionDepth
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient7({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
@@ -1793,7 +1799,8 @@ var CompositionGetModule = {
         skipOverridesResolution: !resolveOverrides,
         withComponentIDs: componentIDs,
         skipDataResolution: !resolveData,
-        diagnostics
+        diagnostics: resolveData ? diagnostics : void 0,
+        resolutionDepth: resolveData ? resolutionDepth : void 0
       })
     );
     emitWithFormat(res, format, filename);
@@ -1812,12 +1819,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: "" },
@@ -1864,6 +1871,7 @@ var CompositionListModule = {
     filename,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     project: projectId,
     state,
     resolvePatterns,
@@ -1877,6 +1885,7 @@ var CompositionListModule = {
       offset,
       search: search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
+      patternType,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
@@ -1890,12 +1899,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: {
@@ -1915,6 +1924,11 @@ var ComponentPatternListModule = {
                 type: "boolean",
                 hidden: true
               },
+              patternType: {
+                default: "component",
+                choices: ["all", "component", "composition"],
+                hidden: true
+              },
               componentIDs: {
                 alias: ["componentIDs"],
                 type: "boolean",
@@ -1942,6 +1956,7 @@ function createComponentInstanceEngineDataSource({
   state,
   onlyCompositions,
   onlyPatterns,
+  patternType,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
@@ -1955,7 +1970,8 @@ function createComponentInstanceEngineDataSource({
         state: stateId,
         skipPatternResolution: true,
         skipOverridesResolution: true,
-        withComponentIDs: true
+        withComponentIDs: true,
+        patternType
       })).compositions,
       { pageSize: 100 }
     );
@@ -1985,11 +2001,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", {
@@ -2025,7 +2041,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.`);
@@ -2039,14 +2056,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,
@@ -2063,11 +2082,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", {
@@ -2094,6 +2113,10 @@ var ComponentPatternPublishModule = {
             default: true,
             type: "boolean",
             hidden: true
+          }).option("patternType", {
+            default: "component",
+            choices: ["all", "component", "composition"],
+            hidden: true
           })
         )
       )
@@ -2107,12 +2130,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", {
@@ -2155,6 +2178,7 @@ var CompositionPullModule = {
     format,
     onlyCompositions,
     onlyPatterns,
+    patternType = "all",
     mode,
     whatIf,
     state,
@@ -2165,7 +2189,13 @@ 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) {
@@ -2215,12 +2245,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", {
@@ -2235,6 +2265,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",
@@ -2260,12 +2294,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", {
@@ -2305,6 +2339,7 @@ var CompositionPushModule = {
     project: projectId,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     diff: diffMode,
     allowEmptySource
   }) => {
@@ -2327,7 +2362,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,
@@ -2355,12 +2396,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", {
@@ -2380,6 +2421,10 @@ var ComponentPatternPushModule = {
               default: true,
               type: "boolean",
               hidden: true
+            }).option("patternType", {
+              default: "component",
+              choices: ["all", "component", "composition"],
+              hidden: true
             })
           )
         )
@@ -2394,10 +2439,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" })
       )
     )
   ),
@@ -2415,15 +2460,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", {
@@ -2457,6 +2505,7 @@ var CompositionUnpublishModule = {
     all,
     onlyCompositions,
     onlyPatterns,
+    patternType,
     project: projectId,
     whatIf
   }) => {
@@ -2473,14 +2522,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" });
@@ -2515,15 +2566,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", {
@@ -2532,14 +2583,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
         })
       )
     )
@@ -2553,11 +2608,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" })
         )
       )
     )
@@ -2579,9 +2634,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();
   }
@@ -2593,26 +2647,277 @@ 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/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(
+          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"
+              }
+            })
+          )
+        )
+      )
+    )
+  )
+};
+
+// src/commands/canvas/commands/compositionPattern/publish.ts
+var CompositionPatternPublishModule = {
+  ...CompositionPublishModule,
+  describe: "Publishes composition pattern(s)",
+  builder: (yargs36) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          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 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 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
+          })
+        )
+      )
+    )
+  )
+};
+
+// 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: (yargs34) => withConfiguration(
+  builder: (yargs36) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs34.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          yargs36.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
         )
       )
     )
@@ -2634,7 +2939,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  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 ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2682,11 +2987,11 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content 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 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", {
@@ -2770,11 +3075,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", {
@@ -2847,10 +3152,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" })
       )
     )
   ),
@@ -2867,10 +3172,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" })
       )
     )
   ),
@@ -2887,25 +3192,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" })
       )
     )
   ),
@@ -2923,10 +3228,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" })
       )
     )
   ),
@@ -2943,10 +3248,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
@@ -2966,14 +3271,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";
@@ -2981,12 +3286,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" })
         )
       )
     )
@@ -3009,7 +3314,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 });
@@ -3059,11 +3364,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", {
@@ -3147,11 +3452,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", {
@@ -3224,10 +3529,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" })
       )
     )
   ),
@@ -3244,10 +3549,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" })
       )
     )
   ),
@@ -3264,27 +3569,43 @@ 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"
           )
@@ -3301,7 +3622,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 });
@@ -3312,7 +3636,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`);
@@ -3327,12 +3653,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: "" }
@@ -3433,11 +3759,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", {
@@ -3492,12 +3818,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", {
@@ -3597,12 +3923,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", {
@@ -3689,10 +4015,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" })
       )
     )
   ),
@@ -3709,10 +4035,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", {
@@ -3785,11 +4111,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" })
         )
       )
     )
@@ -3806,27 +4132,27 @@ 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"
             }),
@@ -3861,8 +4187,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);
@@ -3885,11 +4211,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", {
@@ -3944,12 +4270,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", {
@@ -4049,12 +4375,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", {
@@ -4141,10 +4467,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" })
       )
     )
   ),
@@ -4161,10 +4487,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", {
@@ -4237,11 +4563,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" })
         )
       )
     )
@@ -4258,14 +4584,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";
@@ -4304,11 +4630,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", {
@@ -4392,11 +4718,11 @@ 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(
+  builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs34.positional("directory", {
+          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", {
@@ -4467,26 +4793,263 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs34) => yargs34.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs36) => yargs36.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
-    yargs11.help();
+    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/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(
+        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: CompositionUnpublishModule.handler
+};
+
+// 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: () => {
+    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" })
         )
       )
     )
@@ -4507,7 +5070,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 });
@@ -4555,12 +5118,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", {
@@ -4645,12 +5208,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", {
@@ -4724,9 +5287,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 }) => {
@@ -4742,10 +5305,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" })
       )
     )
   ),
@@ -4762,14 +5325,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";
@@ -4813,11 +5376,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", {
@@ -4895,11 +5458,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", {
@@ -4965,9 +5528,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();
   }
 };
 
@@ -4976,28 +5539,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" })
         )
       )
     )
@@ -5021,7 +5584,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 });
@@ -5088,11 +5651,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", {
@@ -5170,11 +5733,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", {
@@ -5242,10 +5805,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" })
       )
     )
   ),
@@ -5262,10 +5825,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" })
       )
     )
   ),
@@ -5282,25 +5845,25 @@ 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" })
         )
       )
     )
@@ -5324,7 +5887,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 });
@@ -5426,11 +5989,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", {
@@ -5508,11 +6071,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", {
@@ -5579,10 +6142,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" })
       )
     )
   ),
@@ -5598,14 +6161,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";
@@ -5616,10 +6179,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",
@@ -5681,7 +6244,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 {
@@ -5714,25 +6277,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" })
         )
       )
     )
@@ -5756,11 +6319,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"
@@ -5818,11 +6381,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", {
@@ -5900,11 +6463,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", {
@@ -5971,10 +6534,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" })
       )
     )
   ),
@@ -5991,10 +6554,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" })
       )
     )
   ),
@@ -6011,25 +6574,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" })
         )
       )
     )
@@ -6053,7 +6616,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 });
@@ -6103,11 +6666,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", {
@@ -6185,11 +6748,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", {
@@ -6256,10 +6819,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" })
       )
     )
   ),
@@ -6276,10 +6839,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" })
       )
     )
   ),
@@ -6296,25 +6859,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" })
         )
       )
     )
@@ -6338,7 +6901,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 });
@@ -6388,11 +6951,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", {
@@ -6470,11 +7033,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", {
@@ -6541,10 +7104,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" })
       )
     )
   ),
@@ -6561,9 +7124,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 }) => {
@@ -6578,9 +7141,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();
   }
 };
 
@@ -6589,20 +7152,20 @@ 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 } from "fs";
@@ -6640,8 +7203,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"
@@ -6661,11 +7224,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."
           })
@@ -6685,7 +7248,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 });
@@ -6697,9 +7260,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();
   }
 };
 
@@ -6739,10 +7302,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"
         })
@@ -6761,10 +7324,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."
         })
@@ -6782,9 +7345,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();
   }
 };
 
@@ -6824,10 +7387,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", {
@@ -6849,10 +7412,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)"
         })
@@ -6870,9 +7433,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();
   }
 };
 
@@ -6900,7 +7463,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.166.1",
+  version: "19.167.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -6958,7 +7521,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",
@@ -7916,10 +8479,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";
@@ -7934,7 +8497,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,
@@ -8035,10 +8598,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;
@@ -8049,29 +8612,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" })
         )
       )
     )
@@ -8095,7 +8658,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 });
@@ -8153,11 +8716,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", {
@@ -8235,11 +8798,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", {
@@ -8306,9 +8869,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 }) => {
@@ -8324,10 +8887,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" })
       )
     )
   ),
@@ -8343,25 +8906,25 @@ 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" })
         )
       )
     )
@@ -8386,12 +8949,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"
             })
@@ -8464,11 +9027,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", {
@@ -8550,11 +9113,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniform
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (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", {
@@ -8630,10 +9193,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" })
       )
     )
   ),
@@ -8650,10 +9213,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" })
       )
     )
   ),
@@ -8669,9 +9232,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();
   }
 };
 
@@ -8680,28 +9243,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" })
         )
       )
     )
@@ -8725,7 +9288,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 });
@@ -8792,11 +9355,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", {
@@ -8875,11 +9438,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", {
@@ -8946,9 +9509,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 }) => {
@@ -8964,10 +9527,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" })
       )
     )
   ),
@@ -8983,9 +9546,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();
   }
 };
 
@@ -8994,14 +9557,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";
@@ -9061,11 +9624,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,
@@ -9077,11 +9640,6 @@ var SyncPullModule = {
   ),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
-    let isUsingDeprecatedPatternConfig = false;
-    if (config2.entitiesConfig.pattern) {
-      isUsingDeprecatedPatternConfig = true;
-      config2.entitiesConfig.componentPattern ??= config2.entitiesConfig.pattern;
-    }
     const enabledEntities = Object.entries({
       locale: LocalePullModule,
       asset: AssetPullModule,
@@ -9095,7 +9653,9 @@ var SyncPullModule = {
       enrichment: EnrichmentPullModule,
       aggregate: AggregatePullModule,
       component: ComponentPullModule,
+      pattern: PatternPullModule,
       componentPattern: ComponentPatternPullModule,
+      compositionPattern: CompositionPatternPullModule,
       composition: CompositionPullModule,
       projectMapDefinition: ProjectMapDefinitionPullModule,
       projectMapNode: ProjectMapNodePullModule,
@@ -9124,9 +9684,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: ["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
           }),
           {
@@ -9153,13 +9714,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) => {
@@ -9175,11 +9734,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,
@@ -9191,11 +9750,6 @@ var SyncPushModule = {
   ),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
-    let isUsingDeprecatedPatternConfig = false;
-    if (config2.entitiesConfig.pattern) {
-      isUsingDeprecatedPatternConfig = true;
-      config2.entitiesConfig.componentPattern ??= config2.entitiesConfig.pattern;
-    }
     const enabledEntities = Object.entries({
       locale: LocalePushModule,
       asset: AssetPushModule,
@@ -9209,7 +9763,9 @@ var SyncPushModule = {
       enrichment: EnrichmentPushModule,
       aggregate: AggregatePushModule,
       component: ComponentPushModule,
+      pattern: PatternPushModule,
       componentPattern: ComponentPatternPushModule,
+      compositionPattern: CompositionPatternPushModule,
       composition: CompositionPushModule,
       projectMapDefinition: ProjectMapDefinitionPushModule,
       projectMapNode: ProjectMapNodePushModule,
@@ -9234,9 +9790,10 @@ var SyncPushModule = {
             state: 0,
             format: getFormat2(entityType, config2),
             onlyCompositions: entityType === "composition" ? true : void 0,
-            onlyPatterns: entityType === "componentPattern" ? true : void 0,
+            onlyPatterns: ["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
           }),
           {
@@ -9256,6 +9813,9 @@ var SyncPushModule = {
     if (config2.entitiesConfig?.componentPattern && config2.entitiesConfig?.componentPattern?.push?.disabled !== true && config2.entitiesConfig?.componentPattern?.publish) {
       await ComponentPatternPublishModule.handler({ ...otherParams, all: true });
     }
+    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 });
     }
@@ -9275,13 +9835,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) => {
@@ -9297,9 +9855,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();
   }
 };
 
@@ -9564,7 +10122,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", {