@uniformdev/cli 19.42.1-alpha.7 → 19.45.1

package/dist/index.mjs

@@ -1408,13 +1408,13 @@ function createComponentInstanceEngineDataSource({
 // src/commands/canvas/commands/composition/publish.ts
 var CompositionPublishModule = {
   command: "publish [ids]",
-  describe: "Publishes compositions",
+  describe: "Publishes composition(s)",
   builder: (yargs23) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           yargs23.positional("ids", {
-            describe: "Publishes composition/pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+            describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
             alias: ["a"],
@@ -1426,12 +1426,32 @@ var CompositionPublishModule = {
             describe: "What-if mode reports what would be done but does not perform any publishing",
             default: false,
             type: "boolean"
+          }).option("onlyCompositions", {
+            describe: "Only publishing compositions and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not compositions",
+            default: false,
+            type: "boolean",
+            hidden: true
           })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, whatIf, project: projectId, diff: diffMode }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    onlyCompositions,
+    onlyPatterns
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
       process.exit(1);
@@ -1442,17 +1462,22 @@ var CompositionPublishModule = {
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "preview",
-      compositionIDs: compositionIDsArray
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
     });
     const target = createComponentInstanceEngineDataSource({
       client,
       state: "published",
-      compositionIDs: compositionIDsArray
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
     });
     await syncEngine({
       source,
       target,
-      mode: "mirror",
+      // Publishing is one-direction operation, so no need to support automatic un-publishing
+      mode: "createOrUpdate",
       whatIf,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
@@ -1849,23 +1874,99 @@ var CompositionRemoveModule = {
 
 // src/commands/canvas/commands/composition/unpublish.ts
 import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2, UncachedCanvasClient as UncachedCanvasClient13 } from "@uniformdev/canvas";
+import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
-  command: "unpublish <id>",
-  describe: "Unpublish a composition",
+  command: "unpublish [ids]",
+  describe: "Unpublish a composition(s)",
   builder: (yargs23) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs23.positional("id", {
-          demandOption: true,
-          describe: "Composition/pattern public ID to unpublish"
+        yargs23.positional("ids", {
+          describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+          type: "string"
+        }).option("all", {
+          alias: ["a"],
+          describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+          default: false,
+          type: "boolean"
+        }).option("what-if", {
+          alias: ["w"],
+          describe: "What-if mode reports what would be done but does not perform any publishing",
+          default: false,
+          type: "boolean"
+        }).option("onlyCompositions", {
+          describe: "Only publishing compositions and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only pulling patterns and not compositions",
+          default: false,
+          type: "boolean",
+          hidden: true
         })
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    onlyCompositions,
+    onlyPatterns,
+    project: projectId,
+    diff,
+    whatIf
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or composition ID(s) to publish.`);
+      process.exit(1);
+    }
+    const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const targetItems = /* @__PURE__ */ new Map();
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient13({ apiKey, apiHost, fetch: fetch3, projectId });
-    await client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 });
+    const source = createComponentInstanceEngineDataSource({
+      client,
+      state: "published",
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
+    });
+    const target = createComponentInstanceEngineDataSource({
+      client,
+      state: "preview",
+      compositionIDs: compositionIDsArray,
+      onlyCompositions,
+      onlyPatterns
+    });
+    const actions = [];
+    const log = createSyncEngineConsoleLogger({ diffMode: diff });
+    for await (const obj of target.objects) {
+      if (Array.isArray(obj.id)) {
+        obj.id.forEach((o) => targetItems.set(o, obj));
+      } else {
+        targetItems.set(obj.id, obj);
+      }
+    }
+    for await (const sourceObject of source.objects) {
+      const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
+      const targetObject = targetItems.get(id);
+      if (!targetObject) {
+        console.log(`Composition ${id} was not found`);
+        return;
+      }
+      actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
+      log({
+        action: "update",
+        id,
+        providerId: sourceObject.providerId,
+        displayName: sourceObject.displayName ?? sourceObject.providerId,
+        whatIf,
+        diff: diffJson2(targetObject.object, sourceObject.object)
+      });
+    }
   }
 };
 
@@ -2249,7 +2350,43 @@ var PatternListModule = {
 // src/commands/canvas/commands/pattern/publish.ts
 var PatternPublishModule = {
   ...CompositionPublishModule,
-  describe: "Publishes patterns"
+  describe: "Publishes pattern(s)",
+  builder: (yargs23) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs23.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
@@ -2340,8 +2477,38 @@ var PatternRemoveModule = {
 
 // src/commands/canvas/commands/pattern/unpublish.ts
 var PatternUnpublishModule = {
-  ...CompositionUnpublishModule,
-  describe: "Unpublish a pattern"
+  command: "unpublish [ids]",
+  describe: "Unpublish a pattern(s)",
+  builder: (yargs23) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs23.positional("ids", {
+          describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+          type: "string"
+        }).option("all", {
+          alias: ["a"],
+          describe: "Un-pPublishes all compositions. Use compositionId to publish one instead.",
+          default: false,
+          type: "boolean"
+        }).option("what-if", {
+          alias: ["w"],
+          describe: "What-if mode reports what would be done but does not perform any publishing",
+          default: false,
+          type: "boolean"
+        }).option("onlyCompositions", {
+          describe: "Only publishing compositions and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only pulling patterns and not compositions",
+          default: true,
+          type: "boolean",
+          hidden: true
+        })
+      )
+    )
+  ),
+  handler: CompositionUnpublishModule.handler
 };
 
 // src/commands/canvas/commands/pattern/update.ts
@@ -3974,7 +4141,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.42.0",
+  version: "19.45.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -4007,7 +4174,7 @@ var package_default = {
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
     "image-size": "^1.0.2",
-    inquirer: "9.2.9",
+    inquirer: "9.2.10",
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
@@ -4028,7 +4195,7 @@ var package_default = {
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.17.1",
+    "@types/node": "18.17.5",
     "@types/yargs": "17.0.24"
   },
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.42.1-alpha.7+1380aadd7",
+  "version": "19.45.1",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/canvas": "19.42.1-alpha.7+1380aadd7",
-    "@uniformdev/context": "19.42.1-alpha.7+1380aadd7",
-    "@uniformdev/files-sdk": "19.37.0",
-    "@uniformdev/project-map": "19.42.1-alpha.7+1380aadd7",
-    "@uniformdev/redirect": "19.42.1-alpha.7+1380aadd7",
+    "@uniformdev/canvas": "19.45.1",
+    "@uniformdev/context": "19.45.1",
+    "@uniformdev/files-sdk": "19.45.1",
+    "@uniformdev/project-map": "19.45.1",
+    "@uniformdev/redirect": "19.45.1",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -33,7 +33,7 @@
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
     "image-size": "^1.0.2",
-    "inquirer": "9.2.9",
+    "inquirer": "9.2.10",
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
@@ -54,7 +54,7 @@
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.17.1",
+    "@types/node": "18.17.5",
     "@types/yargs": "17.0.24"
   },
   "bin": {
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1380aadd7c71f6f120f933a40e73e113518e3716"
+  "gitHead": "27d329b913db64152e9d49bcfa7dddf8b3b31bb6"
 }