@uniformdev/cli 18.18.1-alpha.12 → 18.19.1-alpha.7

package/dist/index.mjs

@@ -1,31 +1,35 @@
 #!/usr/bin/env node
-import {
-  __privateAdd,
-  __privateGet,
-  __privateSet,
-  __privateWrapper,
-  __require,
-  __toESM,
-  createArraySyncEngineDataSource,
-  createFileSyncEngineDataSource,
-  createSyncEngineConsoleLogger,
-  emitWithFormat,
-  isPathAPackageFile,
-  nodeFetchProxy,
-  paginateAsync,
-  readFileToObject,
-  readUniformPackage,
-  require_source,
-  syncEngine,
-  withApiOptions,
-  withDiffOptions,
-  withFormatOptions,
-  withProjectOptions,
-  writeUniformPackage
-} from "./chunk-NNLVNLDW.mjs";
+var __accessCheck = (obj, member, msg) => {
+  if (!member.has(obj))
+    throw TypeError("Cannot " + msg);
+};
+var __privateGet = (obj, member, getter) => {
+  __accessCheck(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
+var __privateAdd = (obj, member, value) => {
+  if (member.has(obj))
+    throw TypeError("Cannot add the same private member more than once");
+  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+};
+var __privateSet = (obj, member, value, setter) => {
+  __accessCheck(obj, member, "write to private field");
+  setter ? setter.call(obj, value) : member.set(obj, value);
+  return value;
+};
+var __privateWrapper = (obj, member, setter, getter) => ({
+  set _(value) {
+    __privateSet(obj, member, value, setter);
+  },
+  get _() {
+    return __privateGet(obj, member, getter);
+  }
+});
 
 // src/index.ts
+import * as dotenv from "dotenv";
 import yargs17 from "yargs";
+import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
 import yargs4 from "yargs";
@@ -35,6 +39,408 @@ import yargs from "yargs";
 
 // src/commands/canvas/commands/component/get.ts
 import { UncachedCanvasClient } from "@uniformdev/canvas";
+
+// src/sync/arraySyncEngineDataSource.ts
+async function createArraySyncEngineDataSource({
+  objects,
+  selectIdentifier: selectIdentifier11,
+  selectDisplayName: selectDisplayName11 = selectIdentifier11,
+  onSyncComplete
+}) {
+  const objectIndex = objects.reduce((result, current) => {
+    const identifier = selectIdentifier11(current);
+    if (result[identifier]) {
+      throw new Error(`Identifier ${identifier} was not unique.`);
+    }
+    result[identifier] = {
+      id: identifier,
+      object: current,
+      providerId: identifier,
+      displayName: selectDisplayName11(current)
+    };
+    return result;
+  }, {});
+  async function* getObjects() {
+    for (const item of Object.values(objectIndex)) {
+      yield item;
+    }
+  }
+  function extractCurrent() {
+    return Object.entries(objectIndex).sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
+  }
+  return {
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      delete objectIndex[providerId];
+    },
+    writeObject: async (objectToWrite) => {
+      const id = selectIdentifier11(objectToWrite.object);
+      objectIndex[id] = objectToWrite;
+    },
+    extractCurrent,
+    onSyncComplete: onSyncComplete ? (isTarget) => onSyncComplete(isTarget, extractCurrent()) : void 0
+  };
+}
+
+// src/sync/fileSyncEngineDataSource.ts
+import chalk from "chalk";
+import { existsSync, mkdirSync } from "fs";
+import { readdir, unlink } from "fs/promises";
+import { extname as extname2, join } from "path";
+
+// src/sync/util.ts
+import { readFileSync, writeFileSync } from "fs";
+import httpsProxyAgent from "https-proxy-agent";
+import unfetch from "isomorphic-unfetch";
+import { dump, load } from "js-yaml";
+import { extname } from "path";
+function withApiOptions(yargs18) {
+  return yargs18.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,
+    demandOption: true,
+    type: "string"
+  }).option("apiHost", {
+    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var or https://uniform.app. Supports dotenv.",
+    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", {
+    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"
+  });
+}
+function nodeFetchProxy(proxy) {
+  if (proxy) {
+    console.log(`\u{1F991} Using proxy ${proxy}`);
+  }
+  const wrappedFetch = (input, init) => {
+    if (proxy) {
+      const wrappedInit = {
+        ...init,
+        agent: new httpsProxyAgent.HttpsProxyAgent(proxy)
+      };
+      return unfetch(input, wrappedInit);
+    }
+    return unfetch(input, init);
+  };
+  return wrappedFetch;
+}
+function withProjectOptions(yargs18) {
+  return yargs18.option("project", {
+    describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
+    default: process.env.UNIFORM_CLI_PROJECT_ID ?? // deprecated
+    process.env.CANVAS_CLI_PROJECT_ID ?? // deprecated
+    process.env.UPM_CLI_PROJECT_ID ?? process.env.UNIFORM_PROJECT_ID,
+    demandOption: true,
+    type: "string",
+    alias: ["p"]
+  });
+}
+function withFormatOptions(yargs18) {
+  return yargs18.option("format", {
+    alias: ["f"],
+    describe: "Output format",
+    default: "yaml",
+    choices: ["yaml", "json"],
+    type: "string"
+  }).option("filename", {
+    alias: ["o"],
+    describe: "Output filename. If not specified, write to stdout.",
+    type: "string"
+  });
+}
+function withDiffOptions(yargs18) {
+  return yargs18.option("diff", {
+    describe: "Whether to show diffs in stdout. off = no diffs; update = on for updates; on = updates, creates, deletes. Can be set by UNIFORM_CLI_DIFF_MODE environment variable.",
+    default: process.env.UNIFORM_CLI_DIFF_MODE ?? "off",
+    type: "string",
+    choices: ["off", "update", "on"],
+    alias: ["d"]
+  });
+}
+function isPathAPackageFile(path4) {
+  const extension = extname(path4);
+  return extension === ".yaml" || extension === ".yml" || extension === ".json";
+}
+function emitWithFormat(object, format, filename) {
+  let content;
+  if (filename && !format) {
+    const extension = extname(filename);
+    if (extension === ".yaml" || extension === ".yml") {
+      format = "yaml";
+    } else if (extension === ".json") {
+      format = "json";
+    }
+  } else if (!format) {
+    throw new Error("Format must be specified when no filename is passed");
+  }
+  switch (format) {
+    case "json":
+      content = JSON.stringify(object, null, 2);
+      break;
+    case "yaml":
+      content = dump(object);
+      break;
+    default:
+      throw new Error(`Unsupported format: ${format}`);
+  }
+  if (filename) {
+    writeFileSync(filename, content, "utf8");
+  } else {
+    console.log(content);
+  }
+}
+function readFileToObject(filename) {
+  const file = readFileSync(filename, "utf8");
+  return load(file, { filename, json: true });
+}
+async function* paginateAsync(fetchPage, options) {
+  const perPage = options.pageSize || 100;
+  let offset = 0;
+  let pageData = [];
+  do {
+    pageData = await fetchPage(offset, perPage);
+    for (const item of pageData) {
+      yield item;
+    }
+    offset += perPage;
+  } while (pageData.length === perPage);
+}
+
+// src/sync/fileSyncEngineDataSource.ts
+async function createFileSyncEngineDataSource({
+  directory,
+  format = "yaml",
+  selectIdentifier: selectIdentifier11,
+  selectDisplayName: selectDisplayName11 = selectIdentifier11,
+  selectFilename: selectFilename2
+}) {
+  const dirExists = existsSync(directory);
+  if (!dirExists) {
+    mkdirSync(directory, { recursive: true });
+  }
+  const rawFilenames = await readdir(directory, "utf-8");
+  const filenames = new Set(
+    rawFilenames.filter((filename) => {
+      const ext = extname2(filename);
+      return ext === `.json` || ext === `.yaml` || ext === `.yml`;
+    })
+  );
+  const getFullFilename = (id) => join(directory, `${id}.${format}`);
+  async function* getObjects() {
+    for (const filename of filenames) {
+      const fullFilename = join(directory, filename);
+      try {
+        const contents = await readFileToObject(fullFilename);
+        const object = {
+          id: selectIdentifier11(contents),
+          displayName: selectDisplayName11(contents),
+          providerId: fullFilename,
+          object: contents
+        };
+        yield object;
+      } catch (e) {
+        console.error(chalk.red(`Failed to read ${fullFilename}, data is likely invalid.
+${e == null ? void 0 : e.message}`));
+        throw e;
+      }
+    }
+  }
+  return {
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await unlink(providerId);
+    },
+    writeObject: async (object) => {
+      if (selectFilename2) {
+        emitWithFormat(object.object, format, join(directory, `${selectFilename2(object.object)}.${format}`));
+      } else {
+        emitWithFormat(object.object, format, getFullFilename(object.id));
+      }
+    }
+  };
+}
+
+// src/sync/package.ts
+import fs from "fs";
+function readUniformPackage(filename, assertExists) {
+  if (!assertExists && !fs.existsSync(filename)) {
+    return {};
+  }
+  const packageContents = readFileToObject(filename);
+  if (typeof packageContents !== "object") {
+    throw new Error(`Package ${filename} does not appear valid.`);
+  }
+  return packageContents;
+}
+function writeUniformPackage(filename, packageContents) {
+  emitWithFormat(packageContents, void 0, filename);
+}
+
+// src/sync/syncEngine.ts
+import { diffJson, diffLines } from "diff";
+import isEqualWith from "lodash.isequalwith";
+async function syncEngine({
+  source,
+  target,
+  compareContents = (source2, target2) => {
+    return isEqualWith(
+      source2.object,
+      target2.object,
+      (_a, _b, key) => key === "created" || key === "modified" ? true : void 0
+    );
+  },
+  mode,
+  allowEmptySource = false,
+  whatIf = false,
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  log = () => {
+  }
+}) {
+  var _a, _b;
+  const targetItems = /* @__PURE__ */ new Map();
+  for await (const obj of target.objects) {
+    targetItems.set(obj.id, obj);
+  }
+  const actions = [];
+  let sourceHasItems = false;
+  for await (const sourceObject of source.objects) {
+    sourceHasItems = true;
+    const id = sourceObject.id;
+    const targetObject = targetItems.get(id);
+    if (targetObject) {
+      if (!compareContents(sourceObject, targetObject)) {
+        if (mode === "createOrUpdate" || mode === "mirror") {
+          const process2 = async (sourceObject2, targetObject2) => {
+            if (!whatIf) {
+              try {
+                await target.writeObject(sourceObject2, targetObject2);
+              } catch (e) {
+                throw new SyncEngineError(e, sourceObject2);
+              }
+            }
+            log({
+              action: "update",
+              id,
+              providerId: sourceObject2.providerId,
+              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+              whatIf,
+              diff: diffJson(targetObject2.object, sourceObject2.object)
+            });
+          };
+          actions.push(process2(sourceObject, targetObject));
+        }
+      }
+      targetItems.delete(id);
+    } else {
+      const process2 = async (sourceObject2, id2) => {
+        if (!whatIf) {
+          try {
+            await target.writeObject(sourceObject2);
+          } catch (e) {
+            throw new SyncEngineError(e, sourceObject2);
+          }
+        }
+        log({
+          action: "create",
+          id: id2,
+          providerId: id2,
+          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+          whatIf,
+          diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+        });
+      };
+      actions.push(process2(sourceObject, id));
+    }
+  }
+  await Promise.all(actions);
+  if (mode === "mirror") {
+    if (!sourceHasItems && !allowEmptySource) {
+      throw new Error(
+        "Source is empty and mode is mirror. This would cause deletion of everything in the target, and most likely indicates an error in source definition."
+      );
+    }
+    const deletes = [];
+    targetItems.forEach(async (object) => {
+      const process2 = async (object2) => {
+        if (!whatIf) {
+          try {
+            await target.deleteObject(object2.providerId, object2);
+          } catch (e) {
+            throw new SyncEngineError(e, object2);
+          }
+        }
+        log({
+          action: "delete",
+          id: object2.id,
+          providerId: object2.providerId,
+          displayName: object2.displayName ?? object2.providerId,
+          whatIf,
+          diff: diffLines(JSON.stringify(object2.object, null, 2), "")
+        });
+      };
+      deletes.push(process2(object));
+    });
+    await Promise.all(deletes);
+  }
+  await Promise.all([(_a = source.onSyncComplete) == null ? void 0 : _a.call(source, false), (_b = target.onSyncComplete) == null ? void 0 : _b.call(target, true)]);
+}
+var SyncEngineError = class extends Error {
+  constructor(innerError, sourceObject) {
+    super(
+      `Error syncing ${sourceObject.displayName ?? sourceObject.providerId} (${sourceObject.providerId})
+${innerError}`
+    );
+    this.stack = void 0;
+    Object.setPrototypeOf(this, SyncEngineError.prototype);
+  }
+};
+
+// src/sync/syncEngineConsoleLogger.ts
+import chalk2 from "chalk";
+function createSyncEngineConsoleLogger(options) {
+  const { diffMode = "off", indent, prefix } = options ?? {};
+  return function syncEngineConsoleLogger({ action, displayName, whatIf, diff }) {
+    let actionTag = "";
+    switch (action) {
+      case "create":
+        actionTag = chalk2.green("[A]");
+        break;
+      case "update":
+        actionTag = chalk2.white("[U]");
+        break;
+      case "delete":
+        actionTag = chalk2.yellow("[D]");
+        break;
+    }
+    let diffString = "";
+    if (diffMode === "on" || diffMode === "update" && action === "update") {
+      diffString = "\n" + diff.map((change) => {
+        if (change.added) {
+          return chalk2.green(change.value);
+        }
+        if (change.removed) {
+          return chalk2.red(change.value);
+        }
+        return change.value;
+      }).join("");
+    }
+    console.log(
+      `${indent ?? ""}${whatIf ? chalk2.gray("[WHATIF]") : ""}${actionTag}${prefix ?? ""} ${displayName}${diffString}`
+    );
+  };
+}
+
+// src/commands/canvas/commands/component/get.ts
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
@@ -313,7 +719,6 @@ var ComponentPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy });
     const source = createComponentDefinitionEngineDataSource({ client });
