@uniformdev/cli 19.182.0 → 19.183.1-alpha.4

package/dist/index.mjs

@@ -244,24 +244,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 +284,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 +312,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) {
@@ -3715,7 +3718,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) => e.entry._id;
@@ -3732,17 +3735,26 @@ 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
-      })).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
+          })).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) {
@@ -6182,7 +6194,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";
@@ -6233,7 +6245,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.`;
         }
@@ -6249,7 +6261,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 = {
@@ -6268,7 +6280,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.`;
         }
@@ -7474,7 +7486,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.182.0",
+  version: "19.183.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -10035,7 +10047,7 @@ var getMostRecent = async ({ full, scope }, distTag, timeout) => {
 var defaultConfig = {
   interval: 36e5,
   distTag: "latest",
-  timeout: 2e3
+  timeout: 5e3
 };
 var getDetails = (name) => {
   const spec = {
@@ -10066,6 +10078,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);
@@ -10079,19 +10098,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.182.0",
+  "version": "19.183.1-alpha.4+0bd2420d3e",
   "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.182.0",
-    "@uniformdev/canvas": "19.182.0",
-    "@uniformdev/context": "19.182.0",
-    "@uniformdev/files": "19.182.0",
-    "@uniformdev/project-map": "19.182.0",
-    "@uniformdev/redirect": "19.182.0",
+    "@uniformdev/assets": "19.183.1-alpha.4+0bd2420d3e",
+    "@uniformdev/canvas": "19.183.1-alpha.4+0bd2420d3e",
+    "@uniformdev/context": "19.183.1-alpha.4+0bd2420d3e",
+    "@uniformdev/files": "19.183.1-alpha.4+0bd2420d3e",
+    "@uniformdev/project-map": "19.183.1-alpha.4+0bd2420d3e",
+    "@uniformdev/redirect": "19.183.1-alpha.4+0bd2420d3e",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "138d94ac9eff7221b6357095578380edf30cdb27"
+  "gitHead": "0bd2420d3eece2bc4092b180bb723fc1f3a47c83"
 }