@uniformdev/cli 19.191.0 → 19.191.2-alpha.10

package/dist/{chunk-VMUNHMVI.mjs → chunk-MIERGFOU.mjs}

@@ -13,6 +13,7 @@ var getDirname = () => path.dirname(getFilename());
 var __dirname = /* @__PURE__ */ getDirname();
 
 // src/sync/util.ts
+import { ApiClientError } from "@uniformdev/canvas";
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dump, load } from "js-yaml";
 import { dirname, extname, isAbsolute, resolve, sep } from "path";
@@ -47,7 +48,26 @@ function withApiOptions(yargs) {
     type: "string"
   });
 }
-function nodeFetchProxy(proxy) {
+function withDebugOptions(yargs) {
+  return yargs.option("verbose", {
+    describe: "Enable verbose mode, which outputs additional information",
+    default: false,
+    type: "boolean"
+  }).option("what-if", {
+    alias: ["w"],
+    describe: "What-if mode reports what would be done but changes nothing",
+    default: false,
+    type: "boolean"
+  });
+}
+function withVerboseOption(yargs) {
+  return yargs.option("verbose", {
+    describe: "Enable verbose mode, which outputs additional information",
+    default: false,
+    type: "boolean"
+  });
+}
+function nodeFetchProxy(proxy, verbose) {
   if (proxy) {
     console.log(`\u{1F991} Using proxy ${proxy}`);
   }
@@ -61,6 +81,41 @@ function nodeFetchProxy(proxy) {
     }
     return undiciFetch(input, init);
   };
+  if (verbose) {
+    return async function fetchWithVerboseLogging(input, init) {
+      const method = init?.method ?? "GET";
+      console.log(`\u{1F41B} verbose request: method ${method} url ${input.toString()}`);
+      const response = await wrappedFetch(input, init);
+      const clonedResponse = response.clone();
+      if (!clonedResponse.ok) {
+        let message = "";
+        try {
+          const responseText = await clonedResponse.text();
+          try {
+            const parsed = JSON.parse(responseText);
+            if (parsed.errorMessage) {
+              message = Array.isArray(parsed.errorMessage) ? parsed.errorMessage.join(", ") : parsed.errorMessage;
+            } else {
+              message = responseText;
+            }
+          } catch (e) {
+            message = responseText;
+          }
+        } catch {
+          message = `General error`;
+        }
+        const exception = new ApiClientError(
+          message,
+          method,
+          input.toString(),
+          clonedResponse.status,
+          clonedResponse.statusText
+        );
+        console.error(`\u{1F41B} verbose API error`, exception.message, init?.body);
+      }
+      return response;
+    };
+  }
   return wrappedFetch;
 }
 function withProjectOptions(yargs) {
@@ -251,6 +306,8 @@ export {
   __require,
   withConfiguration,
   withApiOptions,
+  withDebugOptions,
+  withVerboseOption,
   nodeFetchProxy,
   withProjectOptions,
   withTeamOptions,

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-VMUNHMVI.mjs";
+import "./chunk-MIERGFOU.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -11,11 +11,13 @@ import {
   readFileToObject,
   withApiOptions,
   withConfiguration,
+  withDebugOptions,
   withDiffOptions,
   withFormatOptions,
   withProjectOptions,
-  withTeamOptions
-} from "./chunk-VMUNHMVI.mjs";
+  withTeamOptions,
+  withVerboseOption
+} from "./chunk-MIERGFOU.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -244,24 +246,25 @@ async function syncEngine({
   const processDelete = async (object) => {
     if (deleteTracker.has(object)) return;
     deleteTracker.add(object);
-    if (!whatIf) {
-      try {
+    try {
+      if (!whatIf) {
         await target.deleteObject(object.providerId, object);
-        log({
-          action: "delete",
-          id: object.id[0],
-          providerId: object.providerId,
-          displayName: object.displayName ?? object.providerId,
-          whatIf,
-          diff: diffLines(JSON.stringify(object.object, null, 2), "")
-        });
-      } catch (e) {
-        if (onError) {
-          onError(e, object);
-        } else {
-          throw new SyncEngineError(e, object);
-        }
       }
+    } catch (e) {
+      if (onError) {
+        onError(e, object);
+      } else {
+        throw new SyncEngineError(e, object);
+      }
+    } finally {
+      log({
+        action: "delete",
+        id: object.id[0],
+        providerId: object.providerId,
+        displayName: object.displayName ?? object.providerId,
+        whatIf,
+        diff: diffLines(JSON.stringify(object.object, null, 2), "")
+      });
     }
   };
   for await (const obj of target.objects) {
@@ -283,25 +286,26 @@ async function syncEngine({
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           const process2 = async (sourceObject2, targetObject2) => {
-            if (!whatIf) {
-              try {
+            try {
+              if (!whatIf) {
                 const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
                 await target.writeObject(finalSourceObject, targetObject2);
-                log({
-                  action: "update",
-                  id: ids[0],
-                  providerId: sourceObject2.providerId,
-                  displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-                  whatIf,
-                  diff: diffJson(targetObject2.object, sourceObject2.object)
-                });
-              } catch (e) {
-                if (onError) {
-                  onError(e, sourceObject2);
-                } else {
-                  throw new SyncEngineError(e, sourceObject2);
-                }
               }
+            } catch (e) {
+              if (onError) {
+                onError(e, sourceObject2);
+              } else {
+                throw new SyncEngineError(e, sourceObject2);
+              }
+            } finally {
+              log({
+                action: "update",
+                id: ids[0],
+                providerId: sourceObject2.providerId,
+                displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+                whatIf,
+                diff: diffJson(targetObject2.object, sourceObject2.object)
+              });
             }
           };
           actions.push(process2(sourceObject, targetObject));
@@ -310,25 +314,26 @@ async function syncEngine({
       ids.forEach((i) => targetItems.delete(i));
     } else {
       const process2 = async (sourceObject2, id) => {
-        if (!whatIf) {
-          try {
+        try {
+          if (!whatIf) {
             const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
             await target.writeObject(finalSourceObject);
-            log({
-              action: "create",
-              id,
-              providerId: id,
-              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-              whatIf,
-              diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
-            });
-          } catch (e) {
-            if (onError) {
-              onError(e, sourceObject2);
-            } else {
-              throw new SyncEngineError(e, sourceObject2);
-            }
           }
+        } catch (e) {
+          if (onError) {
+            onError(e, sourceObject2);
+          } else {
+            throw new SyncEngineError(e, sourceObject2);
+          }
+        } finally {
+          log({
+            action: "create",
+            id,
+            providerId: id,
+            displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+            whatIf,
+            diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+          });
         }
       };
       if (invalidTargetObjects.length > 0) {
@@ -1748,38 +1753,43 @@ var CompositionGetModule = {
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
-              resolvePatterns: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve pattern references in the composition"
-              },
-              resolveOverrides: {
-                type: "boolean",
-                default: false,
-                describe: "Resolves pattern overrides in the composition and removes override definition data"
-              },
-              componentIDs: {
-                type: "boolean",
-                default: false,
-                describe: "Include individual component UIDs"
-              },
-              resolveData: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve all data resources used by the composition/pattern"
-              },
-              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"
-              }
-            })
+            withVerboseOption(
+              yargs36.positional("id", {
+                demandOption: true,
+                describe: "Composition/pattern public ID to fetch"
+              }).option({
+                resolvePatterns: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve pattern references in the composition"
+                },
+                resolveOverrides: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolves pattern overrides in the composition and removes override definition data"
+                },
+                componentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include individual component UIDs"
+                },
+                resolveData: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve all data resources used by the composition/pattern"
+                },
+                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"
+                }
+              })
+            )
           )
         )
       )