@@ -322,7 +727,7 @@ var ComponentPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.components) != null ? _a : [],
+        objects: packageContents.components ?? [],
         selectIdentifier,
         selectDisplayName,
         onSyncComplete: async (_, synced) => {
@@ -384,7 +789,6 @@ var ComponentPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy });
     let source;
@@ -392,7 +796,7 @@ var ComponentPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.components) != null ? _a : [],
+        objects: packageContents.components ?? [],
         selectIdentifier,
         selectDisplayName
       });
@@ -549,6 +953,10 @@ var CompositionListModule = {
               default: false,
               describe: "Resolve pattern references in the composition"
             },
+            resolveOverrides: {
+              type: "boolean",
+              default: false
+            },
             componentIDs: {
               type: "boolean",
               default: false,
@@ -570,6 +978,7 @@ var CompositionListModule = {
     project: projectId,
     state,
     resolvePatterns,
+    resolveOverrides,
     componentIDs
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -579,7 +988,8 @@ var CompositionListModule = {
       offset,
       state: convertCompositionState(state),
       skipPatternResolution: !resolvePatterns,
-      withComponentIDs: componentIDs
+      withComponentIDs: componentIDs,
+      skipParameterResolution: !resolveOverrides
     });
     emitWithFormat(res.compositions, format, filename);
   }
