@uniformdev/cli 19.137.1-alpha.4 → 19.137.1-alpha.5

package/dist/index.mjs

@@ -1023,15 +1023,15 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs33) {
+function withStateOptions(yargs33, defaultState = "preview") {
   return yargs33.option("state", {
     type: "string",
-    describe: `Composition state to fetch.`,
+    describe: `State to fetch.`,
     choices: ["preview", "published"],
-    default: "preview"
+    default: defaultState
   });
 }
-function convertCompositionState(state) {
+function convertStateOption(state) {
   const number = Number(state);
   if (!isNaN(number)) {
     return number;
@@ -2020,7 +2020,7 @@ var CompositionGetModule = {
     const res = prepCompositionForDisk(
       await client.getCompositionById({
         compositionId: id,
-        state: convertCompositionState(state),
+        state: convertStateOption(state),
         skipPatternResolution: !resolvePatterns,
         skipOverridesResolution: !resolveOverrides,
         withComponentIDs: componentIDs,
@@ -2106,7 +2106,7 @@ var CompositionListModule = {
       limit,
       offset,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
-      state: convertCompositionState(state),
+      state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
       skipOverridesResolution: !resolveOverrides
@@ -2173,7 +2173,7 @@ function createComponentInstanceEngineDataSource({
   onlyPatterns,
   ...clientOptions
 }) {
-  const stateId = convertCompositionState(state);
+  const stateId = convertStateOption(state);
   async function* getObjects() {
     const componentInstances = paginateAsync(
       async (offset, limit) => (await client.getCompositionList({
@@ -2792,7 +2792,7 @@ var CompositionUpdateModule = {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient14({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
-    await client.updateComposition({ ...file, state: convertCompositionState(state) });
+    await client.updateComposition({ ...file, state: convertStateOption(state) });
   }
 };
 
@@ -3502,19 +3502,34 @@ var EntryGetModule = {
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+          withStateOptions(
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            yargs33.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }),
+            // for backwards compatibility, we default to the "published" state, unlike compositions
+            "published"
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
+  handler: async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    id,
+    format,
+    filename,
+    project: projectId,
+    state
+  }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient7({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient7({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
       offset: 0,
       limit: 1,
       entryIDs: [id],
+      state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true
@@ -3531,13 +3546,26 @@ import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
-  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
+  builder: (yargs33) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            yargs33,
+            // for backwards compatibility, we default to the "published" state, unlike compositions
+            "published"
+          )
+        )
+      )
+    )
+  ),
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient8({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
       offset: 0,
       limit: 1e3,
+      state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true
@@ -3564,7 +3592,7 @@ function createEntryEngineDataSource({
   onlyPatterns,
   entryIDs
 }) {
-  const stateId = convertCompositionState(state);
+  const stateId = convertStateOption(state);
   async function* getObjects() {
     const entries = paginateAsync(
       async (offset, limit) => (await client.getEntries({
@@ -3627,14 +3655,14 @@ var EntryPublishModule = {
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, whatIf, project: projectId }) => {
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, ids, all, whatIf, project: projectId }) => {
     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 client = new ContentClient10({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -3717,7 +3745,7 @@ var EntryPullModule = {
       bypassCache: true
     });
     const fileClient = new UncachedFileClient5({ apiKey, apiHost, fetch: fetch3, projectId });
-    const source = createEntryEngineDataSource({ client, state });
+    const source = createEntryEngineDataSource({ client, state, onlyEntries: true });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -3829,7 +3857,7 @@ var EntryPushModule = {
         selectDisplayName: selectEntryDisplayName
       });
     }
-    const target = createEntryEngineDataSource({ client, state });
+    const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
     const fileClient = new UncachedFileClient6({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
@@ -3958,15 +3986,17 @@ var EntryUpdateModule = {
   builder: (yargs33) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Entry file to put" })
+        withStateOptions(
+          yargs33.positional("filename", { demandOption: true, describe: "Entry file to put" })
+        )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient15({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient15({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const file = readFileToObject(filename);
-    await client.upsertEntry(file);
+    await client.upsertEntry({ ...file, state: convertStateOption(state) });
   }
 };
 
@@ -3992,22 +4022,26 @@ var EntryPatternGetModule = {
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", {
-            demandOption: true,
-            describe: "Entry pattern public ID to fetch"
-          })
+          withStateOptions(
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            yargs33.positional("id", {
+              demandOption: true,
+              describe: "Entry pattern public ID to fetch"
+            }),
+            "published"
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId }) => {
+  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient16({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
       offset: 0,
       limit: 1,
       entryIDs: [id],
+      state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true,
@@ -4025,13 +4059,16 @@ import { ContentClient as ContentClient17 } from "@uniformdev/canvas";
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
-  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
+  builder: (yargs33) => withConfiguration(
+    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs33, "published"))))
+  ),
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient17({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient17({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
       offset: 0,
       limit: 1e3,
+      state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true,
@@ -4068,14 +4105,14 @@ var EntryPatternPublishModule = {
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, whatIf, project: projectId }) => {
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, ids, all, whatIf, project: projectId }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern 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 ContentClient18({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient18({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -4399,15 +4436,17 @@ var EntryPatternUpdateModule = {
   builder: (yargs33) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+        withStateOptions(
+          yargs33.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+        )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient23({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient23({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const file = readFileToObject(filename);
-    await client.upsertEntry(file);
+    await client.upsertEntry({ ...file, state: convertStateOption(state) });
   }
 };
 
@@ -8328,7 +8367,7 @@ var ProjectMapNodeListModule = {
   handler: async ({ apiHost, apiKey, proxy, projectMapId, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient8({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.getNodes({ projectMapId, state: convertCompositionState(state) });
+    const res = await client.getNodes({ projectMapId, state: convertStateOption(state) });
     emitWithFormat({ nodes: res.nodes ?? [], projectMapId }, format, filename);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.137.1-alpha.4+bdc62fd037",
+  "version": "19.137.1-alpha.5+fa91392efc",
   "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.137.1-alpha.4+bdc62fd037",
-    "@uniformdev/canvas": "19.137.1-alpha.4+bdc62fd037",
-    "@uniformdev/context": "19.137.1-alpha.4+bdc62fd037",
-    "@uniformdev/files": "19.137.1-alpha.4+bdc62fd037",
-    "@uniformdev/project-map": "19.137.1-alpha.4+bdc62fd037",
-    "@uniformdev/redirect": "19.137.1-alpha.4+bdc62fd037",
+    "@uniformdev/assets": "19.137.1-alpha.5+fa91392efc",
+    "@uniformdev/canvas": "19.137.1-alpha.5+fa91392efc",
+    "@uniformdev/context": "19.137.1-alpha.5+fa91392efc",
+    "@uniformdev/files": "19.137.1-alpha.5+fa91392efc",
+    "@uniformdev/project-map": "19.137.1-alpha.5+fa91392efc",
+    "@uniformdev/redirect": "19.137.1-alpha.5+fa91392efc",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bdc62fd0375ddb45642066f8a7c3f06c27ee469b"
+  "gitHead": "fa91392efc2406c097c600632f557ffdd6211eb2"
 }