@@ -1800,22 +1810,25 @@ var CompositionGetModule = {
     componentIDs,
     resolveData,
     diagnostics,
-    resolutionDepth
+    resolutionDepth,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const parameters = {
+      compositionId: id,
+      state: convertStateOption(state),
+      skipPatternResolution: !resolvePatterns,
+      skipOverridesResolution: !resolveOverrides,
+      withComponentIDs: componentIDs,
+      skipDataResolution: !resolveData,
+      diagnostics: resolveData ? diagnostics : void 0,
+      resolutionDepth: resolveData ? resolutionDepth : void 0
+    };
+    if (verbose) {
+      console.log(`\u{1F41B} get composition:`, parameters);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient7({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
-    const res = prepCompositionForDisk(
-      await client.getCompositionById({
-        compositionId: id,
-        state: convertStateOption(state),
-        skipPatternResolution: !resolvePatterns,
-        skipOverridesResolution: !resolveOverrides,
-        withComponentIDs: componentIDs,
-        skipDataResolution: !resolveData,
-        diagnostics: resolveData ? diagnostics : void 0,
-        resolutionDepth: resolveData ? resolutionDepth : void 0
-      })
-    );
+    const res = prepCompositionForDisk(await client.getCompositionById(parameters));
     emitWithFormat(res, format, filename);
   }
 };
@@ -1836,38 +1849,40 @@ var CompositionListModule = {
     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 },
-              search: { describe: "Search query", type: "string", default: "" },
-              resolvePatterns: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve pattern references in the composition"
-              },
-              resolveOverrides: {
-                type: "boolean",
-                default: false,
-                describe: "Resolves pattern overrides in the composition and removes override definition data"
-              },
-              onlyCompositions: {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              },
-              onlyPatterns: {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              },
-              componentIDs: {
-                type: "boolean",
-                default: false,
-                describe: "Include individual component UIDs"
-              }
-            })
+          withDebugOptions(
+            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 },
+                search: { describe: "Search query", type: "string", default: "" },
+                resolvePatterns: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve pattern references in the composition"
+                },
+                resolveOverrides: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolves pattern overrides in the composition and removes override definition data"
+                },
+                onlyCompositions: {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                },
+                onlyPatterns: {
+                  describe: "Only pulling patterns and not compositions",
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                },
+                componentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include individual component UIDs"
+                }
+              })
+            )
           )
         )
       )