@@ -590,10 +1000,7 @@ import { UncachedCanvasClient as UncachedCanvasClient9 } from "@uniformdev/canva
 
 // src/commands/canvas/commands/composition/_util.ts
 var selectIdentifier2 = (component) => component.composition._id;
-var selectDisplayName2 = (component) => {
-  var _a, _b;
-  return `${(_b = (_a = component.composition._name) != null ? _a : component.composition._slug) != null ? _b : component.composition._id} (pid: ${component.composition._id})`;
-};
+var selectDisplayName2 = (component) => `${component.composition._name ?? component.composition._slug ?? component.composition._id} (pid: ${component.composition._id})`;
 
 // src/commands/canvas/componentInstanceEngineDataSource.ts
 function createComponentInstanceEngineDataSource({
@@ -611,6 +1018,7 @@ function createComponentInstanceEngineDataSource({
         state: stateId,
         skipPatternResolution: true,
         skipParameterResolution: true,
+        skipOverridesResolution: true,
         withComponentIDs: true
       })).compositions,
       { pageSize: 100 }
@@ -743,7 +1151,6 @@ var CompositionPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy });
     const source = createComponentInstanceEngineDataSource({ client, state });
@@ -752,7 +1159,7 @@ var CompositionPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents == null ? void 0 : packageContents.compositions) != null ? _a : [],
+        objects: (packageContents == null ? void 0 : packageContents.compositions) ?? [],
         selectIdentifier: selectIdentifier2,
         selectDisplayName: selectDisplayName2,
         onSyncComplete: async (_, synced) => {
@@ -817,7 +1224,6 @@ var CompositionPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient11({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy });
     let source;
@@ -825,7 +1231,7 @@ var CompositionPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.compositions) != null ? _a : [],
+        objects: packageContents.compositions ?? [],
         selectIdentifier: selectIdentifier2,
         selectDisplayName: selectDisplayName2
       });
