@uniformdev/cli 20.22.1-alpha.0 → 20.23.0

package/dist/index.mjs

@@ -2603,128 +2603,131 @@ var ComponentPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/composition/pull.ts
-var CompositionPullModule = {
-  command: "pull <directory>",
-  describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs35) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withStateOptions(
-          withDebugOptions(
-            withDiffOptions(
-              yargs35.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", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("onlyCompositions", {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              }).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"
-              })
+var CompositionPullModule = componentInstancePullModuleFactory("compositions");
+function componentInstancePullModuleFactory(type) {
+  return {
+    command: "pull <directory>",
+    describe: "Pulls all compositions to local files in a directory",
+    builder: (yargs35) => withConfiguration(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            withDebugOptions(
+              withDiffOptions(
+                yargs35.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", {
+                  alias: ["f"],
+                  describe: "Output format",
+                  default: "yaml",
+                  choices: ["yaml", "json"],
+                  type: "string"
+                }).option("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  describe: "Only pulling patterns and not compositions",
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                }).option("mode", {
+                  alias: ["m"],
+                  describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+                  choices: ["create", "createOrUpdate", "mirror"],
+                  default: "mirror",
+                  type: "string"
+                })
+              )
             )
           )
         )
       )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    format,
-    onlyCompositions,
-    onlyPatterns,
-    patternType = "all",
-    mode,
-    whatIf,
-    state,
-    project: projectId,
-    diff: diffMode,
-    allowEmptySource,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createComponentInstanceEngineDataSource({
-      client,
-      state,
+    ),
+    handler: async ({
+      apiHost,
+      apiKey,
+      proxy,
+      directory,
+      format,
       onlyCompositions,
       onlyPatterns,
-      patternType,
+      patternType = "all",
+      mode,
+      whatIf,
+      state,
+      project: projectId,
+      diff: diffMode,
+      allowEmptySource,
       verbose
-    });
-    const isPackage = isPathAPackageFile(directory);
-    let target;
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, false, verbose);
-      target = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents?.compositions ?? [],
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        onSyncComplete: async (_, synced) => {
-          packageContents.compositions = synced;
-          writeCanvasPackage(directory, packageContents);
-        }
-      });
-    } else {
-      target = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        format,
+    }) => {
+      const fetch2 = nodeFetchProxy(proxy, verbose);
+      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const source = createComponentInstanceEngineDataSource({
+        client,
+        state,
+        onlyCompositions,
+        onlyPatterns,
+        patternType,
         verbose
       });
-    }
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource: allowEmptySource ?? true,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject, targetObject) => {
-        return replaceRemoteUrlsWithLocalReferences({
-          sourceEntity: sourceObject,
-          targetEntity: targetObject,
-          directory,
-          fileClient
+      const isPackage = isPathAPackageFile(directory);
+      let target;
+      if (isPackage) {
+        const packageContents = readCanvasPackage(directory, false, verbose);
+        target = await createArraySyncEngineDataSource({
+          name: `Package file ${directory}`,
+          objects: packageContents?.[type] ?? [],
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          onSyncComplete: async (_, synced) => {
+            packageContents[type] = synced;
+            writeCanvasPackage(directory, packageContents);
+          }
         });
-      },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        await downloadFilesForCompositionOrEntry({
-          entity: sourceObject.object,
+      } else {
+        target = await createFileSyncEngineDataSource({
           directory,
-          fileClient
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          format,
+          verbose
         });
-        return sourceObject;
       }
-    });
-  }
-};
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource: allowEmptySource ?? true,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject, targetObject) => {
+          return replaceRemoteUrlsWithLocalReferences({
+            sourceEntity: sourceObject,
+            targetEntity: targetObject,
+            directory,
+            fileClient
+          });
+        },
+        compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+        onBeforeWriteObject: async (sourceObject) => {
+          await downloadFilesForCompositionOrEntry({
+            entity: sourceObject.object,
+            directory,
+            fileClient
+          });
+          return sourceObject;
+        }
+      });
+    }
+  };
+}
 
 // src/commands/canvas/commands/componentPattern/pull.ts
 var ComponentPatternPullModule = {
-  ...CompositionPullModule,
+  ...componentInstancePullModuleFactory("componentPatterns"),
   describe: "Pulls all component patterns to local files in a directory",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -2748,6 +2751,7 @@ var ComponentPatternPullModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "component",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -2772,114 +2776,117 @@ var ComponentPatternPullModule = {
 };
 
 // src/commands/canvas/commands/composition/push.ts
-var CompositionPushModule = {
-  command: "push <directory>",
-  describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs35) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withStateOptions(
-          withDebugOptions(
-            withDiffOptions(
-              yargs35.positional("directory", {
-                describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).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("onlyCompositions", {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              })
+var CompositionPushModule = componentInstancePushModuleFactory("compositions");
+function componentInstancePushModuleFactory(type) {
+  return {
+    command: "push <directory>",
+    describe: "Pushes all compositions from files in a directory to Uniform Canvas",
+    builder: (yargs35) => withConfiguration(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            withDebugOptions(
+              withDiffOptions(
+                yargs35.positional("directory", {
+                  describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
+                  type: "string"
+                }).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("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  // backwards compatibility
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                })
+              )
             )
           )
         )
       )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    mode,
-    whatIf,
-    state,
-    project: projectId,
-    onlyCompositions,
-    onlyPatterns,
-    patternType,
-    diff: diffMode,
-    allowEmptySource,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    let source;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, true, verbose);
-      source = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents.compositions ?? [],
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3
-      });
-    } else {
-      source = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        verbose
-      });
-    }
-    const target = createComponentInstanceEngineDataSource({
-      client,
+    ),
+    handler: async ({
+      apiHost,
+      apiKey,
+      proxy,
+      directory,
+      mode,
+      whatIf,
       state,
+      project: projectId,
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
-    });
-    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      verbose,
+      diff: diffMode,
       allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject) => {
-        return replaceLocalUrlsWithRemoteReferences({
-          entity: sourceObject,
-          fileClient
+      verbose
+    }) => {
+      const fetch2 = nodeFetchProxy(proxy, verbose);
+      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      let source;
+      const isPackage = isPathAPackageFile(directory);
+      if (isPackage) {
+        const packageContents = readCanvasPackage(directory, true, verbose);
+        source = await createArraySyncEngineDataSource({
+          name: `Package file ${directory}`,
+          objects: packageContents[type] ?? [],
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3
         });
-      },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        return uploadFilesForCompositionOrEntry({
-          entity: sourceObject,
+      } else {
+        source = await createFileSyncEngineDataSource({
           directory,
-          fileClient
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          verbose
         });
       }
-    });
-  }
-};
+      const target = createComponentInstanceEngineDataSource({
+        client,
+        state,
+        onlyCompositions,
+        onlyPatterns,
+        patternType,
+        verbose
+      });
+      const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        verbose,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject) => {
+          return replaceLocalUrlsWithRemoteReferences({
+            entity: sourceObject,
+            fileClient
+          });
+        },
+        compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+        onBeforeWriteObject: async (sourceObject) => {
+          return uploadFilesForCompositionOrEntry({
+            entity: sourceObject,
+            directory,
+            fileClient
+          });
+        }
+      });
+    }
+  };
+}
 
 // src/commands/canvas/commands/componentPattern/push.ts
 var ComponentPatternPushModule = {
-  ...CompositionPushModule,
+  ...componentInstancePushModuleFactory("componentPatterns"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -2903,6 +2910,7 @@ var ComponentPatternPushModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "component",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -3263,7 +3271,7 @@ var CompositionPatternPublishModule = {
 
 // src/commands/canvas/commands/compositionPattern/pull.ts
 var CompositionPatternPullModule = {
-  ...CompositionPullModule,
+  ...componentInstancePullModuleFactory("compositionPatterns"),
   describe: "Pulls all composition patterns to local files in a directory",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -3307,7 +3315,7 @@ var CompositionPatternPullModule = {
 
 // src/commands/canvas/commands/compositionPattern/push.ts
 var CompositionPatternPushModule = {
-  ...CompositionPushModule,
+  ...componentInstancePushModuleFactory("compositionPatterns"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -3331,6 +3339,7 @@ var CompositionPatternPushModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "composition",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -8455,7 +8464,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.22.0",
+  version: "20.23.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.22.1-alpha.0+b02aa0b2f0",
+  "version": "20.23.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/canvas": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/context": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/files": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/project-map": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/redirect": "20.22.1-alpha.0+b02aa0b2f0",
-    "@uniformdev/richtext": "20.22.1-alpha.0+b02aa0b2f0",
+    "@uniformdev/assets": "20.23.0",
+    "@uniformdev/canvas": "20.23.0",
+    "@uniformdev/context": "20.23.0",
+    "@uniformdev/files": "20.23.0",
+    "@uniformdev/project-map": "20.23.0",
+    "@uniformdev/redirect": "20.23.0",
+    "@uniformdev/richtext": "20.23.0",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b02aa0b2f0c3d94ec1f20953cb5bc36dfa9cdbc7"
+  "gitHead": "cc8a0ba91f036c7dea8d3a2dffad3373dec9cf2b"
 }