@@ -1889,11 +1904,10 @@ var CompositionListModule = {
     state,
     resolvePatterns,
     resolveOverrides,
-    componentIDs
+    componentIDs,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient8({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.getCompositionList({
+    const parameters = {
       limit,
       offset,
       search: search && search.length > 0 ? search : void 0,
@@ -1903,7 +1917,13 @@ var CompositionListModule = {
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
       skipOverridesResolution: !resolveOverrides
-    });
+    };
+    if (verbose) {
+      console.log(`\u{1F41B} list compositions:`, parameters);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
+    const client = new UncachedCanvasClient8({ apiKey, apiHost, fetch: fetch3, projectId });
+    const res = await client.getCompositionList();
     emitWithFormat(res.compositions, format, filename);
   }
 };
@@ -1984,23 +2004,30 @@ function createComponentInstanceEngineDataSource({
   onlyCompositions,
   onlyPatterns,
   patternType,
+  verbose,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
   async function* getObjects() {
     const componentInstances = paginateAsync(
-      async (offset, limit) => (await client.getCompositionList({
-        ...clientOptions,
-        limit,
-        offset,
-        pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
-        state: stateId,
-        skipPatternResolution: true,
-        skipOverridesResolution: true,
-        withComponentIDs: true,
-        patternType,
-        editions: "all"
-      })).compositions,
+      async (offset, limit) => {
+        const parameters = {
+          ...clientOptions,
+          limit,
+          offset,
+          pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
+          state: stateId,
+          skipPatternResolution: true,
+          skipOverridesResolution: true,
+          withComponentIDs: true,
+          patternType,
+          editions: "all"
+        };
+        if (verbose) {
+          console.log(`\u{1F41B} pull compositions: `, parameters);
+        }
+        return (await client.getCompositionList(parameters)).compositions;
+      },
       { pageSize: 100 }
     );
     for await (const compositionListItem of componentInstances) {
@@ -2017,9 +2044,15 @@ function createComponentInstanceEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
+      if (verbose) {
+        console.log(`\u{1F41B} delete composition: (id: ${parseCompositionSerializedId(providerId)})`);
+      }
       await client.removeComposition(parseCompositionSerializedId(providerId));
     },
     writeObject: async (object) => {
+      if (verbose) {
+        console.log(`\u{1F41B} push composition: (id: ${object.object.composition._id})`);
+      }
       await client.updateComposition({ ...object.object, state: stateId });
     }
   };
@@ -2032,30 +2065,27 @@ var CompositionPublishModule = {
   builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs36.positional("ids", {
-            describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-            type: "string"
-          }).option("all", {
-            alias: ["a"],
-            describe: "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
-          })
+        withDebugOptions(
+          withDiffOptions(
+            yargs36.positional("ids", {
+              describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all compositions. Use compositionId to publish one instead.",
+              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
+            })
+          )
         )
       )
     )
@@ -2070,14 +2100,15 @@ var CompositionPublishModule = {
     project: projectId,
     onlyCompositions,
     onlyPatterns,
-    patternType
+    patternType,
+    verbose
   }) => {
     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 fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient9({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
@@ -2085,7 +2116,8 @@ var CompositionPublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -2093,7 +2125,8 @@ var CompositionPublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     await syncEngine({
       source,
@@ -2101,6 +2134,7 @@ var CompositionPublishModule = {
       // Publishing is one-direction operation, so no need to support automatic un-publishing
       mode: "createOrUpdate",
       whatIf,
+      verbose,
       log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
     });
   }
@@ -2162,37 +2196,34 @@ var CompositionPullModule = {
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          withDiffOptions(
-            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", {
-              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("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"
-            })
+          withDebugOptions(
+            withDiffOptions(
+              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", {
+                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"
+              })
+            )
           )
         )
       )
@@ -2212,9 +2243,10 @@ var CompositionPullModule = {
     state,
     project: projectId,
     diff: diffMode,
-    allowEmptySource
+    allowEmptySource,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId });
     const fileClient = new UncachedFileClient3({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
@@ -2222,7 +2254,8 @@ var CompositionPullModule = {
       state,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const isPackage = isPathAPackageFile(directory);
     let target;
@@ -2326,31 +2359,28 @@ var CompositionPushModule = {
     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("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
-            })
+          withDebugOptions(
+            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("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
+              })
+            )
           )
         )
       )
@@ -2369,9 +2399,10 @@ var CompositionPushModule = {
     onlyPatterns,
     patternType,
     diff: diffMode,
-    allowEmptySource
+    allowEmptySource,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient11({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -2395,7 +2426,8 @@ var CompositionPushModule = {
       state,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const fileClient = new UncachedFileClient4({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
@@ -2403,6 +2435,7 @@ var CompositionPushModule = {
       target,
       mode,
       whatIf,
+      verbose,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -2469,13 +2502,21 @@ var CompositionRemoveModule = {
   describe: "Delete a composition",
   builder: (yargs36) => withConfiguration(
     withApiOptions(
-      withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+      withDebugOptions(
+        withProjectOptions(
+          yargs36.positional("id", {
+            demandOption: true,
+            describe: "Composition/pattern public ID to delete"
+          })
+        )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} remove composition: (id: ${id})`);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient12({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.removeComposition({ compositionId: id });
   }
@@ -2498,30 +2539,27 @@ var CompositionUnpublishModule = {
   describe: "Unpublish a composition(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 publishing compositions and not patterns",
-          default: false,
-          type: "boolean"
-        }).option("onlyPatterns", {
-          describe: "Only pulling patterns and not compositions",
-          default: false,
-          type: "boolean",
-          hidden: true
-        })
+      withDebugOptions(
+        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("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
+          })
+        )
       )
     )
   ),
@@ -2535,7 +2573,8 @@ var CompositionUnpublishModule = {
     onlyPatterns,
     patternType,
     project: projectId,
-    whatIf
+    whatIf,
+    verbose
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -2543,7 +2582,7 @@ var CompositionUnpublishModule = {
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient13({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
@@ -2551,7 +2590,8 @@ var CompositionUnpublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -2559,7 +2599,8 @@ var CompositionUnpublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const actions = [];
     const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
@@ -2577,6 +2618,7 @@ var CompositionUnpublishModule = {
         console.log(`Composition ${id} was not found`);
         return;
       }
+      console.log(`\u{1F41B} unpublishing composition: (id: ${id})`);
       actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
       log({
         action: "update",
@@ -2639,14 +2681,22 @@ var CompositionUpdateModule = {
   builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withStateOptions(
-          yargs36.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+        withVerboseOption(
+          withStateOptions(
+            yargs36.positional("filename", {
+              demandOption: true,
+              describe: "Composition/pattern file to put"
+            })
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, state }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, state, verbose }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} update composition: (filename: ${filename}, state: ${convertStateOption(state)})`);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient14({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.updateComposition({ ...file, state: convertStateOption(state) });
@@ -3730,7 +3780,7 @@ var EntryListModule = {
 import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
 
 // src/commands/canvas/entryEngineDataSource.ts
-import { convertEntryToPutEntry } from "@uniformdev/canvas";
+import { ApiClientError, convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => {
@@ -3761,18 +3811,27 @@ function createEntryEngineDataSource({
   const stateId = convertStateOption(state);
   async function* getObjects() {
     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,
-        editions: "all"
-      })).entries,
+      async (offset, limit) => {
+        try {
+          return (await client.getEntries({
+            offset,
+            limit,
+            entryIDs,
+            pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
+            skipDataResolution: true,
+            skipOverridesResolution: true,
+            skipPatternResolution: true,
+            state: stateId,
+            withComponentIDs: true,
+            editions: "all"
+          })).entries;
+        } catch (error) {
+          if (error instanceof ApiClientError && error.errorMessage === "Entry not found or not published") {
+            return [];
+          }
+          throw error;
+        }
+      },
       { pageSize: 100 }
     );
     for await (const e of entries) {
@@ -6212,7 +6271,7 @@ var EnrichmentModule = {
 import yargs19 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError2, UncachedManifestClient } from "@uniformdev/context/api";
 import { gray as gray2, green as green2, red as red3 } from "colorette";
 import { writeFile } from "fs";
 import { exit } from "process";
@@ -6263,7 +6322,7 @@ var ManifestGetModule = {
       }
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError) {
+      if (e instanceof ApiClientError2) {
         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.`;
         }
@@ -6279,7 +6338,7 @@ var ManifestGetModule = {
 };
 
 // src/commands/context/commands/manifest/publish.ts
-import { ApiClientError as ApiClientError2, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError3, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
 import { gray as gray3, red as red4 } from "colorette";
 import { exit as exit2 } from "process";
 var ManifestPublishModule = {
@@ -6298,7 +6357,7 @@ var ManifestPublishModule = {
       await client.publish();
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError2) {
+      if (e instanceof ApiClientError3) {
         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.`;
         }
@@ -7504,7 +7563,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.191.0",
+  version: "19.191.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9700,13 +9759,15 @@ var SyncPullModule = {
   builder: (yargs36) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs36.option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes no files",
-            default: false,
-            type: "boolean"
-          })
+        withDebugOptions(
+          withDiffOptions(
+            yargs36.option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes no files",
+              default: false,
+              type: "boolean"
+            })
+          )
         )
       )
     )
@@ -9807,20 +9868,7 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withDiffOptions(
-          yargs36.option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes nothing",
-            default: false,
-            type: "boolean"
-          })
-        )
-      )
-    )
-  ),
+  builder: (yargs36) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs36))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
@@ -10065,7 +10113,7 @@ var getMostRecent = async ({ full, scope }, distTag, timeout) => {
 var defaultConfig = {
   interval: 36e5,
   distTag: "latest",
-  timeout: 2e3
+  timeout: 5e3
 };
 var getDetails = (name) => {
   const spec = {
@@ -10096,6 +10144,13 @@ async function updateCheck_default(pkg, config2 = {}) {
   ({ shouldCheck, latest } = await evaluateCache(file, time, interval));
   if (shouldCheck) {
     latest = await getMostRecent(details, distTag, timeout);
+    if (config2.verbose) {
+      console.log("CLI package latest version check", {
+        latest,
+        current: pkg.version,
+        tempFileWithLastUpdateCheck: file
+      });
+    }
     await updateCache(file, latest, time);
   }
   const comparision = compareVersions(pkg.version, latest);
@@ -10109,19 +10164,19 @@ async function updateCheck_default(pkg, config2 = {}) {
 }
 
 // src/middleware/checkForUpdateMiddleware.ts
-async function checkForUpdateMiddleware() {
+var checkForUpdateMiddleware = async ({ verbose }) => {
   try {
     if (process.env.NO_UPDATE_CHECK || process.env.CI) {
       return;
     }
-    const update = await updateCheck_default(package_default);
+    const update = await updateCheck_default(package_default, { verbose });
     if (update) {
       logCallout(`${bold("Update Available:")} ${gray5(package_default.version)} \u226B ${green4(update.latest)}`);
     }
   } catch (e) {
     console.error(`There was an error checking for updates`, e);
   }
-}
+};
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red6 } from "colorette";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.191.0",
+  "version": "19.191.2-alpha.10+b6b6304391",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.191.0",
-    "@uniformdev/canvas": "19.191.0",
-    "@uniformdev/context": "19.191.0",
-    "@uniformdev/files": "19.191.0",
-    "@uniformdev/project-map": "19.191.0",
-    "@uniformdev/redirect": "19.191.0",
+    "@uniformdev/assets": "19.191.2-alpha.10+b6b6304391",
+    "@uniformdev/canvas": "19.191.2-alpha.10+b6b6304391",
+    "@uniformdev/context": "19.191.2-alpha.10+b6b6304391",
+    "@uniformdev/files": "19.191.2-alpha.10+b6b6304391",
+    "@uniformdev/project-map": "19.191.2-alpha.10+b6b6304391",
+    "@uniformdev/redirect": "19.191.2-alpha.10+b6b6304391",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5af19bc55804e29fda14eb6f0b4b7bd90be0610f"
+  "gitHead": "b6b6304391ba3bcf3032d6e137af9f1e5bf55819"
 }