@@ -926,6 +1332,7 @@ var DataTypeGetModule = {
   builder: (yargs18) => withFormatOptions(
     withApiOptions(
       withProjectOptions(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         yargs18.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
       )
     )
@@ -1035,7 +1442,6 @@ var DataTypePullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient3({
       apiKey,
@@ -1051,7 +1457,7 @@ var DataTypePullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.dataTypes) != null ? _a : [],
+        objects: packageContents.dataTypes ?? [],
         selectIdentifier: selectIdentifier3,
         selectDisplayName: selectDisplayName3,
         onSyncComplete: async (_, synced) => {
@@ -1113,7 +1519,6 @@ var DataTypePushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient4({
       apiKey,
@@ -1128,7 +1533,7 @@ var DataTypePushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.dataTypes) != null ? _a : [],
+        objects: packageContents.dataTypes ?? [],
         selectIdentifier: selectIdentifier3,
         selectDisplayName: selectDisplayName3
       });
@@ -1353,7 +1758,6 @@ var AggregatePullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     const source = createAggregateEngineDataSource({ client });
@@ -1362,7 +1766,7 @@ var AggregatePullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.aggregates) != null ? _a : [],
+        objects: packageContents.aggregates ?? [],
         selectIdentifier: selectIdentifier4,
         selectDisplayName: selectDisplayName4,
         onSyncComplete: async (_, synced) => {
@@ -1424,7 +1828,6 @@ var AggregatePushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     let source;
@@ -1432,7 +1835,7 @@ var AggregatePushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.aggregates) != null ? _a : [],
+        objects: packageContents.aggregates ?? [],
         selectIdentifier: selectIdentifier4,
         selectDisplayName: selectDisplayName4
       });
