@uniformdev/cli 19.49.1 → 19.50.2-alpha.11

package/dist/index.mjs

@@ -1203,7 +1203,10 @@ import yargs3 from "yargs";
 import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canvas";
 
 // src/commands/canvas/util.ts
-import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE } from "@uniformdev/canvas";
+import {
+  CANVAS_DRAFT_STATE,
+  CANVAS_PUBLISHED_STATE
+} from "@uniformdev/canvas";
 function prepCompositionForDisk(composition) {
   const prepped = {
     ...composition
@@ -2658,7 +2661,10 @@ var EntryListModule = {
 };
 
 // src/commands/canvas/commands/entry/pull.ts
-import { ContentClient as ContentClient9 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
+
+// src/commands/canvas/entryEngineDataSource.ts
+import { convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => e.entry._id;
@@ -2666,16 +2672,18 @@ var selectEntryDisplayName = (e) => `${e.entry._name ?? "Untitled"} (pid: ${e.en
 
 // src/commands/canvas/entryEngineDataSource.ts
 function createEntryEngineDataSource({
-  client
+  client,
+  state
 }) {
+  const stateId = convertCompositionState(state);
   async function* getObjects() {
-    const { entries } = await client.getEntries({ offset: 0, limit: 1e3 });
+    const { entries } = await client.getEntries({ offset: 0, limit: 1e3, skipDataResolution: true });
     for await (const e of entries) {
       const result = {
         id: selectEntryIdentifier(e),
         displayName: selectEntryDisplayName(e),
         providerId: e.entry._id,
-        object: e
+        object: prepCompositionForDisk(e)
       };
       yield result;
     }
@@ -2686,7 +2694,7 @@ function createEntryEngineDataSource({
       await client.deleteEntry({ entryId: providerId });
     },
     writeObject: async ({ object }) => {
-      await client.upsertEntry(object);
+      await client.upsertEntry({ ...convertEntryToPutEntry(object), state: stateId });
     }
   };
 }
@@ -2698,28 +2706,30 @@ var EntryPullModule = {
   builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs25.positional("directory", {
-            describe: "Directory to save the entries 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("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"
-          })
+        withStateOptions(
+          withDiffOptions(
+            yargs25.positional("directory", {
+              describe: "Directory to save the entries 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("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"
+            })
+          )
         )
       )
     )
@@ -2732,18 +2742,19 @@ var EntryPullModule = {
     format,
     mode,
     whatIf,
+    state,
     project: projectId,
     diff: diffMode
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient9({
+    const client = new ContentClient10({
       apiKey,
       apiHost,
       fetch: fetch3,
       projectId,
       bypassCache: true
     });
-    const source = createEntryEngineDataSource({ client });
+    const source = createEntryEngineDataSource({ client, state });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -2776,29 +2787,31 @@ var EntryPullModule = {
 };
 
 // src/commands/canvas/commands/entry/push.ts
-import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
   builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs25.positional("directory", {
-            describe: "Directory to read the entries 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"
-          })
+        withStateOptions(
+          withDiffOptions(
+            yargs25.positional("directory", {
+              describe: "Directory to read the entries 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"
+            })
+          )
         )
       )
     )
@@ -2810,11 +2823,12 @@ var EntryPushModule = {
     directory,
     mode,
     whatIf,
+    state,
     project: projectId,
     diff: diffMode
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient10({
+    const client = new ContentClient11({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -2837,7 +2851,7 @@ var EntryPushModule = {
         selectDisplayName: selectEntryDisplayName
       });
     }
-    const target = createEntryEngineDataSource({ client });
+    const target = createEntryEngineDataSource({ client, state });
     await syncEngine({
       source,
       target,
@@ -2849,7 +2863,7 @@ var EntryPushModule = {
 };
 
 // src/commands/canvas/commands/entry/remove.ts
-import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
 var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -2863,13 +2877,13 @@ var EntryRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient11({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     await client.deleteEntry({ entryId: id });
   }
 };
 
 // src/commands/canvas/commands/entry/update.ts
-import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
 var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -2883,7 +2897,7 @@ var EntryUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, 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 });
     const file = readFileToObject(filename);
     await client.upsertEntry(file);
   }
@@ -4745,7 +4759,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.49.1",
+  version: "19.50.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -4782,7 +4796,7 @@ var package_default = {
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
-    jsonwebtoken: "9.0.1",
+    jsonwebtoken: "9.0.2",
     "lodash.isequalwith": "^4.4.0",
     open: "9.1.0",
     ora: "6.3.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.49.1",
+  "version": "19.50.2-alpha.11+3ffe35383",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/canvas": "19.49.1",
-    "@uniformdev/context": "19.49.1",
-    "@uniformdev/files": "19.49.1",
-    "@uniformdev/project-map": "19.49.1",
-    "@uniformdev/redirect": "19.49.1",
+    "@uniformdev/canvas": "19.50.2-alpha.11+3ffe35383",
+    "@uniformdev/context": "19.50.2-alpha.11+3ffe35383",
+    "@uniformdev/files": "19.50.2-alpha.11+3ffe35383",
+    "@uniformdev/project-map": "19.50.2-alpha.11+3ffe35383",
+    "@uniformdev/redirect": "19.50.2-alpha.11+3ffe35383",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -37,7 +37,7 @@
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "9.0.1",
+    "jsonwebtoken": "9.0.2",
     "lodash.isequalwith": "^4.4.0",
     "open": "9.1.0",
     "ora": "6.3.1",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a14b97601fb78b44be7f0849841b9828dec0ea96"
+  "gitHead": "3ffe35383d936fe485db7afd0506f4ea40386926"
 }