@uniformdev/cli 19.92.2 → 19.92.3-alpha.7

package/dist/index.d.mts

@@ -24,7 +24,7 @@ type SerializationConfiguration = {
     } & EntityConfiguration> & {
         composition?: PublishableEntitiesConfiguration;
         pattern?: PublishableEntitiesConfiguration;
-        entry?: EntityWithStateConfiguration;
+        entry?: PublishableEntitiesConfiguration;
     }>;
     directory: string;
     mode: SyncMode;

package/dist/index.mjs

@@ -3224,9 +3224,8 @@ var EntryListModule = {
   }
 };
 
-// src/commands/canvas/commands/entry/pull.ts
+// src/commands/canvas/commands/entry/publish.ts
 import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 
 // src/commands/canvas/entryEngineDataSource.ts
 import { convertEntryToPutEntry } from "@uniformdev/canvas";
@@ -3238,19 +3237,27 @@ var selectEntryDisplayName = (e) => `${e.entry._name ?? "Untitled"} (pid: ${e.en
 // src/commands/canvas/entryEngineDataSource.ts
 function createEntryEngineDataSource({
   client,
-  state
+  state,
+  onlyEntries,
+  onlyPatterns,
+  entryIDs
 }) {
   const stateId = convertCompositionState(state);
   async function* getObjects() {
-    const { entries } = await client.getEntries({
-      offset: 0,
-      limit: 1e3,
-      skipDataResolution: true,
-      skipOverridesResolution: true,
-      skipPatternResolution: true,
-      state: stateId,
-      withComponentIDs: true
-    });
+    const entries = paginateAsync(
+      async (offset, limit) => (await client.getEntries({
+        offset,
+        limit,
+        entryIDs,
+        pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
+        skipDataResolution: true,
+        skipOverridesResolution: true,
+        skipPatternResolution: true,
+        state: stateId,
+        withComponentIDs: true
+      })).entries,
+      { pageSize: 100 }
+    );
     for await (const e of entries) {
       const result = {
         id: selectEntryIdentifier(e),
@@ -3272,7 +3279,87 @@ function createEntryEngineDataSource({
   };
 }
 
+// src/commands/canvas/commands/entry/publish.ts
+var EntryPublishModule = {
+  command: "publish [ids]",
+  describe: "Publishes entry(ies)",
+  builder: (yargs28) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs28.positional("ids", {
+            describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Publishes all entries. Use --ids to publish selected entries 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("onlyEntries", {
+            describe: "Only publishing entries and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not entries",
+            default: false,
+            type: "boolean",
+            hidden: true
+          })
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    whatIf,
+    project: projectId,
+    onlyEntries,
+    onlyPatterns
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or entry ID(s) to publish.`);
+      process.exit(1);
+    }
+    const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient10({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state: "preview",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const target = createEntryEngineDataSource({
+      client,
+      state: "published",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    await syncEngine({
+      source,
+      target,
+      // Publishing is one-direction operation, so no need to support automatic un-publishing
+      mode: "createOrUpdate",
+      whatIf,
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
+    });
+  }
+};
+
 // src/commands/canvas/commands/entry/pull.ts
+import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
+import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
@@ -3321,7 +3408,7 @@ var EntryPullModule = {
     allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient10({
+    const client = new ContentClient11({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -3375,7 +3462,7 @@ var EntryPullModule = {
 };
 
 // src/commands/canvas/commands/entry/push.ts
-import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
 import { UncachedFileClient as UncachedFileClient6 } from "@uniformdev/files";
 var EntryPushModule = {
   command: "push <directory>",
@@ -3418,7 +3505,7 @@ var EntryPushModule = {
     allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient11({
+    const client = new ContentClient12({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -3466,7 +3553,7 @@ var EntryPushModule = {
 };
 
 // src/commands/canvas/commands/entry/remove.ts
-import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
 var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -3480,13 +3567,110 @@ var EntryRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     await client.deleteEntry({ entryId: id });
   }
 };
 
+// src/commands/canvas/commands/entry/unpublish.ts
+import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3, ContentClient as ContentClient14 } from "@uniformdev/canvas";
+import { diffJson as diffJson3 } from "diff";
+var EntryUnpublishModule = {
+  command: "unpublish [ids]",
+  describe: "Unpublish an entry(ies)",
+  builder: (yargs28) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs28.positional("ids", {
+          describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+          type: "string"
+        }).option("all", {
+          alias: ["a"],
+          describe: "Un-publishes all entries. Use --all to un-publish selected entries 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("onlyEntries", {
+          describe: "Only un-publishing entries and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only un-publishing patterns and not entries",
+          default: false,
+          type: "boolean",
+          hidden: true
+        })
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    onlyEntries,
+    onlyPatterns,
+    project: projectId,
+    whatIf
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or entry ID(s) to publish.`);
+      process.exit(1);
+    }
+    const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const targetItems = /* @__PURE__ */ new Map();
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient14({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state: "published",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const target = createEntryEngineDataSource({
+      client,
+      state: "preview",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const actions = [];
+    const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
+    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(`Entry ${id} was not found`);
+        return;
+      }
+      actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE3 }));
+      log({
+        action: "update",
+        id,
+        providerId: sourceObject.providerId,
+        displayName: sourceObject.displayName ?? sourceObject.providerId,
+        whatIf,
+        diff: diffJson3(targetObject.object, sourceObject.object)
+      });
+    }
+  }
+};
+
 // src/commands/canvas/commands/entry/update.ts
-import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient15 } from "@uniformdev/canvas";
 var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -3500,7 +3684,7 @@ var EntryUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient15({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     const file = readFileToObject(filename);
     await client.upsertEntry(file);
   }
@@ -3510,7 +3694,7 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs28) => yargs28.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).demandCommand(),
+  builder: (yargs28) => yargs28.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
     yargs7.help();
   }
@@ -5937,7 +6121,7 @@ var package_default = {
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.9",
-    "@types/node": "18.19.3",
+    "@types/node": "20.10.5",
     "@types/yargs": "17.0.32"
   },
   bin: {
@@ -8111,7 +8295,7 @@ var SyncPushModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const config2 = serialization;
     const enabledEntities = Object.entries({
       locale: LocalePushModule,
@@ -8166,6 +8350,9 @@ var SyncPushModule = {
     if (((_g = config2.entitiesConfig) == null ? void 0 : _g.composition) && ((_j = (_i = (_h = config2.entitiesConfig) == null ? void 0 : _h.composition) == null ? void 0 : _i.push) == null ? void 0 : _j.disabled) !== true && ((_l = (_k = config2.entitiesConfig) == null ? void 0 : _k.composition) == null ? void 0 : _l.publish)) {
       await CompositionPublishModule.handler({ ...otherParams, all: true });
     }
+    if (((_m = config2.entitiesConfig) == null ? void 0 : _m.entry) && ((_p = (_o = (_n = config2.entitiesConfig) == null ? void 0 : _n.entry) == null ? void 0 : _o.push) == null ? void 0 : _p.disabled) !== true && ((_r = (_q = config2.entitiesConfig) == null ? void 0 : _q.entry) == null ? void 0 : _r.publish)) {
+      await EntryPublishModule.handler({ ...otherParams, all: true });
+    }
   }
 };
 var getPushMode = (entityType, config2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.92.2",
+  "version": "19.92.3-alpha.7+a4ee2d638",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.92.2",
-    "@uniformdev/canvas": "19.92.2",
-    "@uniformdev/context": "19.92.2",
-    "@uniformdev/files": "19.92.2",
-    "@uniformdev/project-map": "19.92.2",
-    "@uniformdev/redirect": "19.92.2",
+    "@uniformdev/assets": "19.92.3-alpha.7+a4ee2d638",
+    "@uniformdev/canvas": "19.92.3-alpha.7+a4ee2d638",
+    "@uniformdev/context": "19.92.3-alpha.7+a4ee2d638",
+    "@uniformdev/files": "19.92.3-alpha.7+a4ee2d638",
+    "@uniformdev/project-map": "19.92.3-alpha.7+a4ee2d638",
+    "@uniformdev/redirect": "19.92.3-alpha.7+a4ee2d638",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -57,7 +57,7 @@
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/lodash.isequalwith": "4.4.9",
-    "@types/node": "18.19.3",
+    "@types/node": "20.10.5",
     "@types/yargs": "17.0.32"
   },
   "bin": {
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8a0bea83eef2d7353758902ed61920b39187c00a"
+  "gitHead": "a4ee2d638902c3fb978d7c7344a1dbc52ec25912"
 }