@uniformdev/cli 20.49.4-alpha.2 → 20.49.5-alpha.10

package/dist/index.mjs

@@ -1124,7 +1124,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.49.3",
+  version: "20.49.4",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -2612,6 +2612,15 @@ var compareCompositionsOrEntriesWithoutAssetUrls = (source, target) => {
     removeUrlsFromAssetParameters(structuredClone(target.object))
   );
 };
+var PUBLISH_TIMESTAMP_TOLERANCE_MS = 2e3;
+var compareCompositionsOrEntriesWithoutAssetUrlsForPublishing = (source, target) => {
+  const sourceModified = new Date(source.object.modified).getTime();
+  const targetModified = new Date(target.object.modified).getTime();
+  if (sourceModified - targetModified > PUBLISH_TIMESTAMP_TOLERANCE_MS) {
+    return false;
+  }
+  return compareCompositionsOrEntriesWithoutAssetUrls(source, target);
+};
 var removeUrlFromAsset = (asset) => {
   if (asset.asset.fields?.url?.value) {
     asset.asset.fields.url.value = "";
@@ -4201,7 +4210,7 @@ var CompositionPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -4656,7 +4665,10 @@ var ComponentPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2 } from "@uniformdev/canvas";
+import {
+  ApiClientError,
+  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2
+} from "@uniformdev/canvas";
 import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
@@ -4670,15 +4682,15 @@ var CompositionUnpublishModule = {
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all compositions. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
-            describe: "Only publishing compositions and not patterns",
+            describe: "Only un-publishing compositions and not patterns",
             default: false,
             type: "boolean"
           }).option("onlyPatterns", {
-            describe: "Only pulling patterns and not compositions",
+            describe: "Only un-publishing patterns and not compositions",
             default: false,
             type: "boolean",
             hidden: true
@@ -4701,7 +4713,7 @@ var CompositionUnpublishModule = {
     verbose
   }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or composition ID(s) to publish.`);
+      console.error(`Specify --all or composition ID(s) to unpublish.`);
       process.exit(1);
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -4726,7 +4738,6 @@ var CompositionUnpublishModule = {
       patternType,
       verbose
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -4735,16 +4746,30 @@ var CompositionUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       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;
+        console.log(`Composition ${id} did not have a draft (removing published)`);
       }
-      console.log(`\u{1F41B} unpublishing composition: (id: ${id})`);
       if (!whatIf) {
-        actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
+        actions.push(
+          client.removeComposition({ ...parseCompositionSerializedId(id), state: CANVAS_PUBLISHED_STATE2 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Composition ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -4752,9 +4777,10 @@ var CompositionUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson2(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson2(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -4771,7 +4797,7 @@ var ComponentPatternUnpublishModule = {
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all component patterns. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
@@ -5066,7 +5092,7 @@ var CompositionPatternUnpublishModule = {
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all composition patterns. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
@@ -5964,7 +5990,7 @@ var EntryListModule = {
 };
 
 // src/commands/canvas/entryEngineDataSource.ts
-import { ApiClientError, convertEntryToPutEntry } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError2, convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => {
@@ -6010,7 +6036,7 @@ function createEntryEngineDataSource({
             editions: "all"
           })).entries;
         } catch (error) {
-          if (error instanceof ApiClientError && error.errorMessage === "Entry not found or not published") {
+          if (error instanceof ApiClientError2 && error.errorMessage === "Entry not found or not published") {
             return [];
           }
           throw error;
@@ -6045,10 +6071,10 @@ var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
   builder: (yargs42) => withConfiguration(
-    withDiffOptions(
-      withApiOptions(
-        withProjectOptions(
-          withDiffOptions(
+    withDebugOptions(
+      withDiffOptions(
+        withApiOptions(
+          withProjectOptions(
             yargs42.positional("ids", {
               describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
@@ -6108,7 +6134,7 @@ var EntryPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -6356,7 +6382,7 @@ var EntryRemoveModule = {
 };
 
 // src/commands/canvas/commands/entry/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError3, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
 import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
@@ -6380,7 +6406,7 @@ var EntryUnpublishModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or entry ID(s) to publish.`);
+      console.error(`Specify --all or entry ID(s) to unpublish.`);
       process.exit(1);
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -6399,7 +6425,6 @@ var EntryUnpublishModule = {
       entryIDs: entryIDsArray,
       onlyEntries: true
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -6408,15 +6433,30 @@ var EntryUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       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;
+        console.log(`Entry ${id} did not have a draft (removing published)`);
       }
       if (!whatIf) {
-        actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE3 }));
+        actions.push(
+          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE3 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError3 && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Entry ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -6424,9 +6464,10 @@ var EntryUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson3(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson3(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -6660,7 +6701,7 @@ var EntryPatternPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -6913,11 +6954,11 @@ var EntryPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError4, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
 import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
-  describe: "Unpublish an entry patterns",
+  describe: "Unpublish entry pattern(s)",
   builder: (yargs42) => withConfiguration(
     withDebugOptions(
       withApiOptions(
@@ -6937,7 +6978,7 @@ var EntryPatternUnpublishModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or entry pattern ID(s) to publish.`);
+      console.error(`Specify --all or entry pattern ID(s) to unpublish.`);
       process.exit(1);
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -6956,7 +6997,6 @@ var EntryPatternUnpublishModule = {
       entryIDs: entryIDsArray,
       onlyPatterns: true
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -6965,15 +7005,30 @@ var EntryPatternUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
       const targetObject = targetItems.get(id);
       if (!targetObject) {
-        console.log(`Entry pattern ${id} was not found`);
-        return;
+        console.log(`Entry pattern ${id} did not have a draft (removing published)`);
       }
       if (!whatIf) {
-        actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE4 }));
+        actions.push(
+          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE4 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError4 && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Entry pattern ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -6981,9 +7036,10 @@ var EntryPatternUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson4(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson4(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -8948,7 +9004,7 @@ var EnrichmentModule = {
 import yargs23 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-import { ApiClientError as ApiClientError2, UncachedManifestClient } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError5, UncachedManifestClient } from "@uniformdev/context/api";
 import { gray as gray4, green as green6, red as red6 } from "colorette";
 import { writeFile } from "fs";
 import { exit } from "process";
@@ -8999,7 +9055,7 @@ var ManifestGetModule = {
       }
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError2) {
+      if (e instanceof ApiClientError5) {
         if (e.statusCode === 403) {
           message = `The API key ${apiKey} did not have permissions to fetch the manifest. Ensure ${preview ? "Uniform Context > Read Drafts" : "Uniform Context > Manifest > Read"} permissions are granted.`;
         }
@@ -9015,7 +9071,7 @@ var ManifestGetModule = {
 };
 
 // src/commands/context/commands/manifest/publish.ts
-import { ApiClientError as ApiClientError3, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError6, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
 import { gray as gray5, red as red7 } from "colorette";
 import { exit as exit2 } from "process";
 var ManifestPublishModule = {
@@ -9034,7 +9090,7 @@ var ManifestPublishModule = {
       await client.publish();
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError3) {
+      if (e instanceof ApiClientError6) {
         if (e.statusCode === 403) {
           message = `The API key ${apiKey} did not have permissions to publish the manifest. Ensure Uniform Context > Manifest > Publish permissions are granted.`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.49.4-alpha.2+0201693aca",
+  "version": "20.49.5-alpha.10+97590818af",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -28,13 +28,13 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/canvas": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/context": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/files": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/project-map": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/redirect": "20.49.4-alpha.2+0201693aca",
-    "@uniformdev/richtext": "20.49.4-alpha.2+0201693aca",
+    "@uniformdev/assets": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/canvas": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/context": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/files": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/project-map": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/redirect": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/richtext": "20.49.5-alpha.10+97590818af",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0201693aca0f20b06ffaaef22decc086ec730035"
+  "gitHead": "97590818aff0ababfb057278ba981112e219bf43"
 }