@uniformdev/cli 19.45.2-alpha.7 → 19.46.1-alpha.8

package/dist/index.mjs

@@ -1519,7 +1519,7 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
       fileDownloadQueue.add(async () => {
         try {
           const fetchUrl = `${url.origin}${url.pathname}?format=original`;
-          const fileName = urlToFileName(fetchUrl);
+          const fileName = urlToFileName(url.toString());
           const fileAlreadyExists = await fsj.existsAsync(
             join2(options.directory, FILES_DIRECTORY_NAME, fileName)
           );
@@ -2013,11 +2013,13 @@ import { ContentClient } from "@uniformdev/canvas";
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs25) => withFormatOptions(
-    withApiOptions(
-      withProjectOptions(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yargs25.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+  builder: (yargs25) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          yargs25.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+        )
       )
     )
   ),
@@ -2038,7 +2040,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs25) => withFormatOptions(withApiOptions(withProjectOptions(yargs25))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2085,30 +2087,32 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(
-      withDiffOptions(
-        yargs25.positional("directory", {
-          describe: "Directory to save the content types 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"
-        })
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs25.positional("directory", {
+            describe: "Directory to save the content types 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"
+          })
+        )
       )
     )
   ),
@@ -2168,24 +2172,26 @@ import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(
-      withDiffOptions(
-        yargs25.positional("directory", {
-          describe: "Directory to read the content types 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"
-        })
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs25.positional("directory", {
+            describe: "Directory to read the content types 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"
+          })
+        )
       )
     )
   ),
@@ -2240,9 +2246,11 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(
-      yargs25.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs25.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+      )
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -2258,9 +2266,11 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(
-      yargs25.positional("filename", { demandOption: true, describe: "Content type file to put" })
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs25.positional("filename", { demandOption: true, describe: "Content type file to put" })
+      )
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -2581,11 +2591,13 @@ import { ContentClient as ContentClient7 } from "@uniformdev/canvas";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs25) => withFormatOptions(
-    withApiOptions(
-      withProjectOptions(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yargs25.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+  builder: (yargs25) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          yargs25.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+        )
       )
     )
   ),
@@ -2605,7 +2617,7 @@ import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs25) => withFormatOptions(withApiOptions(withProjectOptions(yargs25))),
+  builder: (yargs25) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs25)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2652,30 +2664,32 @@ function createEntryEngineDataSource({
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs25) => 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"
-        })
+  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"
+          })
+        )
       )
     )
   ),
@@ -2735,24 +2749,26 @@ import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs25) => 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"
-        })
+  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"
+          })
+        )
       )
     )
   ),
@@ -2807,9 +2823,11 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(
-      yargs25.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs25.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+      )
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -2825,8 +2843,12 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs25) => withApiOptions(
-    withProjectOptions(yargs25.positional("filename", { demandOption: true, describe: "Entry file to put" }))
+  builder: (yargs25) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs25.positional("filename", { demandOption: true, describe: "Entry file to put" })
+      )
+    )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -4692,7 +4714,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.45.1",
+  version: "19.46.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -4721,7 +4743,7 @@ var package_default = {
     dotenv: "^16.0.3",
     execa: "5.1.1",
     "fs-jetpack": "5.1.0",
-    graphql: "16.7.1",
+    graphql: "16.8.0",
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
     "image-size": "^1.0.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.45.2-alpha.7+9afef6594",
+  "version": "19.46.1-alpha.8+a2d89f62e",
   "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.45.2-alpha.7+9afef6594",
-    "@uniformdev/context": "19.45.2-alpha.7+9afef6594",
-    "@uniformdev/files": "19.45.2-alpha.7+9afef6594",
-    "@uniformdev/project-map": "19.45.2-alpha.7+9afef6594",
-    "@uniformdev/redirect": "19.45.2-alpha.7+9afef6594",
+    "@uniformdev/canvas": "19.46.1-alpha.8+a2d89f62e",
+    "@uniformdev/context": "19.46.1-alpha.8+a2d89f62e",
+    "@uniformdev/files": "19.46.1-alpha.8+a2d89f62e",
+    "@uniformdev/project-map": "19.46.1-alpha.8+a2d89f62e",
+    "@uniformdev/redirect": "19.46.1-alpha.8+a2d89f62e",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -29,7 +29,7 @@
     "dotenv": "^16.0.3",
     "execa": "5.1.1",
     "fs-jetpack": "5.1.0",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
     "image-size": "^1.0.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9afef6594b505ff451ade8bdd5a2d29e8e0e586c"
+  "gitHead": "a2d89f62ed00cf0c7eaa8d557ad6a9f218215213"
 }