@uniformdev/cli 20.74.6-alpha.2 → 20.74.6-alpha.5

package/dist/{chunk-TPAFG3LW.mjs → chunk-RXRK6OF5.mjs}

@@ -21,7 +21,7 @@ import { dirname, extname, isAbsolute, resolve, sep } from "path";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.74.5",
+  version: "20.75.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -49,6 +49,7 @@ var package_default = {
     "@inquirer/prompts": "^8.5.2",
     "@thi.ng/mime": "^2.2.23",
     "@uniformdev/assets": "workspace:*",
+    "@uniformdev/automations-sdk": "workspace:*",
     "@uniformdev/canvas": "workspace:*",
     "@uniformdev/context": "workspace:*",
     "@uniformdev/files": "workspace:*",
@@ -65,8 +66,6 @@ var package_default = {
     execa: "5.1.1",
     "file-type": "^22.0.1",
     "fs-jetpack": "5.1.0",
-    graphql: "17.0.1",
-    "graphql-request": "7.4.0",
     "image-size": "2.0.2",
     "isomorphic-git": "1.38.5",
     "js-yaml": "^4.2.0",
@@ -161,12 +160,20 @@ function withConfiguration(yargs) {
     hidden: true
   });
 }
-function withApiOptions(yargs) {
-  return yargs.option("apiKey", {
+function maskApiKey(apiKey) {
+  const separatorIndex = apiKey.indexOf("1");
+  const prefix = separatorIndex > 0 ? apiKey.slice(0, separatorIndex) : apiKey.slice(0, 3);
+  return `${prefix}...${apiKey.slice(-4)}`;
+}
+function withApiOptions(yargs, { includeEdgeApiHost = false } = {}) {
+  const resolvedApiKey = process.env.UNIFORM_CLI_API_KEY ?? // deprecated
+  process.env.CANVAS_CLI_API_KEY ?? // deprecated
+  process.env.UPM_CLI_API_KEY ?? process.env.UNIFORM_API_KEY;
+  let result = yargs.option("apiKey", {
     describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_API_KEY ?? // deprecated
-    process.env.CANVAS_CLI_API_KEY ?? // deprecated
-    process.env.UPM_CLI_API_KEY ?? process.env.UNIFORM_API_KEY,
+    default: resolvedApiKey,
+    // Mask the resolved key in --help output so the secret is never printed verbatim.
+    defaultDescription: resolvedApiKey ? maskApiKey(resolvedApiKey) : void 0,
     demandOption: true,
     type: "string"
   }).option("apiHost", {
@@ -174,12 +181,16 @@ function withApiOptions(yargs) {
     default: process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app",
     demandOption: true,
     type: "string"
-  }).option("edgeApiHost", {
-    describe: "Uniform edge host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env var or https://uniform.global. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_BASE_EDGE_URL || "https://uniform.global",
-    demandOption: true,
-    type: "string"
-  }).option("proxy", {
+  });
+  if (includeEdgeApiHost) {
+    result = result.option("edgeApiHost", {
+      describe: "Uniform edge host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env var or https://uniform.global. Supports dotenv.",
+      default: process.env.UNIFORM_CLI_BASE_EDGE_URL || "https://uniform.global",
+      demandOption: true,
+      type: "string"
+    });
+  }
+  return result.option("proxy", {
     describe: "HTTPS proxy to use for Uniform API calls. Defaults to HTTPS_PROXY, https_proxy, ALL_PROXY, or all_proxy env vars (in that order). Supports dotenv.",
     default: process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy,
     type: "string"
@@ -282,6 +293,16 @@ ${e.message}`;
   }
   return wrappedFetch;
 }
+function exitOnCliError(error) {
+  if (error instanceof ApiClientError) {
+    console.error(error.message);
+  } else if (error instanceof Error) {
+    console.error(error.message);
+  } else {
+    console.error(String(error));
+  }
+  process.exit(1);
+}
 function withProjectOptions(yargs) {
   return yargs.option("project", {
     describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
@@ -388,23 +409,41 @@ function readFileToObject(filename) {
   const file = readFileSync(filename, "utf8");
   return load(file, { filename, json: true });
 }
+var ENTITY_ID_CHUNK_SIZE = 100;
+function* chunkEntityIds(ids, chunkSize = ENTITY_ID_CHUNK_SIZE) {
+  if (!ids) {
+    yield void 0;
+    return;
+  }
+  for (let index = 0; index < ids.length; index += chunkSize) {
+    yield ids.slice(index, index + chunkSize);
+  }
+}
 async function* paginateAsync(fetchPage, options) {
   const pageSize = options.pageSize ?? 100;
   if (pageSize < 1) {
     throw new Error(`pageSize must be at least 1, got ${pageSize}`);
   }
+  const { maxItems } = options;
   let offset = 0;
+  let yielded = 0;
+  let limit = pageSize;
   let pageData = [];
   do {
+    limit = maxItems === void 0 ? pageSize : Math.min(pageSize, maxItems - yielded);
+    if (limit < 1) {
+      return;
+    }
     if (options.verbose) {
-      console.log(`Fetching ${options.entityName ?? "items"} batch: offset=${offset}, pageSize=${pageSize}`);
+      console.log(`Fetching ${options.entityName ?? "items"} batch: offset=${offset}, pageSize=${limit}`);
     }
-    pageData = await fetchPage(offset, pageSize);
+    pageData = await fetchPage(offset, limit);
     for (const item of pageData) {
       yield item;
     }
-    offset += pageSize;
-  } while (pageData.length === pageSize);
+    yielded += pageData.length;
+    offset += limit;
+  } while (pageData.length === limit);
 }
 var entityBatchSizeDefaults = {
   composition: 100,
@@ -440,6 +479,21 @@ function getEntityBatchSize(entityType, config) {
   }
   return entityBatchSizeDefaults[entityType];
 }
+function getPublishScope(entityType, config) {
+  const publish = config.entitiesConfig?.[entityType]?.publish;
+  if (!publish) {
+    return void 0;
+  }
+  if (publish === true || publish === "all") {
+    return "all";
+  }
+  if (publish === "pushed") {
+    return "pushed";
+  }
+  throw new Error(
+    `Invalid publish option '${publish}' for ${entityType}. Expected true, false, 'all', or 'pushed'.`
+  );
+}
 function resolveEntityBatchSize({
   entityType,
   cliBatchSize,
@@ -539,9 +593,11 @@ export {
   package_default,
   CLI_USER_AGENT,
   withConfiguration,
+  maskApiKey,
   withApiOptions,
   withDebugOptions,
   nodeFetchProxy,
+  exitOnCliError,
   withProjectOptions,
   withTeamOptions,
   withFormatOptions,
@@ -549,9 +605,11 @@ export {
   isPathAPackageFile,
   emitWithFormat,
   readFileToObject,
+  chunkEntityIds,
   paginateAsync,
   isPaginatedSyncEntity,
   getEntityBatchSize,
+  getPublishScope,
   withBatchSizeOptions,
   applyDefaultSyncConfiguration,
   getEntityOption,

package/dist/defaultConfig.d.mts

@@ -1,4 +1,4 @@
-import { C as CLIConfiguration, E as EntityTypes } from './index-DeoTNXj-.mjs';
+import { C as CLIConfiguration, E as EntityTypes } from './index-FdhH3tn0.mjs';
 
 type UniformConfigAllOptions = {
     /**

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-TPAFG3LW.mjs";
+import "./chunk-RXRK6OF5.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {
@@ -11,11 +11,11 @@ var allSerializableEntitiesConfig = {
   projectMapDefinition: {},
   projectMapNode: {},
   contentType: {},
-  composition: { publish: true },
-  entry: { publish: true },
-  entryPattern: { publish: true },
-  componentPattern: { publish: true },
-  compositionPattern: { publish: true },
+  composition: { publish: "all" },
+  entry: { publish: "all" },
+  entryPattern: { publish: "all" },
+  componentPattern: { publish: "all" },
+  compositionPattern: { publish: "all" },
   asset: {},
   workflow: {},
   webhook: {},

package/dist/{index-DeoTNXj-.d.mts → index-FdhH3tn0.d.mts}

@@ -13,8 +13,21 @@ type EntityConfiguration = {
     disabled?: true;
 };
 type EntityWithStateConfiguration = EntityConfiguration & Partial<StateArgs>;
+/**
+ * What a push should publish once it has written its entities to preview.
+ *
+ * - `all`: publish every entity of this type in the project that has unpublished changes, whether or
+ *   not it came from the push source. This is what `publish: true` has always done.
+ * - `pushed`: publish only the entities this run actually created or updated. This is narrower than
+ *   "everything in the push source": an entity whose preview copy already matches the source is not
+ *   written, so it is not published either. A run that changes nothing therefore publishes nothing,
+ *   which also means a failed publish is not retried by re-running an unchanged push. Use `all` when
+ *   the publish set needs to converge on its own.
+ */
+type PublishScope = 'all' | 'pushed';
 type PublishableEntitiesConfiguration = EntityWithStateConfiguration & {
-    publish?: boolean;
+    /** `true` is an alias for `'all'`, kept for backwards compatibility. */
+    publish?: boolean | PublishScope;
     batchSize?: number;
 };
 type SerializationEntitiesConfiguration = Record<EntityTypes, {

package/dist/index.d.mts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export { C as CLIConfiguration } from './index-DeoTNXj-.mjs';
+export { C as CLIConfiguration } from './index-FdhH3tn0.mjs';