@@ -1576,7 +1979,7 @@ function createEnrichmentEngineDataSource({
       await client.removeCategory({ enrichmentId: providerId });
     },
     writeObject: async (object, existingObject) => {
-      var _a, _b;
+      var _a;
       await client.upsertCategory({
         enrichment: object.object
       });
@@ -1586,7 +1989,7 @@ function createEnrichmentEngineDataSource({
       });
       const target = createEnrichmentValueEngineDataSource({
         categoryId: object.id,
-        values: (_b = (_a = existingObject == null ? void 0 : existingObject.object) == null ? void 0 : _a.values) != null ? _b : [],
+        values: ((_a = existingObject == null ? void 0 : existingObject.object) == null ? void 0 : _a.values) ?? [],
         client
       });
       await syncEngine({
@@ -1677,7 +2080,6 @@ var EnrichmentPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     const source = createEnrichmentEngineDataSource({ client });
@@ -1686,7 +2088,7 @@ var EnrichmentPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.enrichments) != null ? _a : [],
+        objects: packageContents.enrichments ?? [],
         selectIdentifier: selectIdentifier5,
         selectDisplayName: selectDisplayName5,
         onSyncComplete: async (_, synced) => {
@@ -1748,7 +2150,6 @@ var EnrichmentPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     let source;
@@ -1756,7 +2157,7 @@ var EnrichmentPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.enrichments) != null ? _a : [],
+        objects: packageContents.enrichments ?? [],
         selectIdentifier: selectIdentifier5,
         selectDisplayName: selectDisplayName5
       });
@@ -1811,8 +2212,8 @@ var EnrichmentModule = {
 import yargs7 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-var import_chalk = __toESM(require_source());
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
+import chalk3 from "chalk";
 import { writeFile } from "fs";
 import { exit } from "process";
 var ManifestGetModule = {
@@ -1853,7 +2254,7 @@ var ManifestGetModule = {
 `, error);
             exit(1);
           }
-          console.log(import_chalk.default.green(`\u2705 ${output} has been updated from ${apiHost}`));
+          console.log(chalk3.green(`\u2705 ${output} has been updated from ${apiHost}`));
         });
       } else {
         console.log(text);
@@ -1868,16 +2269,16 @@ var ManifestGetModule = {
       } else {
         message = e.toString();
       }
-      console.error(import_chalk.default.red(`\u26A0 Error fetching Context manifest`));
-      console.error(import_chalk.default.gray(`  \u2757 ${message}`));
+      console.error(chalk3.red(`\u26A0 Error fetching Context manifest`));
+      console.error(chalk3.gray(`  \u2757 ${message}`));
       exit(1);
     }
   }
 };
 
 // src/commands/context/commands/manifest/publish.ts
-var import_chalk2 = __toESM(require_source());
 import { ApiClientError as ApiClientError2, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import chalk4 from "chalk";
 import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
@@ -1903,8 +2304,8 @@ var ManifestPublishModule = {
       } else {
         message = e.toString();
       }
-      console.error(import_chalk2.default.red(`\u26A0 Error publishing Context manifest`));
-      console.error(import_chalk2.default.gray(`  \u2757 ${message}`));
+      console.error(chalk4.red(`\u26A0 Error publishing Context manifest`));
+      console.error(chalk4.gray(`  \u2757 ${message}`));
       exit2(1);
     }
   }
@@ -2052,7 +2453,6 @@ var QuirkPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedQuirkClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     const source = createQuirkEngineDataSource({ client });
@@ -2061,7 +2461,7 @@ var QuirkPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.quirks) != null ? _a : [],
+        objects: packageContents.quirks ?? [],
         selectIdentifier: selectIdentifier6,
         selectDisplayName: selectDisplayName6,
         onSyncComplete: async (_, synced) => {
@@ -2123,7 +2523,6 @@ var QuirkPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedQuirkClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     let source;
@@ -2131,7 +2530,7 @@ var QuirkPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.quirks) != null ? _a : [],
+        objects: packageContents.quirks ?? [],
         selectIdentifier: selectIdentifier6,
         selectDisplayName: selectDisplayName6
       });
@@ -2320,7 +2719,6 @@ var SignalPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     const source = createSignalEngineDataSource({ client });
@@ -2329,7 +2727,7 @@ var SignalPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.signals) != null ? _a : [],
+        objects: packageContents.signals ?? [],
         selectIdentifier: selectIdentifier7,
         selectDisplayName: selectDisplayName7,
         onSyncComplete: async (_, synced) => {
@@ -2391,7 +2789,6 @@ var SignalPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     let source;
@@ -2399,7 +2796,7 @@ var SignalPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.signals) != null ? _a : [],
+        objects: packageContents.signals ?? [],
         selectIdentifier: selectIdentifier7,
         selectDisplayName: selectDisplayName7
       });
@@ -2588,7 +2985,6 @@ var TestPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient3({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     const source = createTestEngineDataSource({ client });
@@ -2597,7 +2993,7 @@ var TestPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.tests) != null ? _a : [],
+        objects: packageContents.tests ?? [],
         selectIdentifier: selectIdentifier8,
         selectDisplayName: selectDisplayName8,
         onSyncComplete: async (_, synced) => {
@@ -2659,7 +3055,6 @@ var TestPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient4({ apiKey, apiHost, fetch: fetch3, projectId, limitPolicy: limitPolicy2 });
     let source;
@@ -2667,7 +3062,7 @@ var TestPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.tests) != null ? _a : [],
+        objects: packageContents.tests ?? [],
         selectIdentifier: selectIdentifier8,
         selectDisplayName: selectDisplayName8
       });
@@ -2744,11 +3139,12 @@ var ContextCommand = {
 };
 
 // src/spinner.ts
+import ora from "ora";
 var makeSpinner = () => {
   const spinners = [];
   const stopAllSpinners = () => spinners.forEach((spinner) => spinner.stop());
   const spin = async (text) => {
-    const spinner = await Promise.resolve().then(() => __toESM(__require("ora"))).then((ora) => ora.default(text).start());
+    const spinner = ora(text).start();
     spinners.push(spinner);
     const minWait = new Promise((resolve) => setTimeout(resolve, 500));
     return async () => {
@@ -2766,7 +3162,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "18.18.0",
+  version: "18.19.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -2785,33 +3181,34 @@ var package_default = {
     "@uniformdev/canvas": "workspace:*",
     "@uniformdev/context": "workspace:*",
     "@uniformdev/project-map": "workspace:*",
+    chalk: "^5.2.0",
+    diff: "^5.0.0",
+    dotenv: "^16.0.3",
     execa: "5.1.1",
     "fs-jetpack": "5.1.0",
     graphql: "16.6.0",
     "graphql-request": "5.1.0",
+    "https-proxy-agent": "^5.0.1",
     inquirer: "8.2.5",
     "isomorphic-git": "1.21.0",
+    "isomorphic-unfetch": "^3.1.0",
+    "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.0",
+    "lodash.isequalwith": "^4.4.0",
     open: "8.4.0",
     ora: "6.1.2",
-    "posthog-node": "2.2.3",
+    "posthog-node": "2.5.3",
     slugify: "1.6.5",
-    diff: "^5.0.0",
-    dotenv: "^16.0.3",
-    "https-proxy-agent": "^5.0.1",
-    "isomorphic-unfetch": "^3.1.0",
-    "js-yaml": "^4.1.0",
-    "lodash.isequalwith": "^4.4.0",
     yargs: "^17.6.2",
     zod: "3.20.6"
   },
   devDependencies: {
-    "@types/inquirer": "9.0.3",
-    "@types/jsonwebtoken": "9.0.1",
-    "@types/node": "18.11.17",
     "@types/diff": "5.0.2",
+    "@types/inquirer": "9.0.3",
     "@types/js-yaml": "4.0.5",
+    "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.isequalwith": "4.4.7",
+    "@types/node": "18.11.17",
     "@types/yargs": "17.0.22",
     "p-limit": "4.0.0"
   },
@@ -3123,7 +3520,7 @@ var runNpm = async (workDir, args, { inherit, env } = {}) => {
   try {
     result = await execa("npm", args, {
       cwd: workDir,
-      env: env != null ? env : {},
+      env: env ?? {},
       ...inherit ? { stdout: "inherit", stderr: "inherit" } : {}
     });
   } catch (err) {
@@ -3138,10 +3535,10 @@ ${err.message}`);
 
 // src/projects/cloneStarter.ts
 import crypto2 from "crypto";
-import fs from "fs";
-import { copy } from "fs-jetpack";
+import fs2 from "fs";
+import fsj from "fs-jetpack";
 import * as git from "isomorphic-git";
-import * as http from "isomorphic-git/http/node";
+import * as http from "isomorphic-git/http/node/index.js";
 import os from "os";
 import path from "path";
 async function cloneStarter({
@@ -3155,7 +3552,7 @@ async function cloneStarter({
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
     await git.clone({
-      fs,
+      fs: fs2,
       http,
       url: `https://github.com/${user}/${repo}`,
       dir: cloneDir,
@@ -3166,13 +3563,13 @@ async function cloneStarter({
     throw new Error(`Failed to fetch starter code: ${err.message}`);
   }
   await done();
-  if (fs.existsSync(targetDir) && fs.readdirSync(targetDir).length > 0) {
+  if (fs2.existsSync(targetDir) && fs2.readdirSync(targetDir).length > 0) {
     throw new Error(`"${targetDir}" is not empty`);
   }
   const starterDir = path.join(cloneDir, ...pathSegments);
-  copy(starterDir, targetDir, { overwrite: true });
+  fsj.copy(starterDir, targetDir, { overwrite: true });
   if (dotEnvFile) {
-    fs.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+    fs2.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
   console.log(`
 Your project now lives in ${targetDir} \u2728`);
@@ -3188,7 +3585,7 @@ Installing project dependencies...
 }
 
 // src/projects/getOrCreateProject.ts
-import fs2, { existsSync, mkdirSync } from "fs";
+import fs3, { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import inquirer2 from "inquirer";
 import path2 from "path";
 import slugify from "slugify";
@@ -3285,8 +3682,8 @@ async function chooseExistingProject({
   teamId,
   user
 }) {
-  var _a, _b, _c;
-  const projects = ((_b = (_a = user.teams.find((t) => t.team.id === teamId)) == null ? void 0 : _a.team.sites) != null ? _b : []).map((t) => ({
+  var _a, _b;
+  const projects = (((_a = user.teams.find((t) => t.team.id === teamId)) == null ? void 0 : _a.team.sites) ?? []).map((t) => ({
     name: t.name,
     value: t.id
   }));
@@ -3301,7 +3698,7 @@ async function chooseExistingProject({
   ]);
   return {
     projectId: result.projectId,
-    projectName: (_c = projects.find((p) => p.value === result.projectId)) == null ? void 0 : _c.name
+    projectName: (_b = projects.find((p) => p.value === result.projectId)) == null ? void 0 : _b.name
   };
 }
 function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
@@ -3311,13 +3708,13 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
     throw new Error("Project name cannot be shorter than 3 characters.");
   }
   if (checkTargetDir) {
-    let targetDir = explicitTargetDir != null ? explicitTargetDir : process.cwd();
-    if (!existsSync(targetDir)) {
-      mkdirSync(targetDir, { recursive: true });
+    let targetDir = explicitTargetDir ?? process.cwd();
+    if (!existsSync2(targetDir)) {
+      mkdirSync2(targetDir, { recursive: true });
     }
-    if (fs2.readdirSync(targetDir).length > 0) {
+    if (fs3.readdirSync(targetDir).length > 0) {
       targetDir = path2.resolve(targetDir, projectNameSlug);
-      if (fs2.existsSync(targetDir)) {
+      if (fs3.existsSync(targetDir)) {
         throw new Error(`${targetDir} already exists, choose a different name.`);
       }
     }
@@ -3540,7 +3937,7 @@ npm run dev
 }
 
 // src/commands/new/commands/new-mesh-integration.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import inquirer5 from "inquirer";
 import path3 from "path";
 import slugify2 from "slugify";
@@ -3584,18 +3981,18 @@ async function newMeshIntegrationHandler({
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path3.resolve(targetDir, "mesh-manifest.json");
-  if (!existsSync2(pathToManifest)) {
+  if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
-  const manifestContents = readFileSync(pathToManifest, "utf-8");
+  const manifestContents = readFileSync2(pathToManifest, "utf-8");
   const manifestJson = JSON.parse(manifestContents);
   manifestJson.type = typeSlug;
   manifestJson.displayName = name;
-  writeFileSync(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
+  writeFileSync2(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
   const packageJsonPath = path3.resolve(targetDir, "package.json");
-  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+  const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
-  writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
+  writeFileSync2(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
   const fullMeshAppKey = await uniformClient.registerMeshIntegration({ teamId, manifest: manifestJson });
   await done();
   await runNpmInstall();
@@ -3637,13 +4034,13 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
   if (integrationName.length < 6 || typeSlug.length < 6) {
     throw new Error("Integration name cannot be shorter than 6 characters.");
   }
-  let targetDir = explicitOutputPath != null ? explicitOutputPath : process.cwd();
-  if (!existsSync2(targetDir)) {
-    mkdirSync2(targetDir, { recursive: true });
+  let targetDir = explicitOutputPath ?? process.cwd();
+  if (!existsSync3(targetDir)) {
+    mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
     targetDir = path3.resolve(targetDir, typeSlug);
-    if (existsSync2(targetDir)) {
+    if (existsSync3(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
   }
@@ -3737,7 +4134,7 @@ import yargs13 from "yargs";
 import yargs12 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
-var import_chalk3 = __toESM(require_source());
+import chalk5 from "chalk";
 import { writeFile as writeFile2 } from "fs";
 import fetch2 from "isomorphic-unfetch";
 import { exit as exit3 } from "process";
@@ -3749,43 +4146,40 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs18) => {
-    var _a;
-    return yargs18.option("apiKey", {
-      alias: "k",
-      demandOption: true,
-      string: true,
-      default: process.env.UNIFORM_API_KEY,
-      describe: "Uniform API key to use. Defaults to UNIFORM_API_KEY env if set."
-    }).option("project", {
-      describe: "Uniform project ID. Defaults to UOPT_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
-      default: (_a = process.env.UOPT_CLI_PROJECT_ID) != null ? _a : process.env.UNIFORM_PROJECT_ID,
-      type: "string",
-      alias: ["p"]
-    }).option("preview", {
-      describe: "If set, fetches the unpublished preview manifest (assuming your API key has permission)",
-      default: false,
-      type: "boolean",
-      alias: ["d"]
-    }).option("output", {
-      string: true,
-      alias: "o",
-      default: process.env.UNIFORM_MANIFEST_PATH,
-      describe: "Path to write manifest to. Defaults to UNIFORM_MANIFEST_PATH env if set."
-    });
-  },
+  builder: (yargs18) => yargs18.option("apiKey", {
+    alias: "k",
+    demandOption: true,
+    string: true,
+    default: process.env.UNIFORM_API_KEY,
+    describe: "Uniform API key to use. Defaults to UNIFORM_API_KEY env if set."
+  }).option("project", {
+    describe: "Uniform project ID. Defaults to UOPT_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
+    default: process.env.UOPT_CLI_PROJECT_ID ?? process.env.UNIFORM_PROJECT_ID,
+    type: "string",
+    alias: ["p"]
+  }).option("preview", {
+    describe: "If set, fetches the unpublished preview manifest (assuming your API key has permission)",
+    default: false,
+    type: "boolean",
+    alias: ["d"]
+  }).option("output", {
+    string: true,
+    alias: "o",
+    default: process.env.UNIFORM_MANIFEST_PATH,
+    describe: "Path to write manifest to. Defaults to UNIFORM_MANIFEST_PATH env if set."
+  }),
   handler: async ({ apiKey, output, project, preview }) => {
     const isLegacyApiKey = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i.test(
       apiKey
     );
     if (isLegacyApiKey) {
       console.error(
-        import_chalk3.default.yellow(
+        chalk5.yellow(
           "WARNING: you appear to be using a deprecated type of API key. Keys like this will stop working soon; please create new keys on uniform.app."
         )
       );
     } else if (!project) {
-      console.error(import_chalk3.default.red("You must specify the project ID"));
+      console.error(chalk5.red("You must specify the project ID"));
       exit3(1);
     }
     const baseUrl = resolveBaseUrl();
@@ -3811,16 +4205,16 @@ var module = {
         throw `${fetchResponse.status} ${fetchResponse.statusText}, content ${await fetchResponse.text()}`;
       }
     } catch (e) {
-      console.error(import_chalk3.default.red(`\u26A0 Error fetching intent manifest ${manifestUrl}`));
-      console.error(import_chalk3.default.gray(`  \u2757 ${e}`));
+      console.error(chalk5.red(`\u26A0 Error fetching intent manifest ${manifestUrl}`));
+      console.error(chalk5.gray(`  \u2757 ${e}`));
       exit3(1);
     }
     let json;
     try {
       json = await fetchResponse.json();
     } catch (e) {
-      console.error(import_chalk3.default.red(import_chalk3.default.red(`\u26A0 Error parsing intent manifest ${manifestUrl}`)));
-      console.error(import_chalk3.default.gray(`  \u2757 ${e}`));
+      console.error(chalk5.red(chalk5.red(`\u26A0 Error parsing intent manifest ${manifestUrl}`)));
+      console.error(chalk5.gray(`  \u2757 ${e}`));
       console.error(`Response: ${await fetchResponse.text()}`);
       exit3(1);
     }
@@ -3832,7 +4226,7 @@ var module = {
 `, error);
           exit3(1);
         }
-        console.log(import_chalk3.default.green(`\u2705 ${output} has been updated from ${manifestUrl}`));
+        console.log(chalk5.green(`\u2705 ${output} has been updated from ${manifestUrl}`));
       });
     } else {
       console.log(text);
@@ -4006,7 +4400,6 @@ var ProjectMapDefinitionPullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient3({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createProjectMapDefinitionEngineDataSource({ client });
@@ -4015,7 +4408,7 @@ var ProjectMapDefinitionPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.projectMaps) != null ? _a : [],
+        objects: packageContents.projectMaps ?? [],
         selectIdentifier: selectIdentifier9,
         selectDisplayName: selectDisplayName9,
         onSyncComplete: async (_, synced) => {
@@ -4077,7 +4470,6 @@ var ProjectMapDefinitionPushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient4({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
@@ -4085,7 +4477,7 @@ var ProjectMapDefinitionPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.projectMaps) != null ? _a : [],
+        objects: packageContents.projectMaps ?? [],
         selectIdentifier: selectIdentifier9,
         selectDisplayName: selectDisplayName9
       });
@@ -4168,7 +4560,7 @@ var ProjectMapNodeGetModule = {
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, projectMapId, format, project: projectId, filename }) => {
-    var _a, _b;
+    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient7({ apiKey, apiHost, fetch: fetch3, projectId });
     console.log("Debugging params for node get", { projectMapId, id, projectId });
@@ -4177,7 +4569,7 @@ var ProjectMapNodeGetModule = {
       console.error("Project map node does not exist");
       process.exit(1);
     } else {
-      emitWithFormat({ nodes: (_b = res.nodes) != null ? _b : [], projectMapId }, format, filename);
+      emitWithFormat({ nodes: res.nodes ?? [], projectMapId }, format, filename);
     }
   }
 };
@@ -4196,11 +4588,10 @@ var ProjectMapNodeListModule = {
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, projectMapId, format, filename, project: projectId }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient8({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getNodes({ projectMapId });
-    emitWithFormat({ nodes: (_a = res.nodes) != null ? _a : [], projectMapId }, format, filename);
+    emitWithFormat({ nodes: res.nodes ?? [], projectMapId }, format, filename);
   }
 };
 
@@ -4221,7 +4612,7 @@ function createProjectMapNodeEngineDataSource({
     const projectMaps = (await client.getProjectMapDefinitions()).projectMaps;
     for (const projectMap of projectMaps) {
       const nodes = (await client.getNodes({ projectMapId: projectMap.id })).nodes;
-      for await (const def of nodes != null ? nodes : []) {
+      for await (const def of nodes ?? []) {
         if (def) {
           const result = {
             id: selectIdentifier10({ ...def, projectMapId: projectMap.id }, projectId),
@@ -4294,7 +4685,6 @@ var ProjectMapNodePullModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient9({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createProjectMapNodeEngineDataSource({ client, projectId });
@@ -4306,7 +4696,7 @@ var ProjectMapNodePullModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.projectMapNodes) != null ? _a : [],
+        objects: packageContents.projectMapNodes ?? [],
         selectIdentifier: expandedSelectIdentifier,
         selectDisplayName: selectDisplayName10,
         onSyncComplete: async (_, synced) => {
@@ -4369,7 +4759,6 @@ var ProjectMapNodePushModule = {
     project: projectId,
     diff: diffMode
   }) => {
-    var _a;
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient10({
       apiKey,
@@ -4385,7 +4774,7 @@ var ProjectMapNodePushModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: (_a = packageContents.projectMapNodes) != null ? _a : [],
+        objects: packageContents.projectMapNodes ?? [],
         selectIdentifier: expandedSelectIdentifier,
         selectDisplayName: selectDisplayName10
       });
@@ -4467,6 +4856,6 @@ var ProjectMapCommand = {
 };
 
 // src/index.ts
-__require("dotenv").config();
-var yarggery = yargs17.scriptName("uniform");
+dotenv.config();
+var yarggery = yargs17(hideBin(process.argv));
 yarggery.command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(NewCmd).command(NewMeshCmd).command(OptimizeCommand).demandCommand(1, "").strict().help().argv;