@uniformdev/cli 19.10.0 → 19.12.0

package/dist/index.mjs

@@ -21,33 +21,34 @@ async function createArraySyncEngineDataSource({
   selectDisplayName: selectDisplayName12 = selectIdentifier12,
   onSyncComplete
 }) {
-  const objectIndex = objects.reduce((result, current) => {
-    const rawIdentifiers = selectIdentifier12(current);
-    const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
-    while (identifiers.length > 0) {
-      const identifier = identifiers.pop();
-      if (!identifier)
-        continue;
-      if (result[identifier]) {
-        throw new Error(`Identifier ${identifier} was not unique.`);
+  const objectIndex = objects.reduce(
+    (result, current) => {
+      const rawIdentifiers = selectIdentifier12(current);
+      const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
+      const existingResult = identifiers.find((id) => result[id]);
+      if (existingResult) {
+        throw new Error(`Identifier(s) ${identifiers} was not unique.`);
       }
       const displayName = selectDisplayName12(current);
-      result[identifier] = {
-        id: identifier,
+      result[identifiers[0]] = {
+        id: identifiers,
         object: current,
-        providerId: identifier,
+        providerId: identifiers[0],
         displayName: Array.isArray(displayName) ? displayName[0] : displayName
       };
-    }
-    return result;
-  }, {});
+      identifiers.slice(1).forEach((id) => result[id] = identifiers[0]);
+      return result;
+    },
+    {}
+  );
   async function* getObjects() {
     for (const item of Object.values(objectIndex)) {
-      yield item;
+      if (typeof item === "object")
+        yield item;
     }
   }
   function extractCurrent() {
-    return Object.entries(objectIndex).sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
+    return Object.entries(objectIndex).filter((entry) => typeof entry[1] === "object").sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
   }
   return {
     objects: getObjects(),
@@ -57,7 +58,7 @@ async function createArraySyncEngineDataSource({
     writeObject: async (objectToWrite) => {
       const id = selectIdentifier12(objectToWrite.object);
       if (Array.isArray(id)) {
-        id.forEach((i) => objectIndex[i] = objectToWrite);
+        objectIndex[id[0]] = objectToWrite;
       } else {
         objectIndex[id] = objectToWrite;
       }
@@ -68,7 +69,7 @@ async function createArraySyncEngineDataSource({
 }
 
 // src/sync/fileSyncEngineDataSource.ts
-import chalk from "chalk";
+import ansicolors from "ansi-colors";
 import { existsSync, mkdirSync } from "fs";
 import { readdir, unlink } from "fs/promises";
 import { extname as extname2, join } from "path";
@@ -218,6 +219,7 @@ async function* paginateAsync(fetchPage, options) {
 }
 
 // src/sync/fileSyncEngineDataSource.ts
+var { red } = ansicolors;
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
@@ -243,15 +245,16 @@ async function createFileSyncEngineDataSource({
       const fullFilename = join(directory, filename);
       try {
         const contents = await readFileToObject(fullFilename);
+        const displayName = selectDisplayName12(contents);
         const object = {
           id: selectIdentifier12(contents),
-          displayName: selectDisplayName12(contents)[0],
+          displayName: Array.isArray(displayName) ? displayName[0] : displayName,
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
         };
         yield object;
       } catch (e) {
-        console.error(chalk.red(`Failed to read ${fullFilename}, data is likely invalid.
+        console.error(red(`Failed to read ${fullFilename}, data is likely invalid.
 ${e == null ? void 0 : e.message}`));
         throw e;
       }
@@ -302,7 +305,7 @@ async function syncEngine({
     return isEqualWith(
       source2.object,
       target2.object,
-      (_a, _b, key) => key === "created" || key === "modified" ? true : void 0
+      (_a, _b, key) => key === "created" || key === "modified" || key === "updated" ? true : void 0
     );
   },
   mode,
@@ -348,7 +351,7 @@ async function syncEngine({
     sourceHasItems = true;
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
-    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o !== targetObject);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => (o == null ? void 0 : o.object) !== (targetObject == null ? void 0 : targetObject.object));
     if (targetObject && invalidTargetObjects.length == 0) {
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
@@ -392,12 +395,10 @@ async function syncEngine({
         });
       };
       if (invalidTargetObjects.length > 0) {
-        [...invalidTargetObjects, targetObject].forEach(
-          (o) => {
-            var _a2;
-            return (_a2 = o == null ? void 0 : o.id) == null ? void 0 : _a2.forEach((i) => targetItems.delete(i));
-          }
-        );
+        [...invalidTargetObjects, targetObject].forEach((o) => {
+          var _a2;
+          (_a2 = Array.isArray(o == null ? void 0 : o.id) ? o == null ? void 0 : o.id : [o == null ? void 0 : o.id]) == null ? void 0 : _a2.forEach((i) => i && targetItems.delete(i));
+        });
         const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map(async (io) => {
           await processDelete(io);
         });
@@ -437,36 +438,37 @@ ${innerError}`
 };
 
 // src/sync/syncEngineConsoleLogger.ts
-import chalk2 from "chalk";
+import ansicolors2 from "ansi-colors";
+var { gray, green, red: red2, white, yellow } = ansicolors2;
 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]");
+        actionTag = green("[A]");
         break;
       case "update":
-        actionTag = chalk2.white("[U]");
+        actionTag = white("[U]");
         break;
       case "delete":
-        actionTag = chalk2.yellow("[D]");
+        actionTag = 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);
+          return green(change.value);
         }
         if (change.removed) {
-          return chalk2.red(change.value);
+          return red2(change.value);
         }
         return change.value;
       }).join("");
     }
     console.log(
-      `${indent ?? ""}${whatIf ? chalk2.gray("[WHATIF]") : ""}${actionTag}${prefix ?? ""} ${displayName}${diffString}`
+      `${indent ?? ""}${whatIf ? gray("[WHATIF]") : ""}${actionTag}${prefix ?? ""} ${displayName}${diffString}`
     );
   };
 }
@@ -930,7 +932,7 @@ var CompositionListModule = {
       state: convertCompositionState(state),
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
-      skipParameterResolution: !resolveOverrides
+      skipOverridesResolution: !resolveOverrides
     });
     emitWithFormat(res.compositions, format, filename);
   }
@@ -958,7 +960,6 @@ function createComponentInstanceEngineDataSource({
         offset,
         state: stateId,
         skipPatternResolution: true,
-        skipParameterResolution: true,
         skipOverridesResolution: true,
         withComponentIDs: true
       })).compositions,
@@ -2149,9 +2150,10 @@ import yargs7 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
-import chalk3 from "chalk";
+import ansicolors3 from "ansi-colors";
 import { writeFile } from "fs";
 import { exit } from "process";
+var { gray: gray2, green: green2, red: red3 } = ansicolors3;
 var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
@@ -2190,7 +2192,7 @@ var ManifestGetModule = {
 `, error);
             exit(1);
           }
-          console.log(chalk3.green(`\u2705 ${output} has been updated from ${apiHost}`));
+          console.log(green2(`\u2705 ${output} has been updated from ${apiHost}`));
         });
       } else {
         console.log(text);
@@ -2205,8 +2207,8 @@ var ManifestGetModule = {
       } else {
         message = e.toString();
       }
-      console.error(chalk3.red(`\u26A0 Error fetching Context manifest`));
-      console.error(chalk3.gray(`  \u2757 ${message}`));
+      console.error(red3(`\u26A0 Error fetching Context manifest`));
+      console.error(gray2(`  \u2757 ${message}`));
       exit(1);
     }
   }
@@ -2214,8 +2216,9 @@ var ManifestGetModule = {
 
 // src/commands/context/commands/manifest/publish.ts
 import { ApiClientError as ApiClientError2, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
-import chalk4 from "chalk";
+import ansicolors4 from "ansi-colors";
 import { exit as exit2 } from "process";
+var { gray: gray3, red: red4 } = ansicolors4;
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
@@ -2240,8 +2243,8 @@ var ManifestPublishModule = {
       } else {
         message = e.toString();
       }
-      console.error(chalk4.red(`\u26A0 Error publishing Context manifest`));
-      console.error(chalk4.gray(`  \u2757 ${message}`));
+      console.error(red4(`\u26A0 Error publishing Context manifest`));
+      console.error(gray3(`  \u2757 ${message}`));
       exit2(1);
     }
   }
@@ -3098,7 +3101,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.10.0",
+  version: "19.12.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3118,7 +3121,7 @@ var package_default = {
     "@uniformdev/context": "workspace:*",
     "@uniformdev/project-map": "workspace:*",
     "@uniformdev/redirect": "workspace:*",
-    chalk: "^5.2.0",
+    "ansi-colors": "^4.1.3",
     diff: "^5.0.0",
     dotenv: "^16.0.3",
     execa: "5.1.1",
@@ -3126,14 +3129,14 @@ var package_default = {
     graphql: "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    inquirer: "9.2.1",
+    inquirer: "9.2.3",
     "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: "9.1.0",
-    ora: "6.3.0",
+    ora: "6.3.1",
     "posthog-node": "3.1.1",
     slugify: "1.6.6",
     yargs: "^17.6.2",
@@ -3145,7 +3148,7 @@ var package_default = {
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.16.8",
+    "@types/node": "18.16.13",
     "@types/yargs": "17.0.24"
   },
   bin: {
@@ -3317,12 +3320,12 @@ var getLimitsSchema = z.object({
   })
 });
 var createClient = (baseUrl, authToken) => {
-  const request2 = async (path4, opts) => {
+  const request2 = async (path4, opts, allowedNon2xxStatusCodes = []) => {
     const res = await fetch(makeUrl(baseUrl, path4), {
       ...opts,
       headers: { Authorization: `Bearer ${authToken}` }
     });
-    if (res.ok) {
+    if (res.ok || allowedNon2xxStatusCodes.includes(res.status)) {
       return res;
     } else {
       throw new Error(
@@ -3330,8 +3333,8 @@ var createClient = (baseUrl, authToken) => {
       );
     }
   };
-  const requestJson = async (path4, opts, schema2) => {
-    const res = await request2(path4, opts);
+  const requestJson = async (path4, opts, schema2, allowedNon2xxStatusCodes = []) => {
+    const res = await request2(path4, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
     const parseResult = schema2.safeParse(data);
     if (parseResult.success) {
@@ -3359,11 +3362,16 @@ var createClient = (baseUrl, authToken) => {
         const { limits } = await requestJson(
           `/api/v1/limits?teamId=${teamId}`,
           { method: "POST" },
-          getLimitsSchema
+          getLimitsSchema,
+          // HTTP 402 Payment Required means that SOME limit has been exceeded.
+          // We still want to check if there is some project type that is below limit.
+          [402]
         );
         const projectTypeBelowLimit = limits.projects.find((project) => project.used < project.limit);
         if (!projectTypeBelowLimit) {
-          throw new Error("Usage exceeded.");
+          throw new Error(
+            "Usage exceeded: cannot create more projects. Please upgrade your plan or delete one of existing projects."
+          );
         }
         const result = await requestJson(
           "/api/v1/project",
@@ -3674,7 +3682,7 @@ var query = gql`
     info: identities_by_pk(subject: $subject) {
       name
       email_address
-      teams: organizations_identities {
+      teams: organizations_identities(order_by: { organization: { name: asc } }) {
         team: organization {
           name
           id
@@ -4127,7 +4135,7 @@ import yargs13 from "yargs";
 import yargs12 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
-import chalk5 from "chalk";
+import ansicolors5 from "ansi-colors";
 import { writeFile as writeFile2 } from "fs";
 import fetch2 from "isomorphic-unfetch";
 import { exit as exit3 } from "process";
@@ -4136,6 +4144,7 @@ import { exit as exit3 } from "process";
 var UniformBaseUrl = "https://uniform.app";
 
 // src/commands/optimize/manifest/download.ts
+var { gray: gray4, green: green3, red: red5, yellow: yellow2 } = ansicolors5;
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
@@ -4167,12 +4176,12 @@ var module = {
     );
     if (isLegacyApiKey) {
       console.error(
-        chalk5.yellow(
+        yellow2(
           "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(chalk5.red("You must specify the project ID"));
+      console.error(red5("You must specify the project ID"));
       exit3(1);
     }
     const baseUrl = resolveBaseUrl();
@@ -4198,16 +4207,16 @@ var module = {
         throw `${fetchResponse.status} ${fetchResponse.statusText}, content ${await fetchResponse.text()}`;
       }
     } catch (e) {
-      console.error(chalk5.red(`\u26A0 Error fetching intent manifest ${manifestUrl}`));
-      console.error(chalk5.gray(`  \u2757 ${e}`));
+      console.error(red5(`\u26A0 Error fetching intent manifest ${manifestUrl}`));
+      console.error(gray4(`  \u2757 ${e}`));
       exit3(1);
     }
     let json;
     try {
       json = await fetchResponse.json();
     } catch (e) {
-      console.error(chalk5.red(chalk5.red(`\u26A0 Error parsing intent manifest ${manifestUrl}`)));
-      console.error(chalk5.gray(`  \u2757 ${e}`));
+      console.error(red5(`\u26A0 Error parsing intent manifest ${manifestUrl}`));
+      console.error(gray4(`  \u2757 ${e}`));
       console.error(`Response: ${await fetchResponse.text()}`);
       exit3(1);
     }
@@ -4219,7 +4228,7 @@ var module = {
 `, error);
           exit3(1);
         }
-        console.log(chalk5.green(`\u2705 ${output} has been updated from ${manifestUrl}`));
+        console.log(green3(`\u2705 ${output} has been updated from ${manifestUrl}`));
       });
     } else {
       console.log(text);
@@ -4907,18 +4916,18 @@ function writeContextPackage3(filename, packageContents) {
 }
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
-var selectIdentifier11 = (source) => source.redirect.id;
+var selectIdentifier11 = (source) => source.id;
 var selectFilename2 = (source) => {
-  const index = source.redirect.sourceUrl.lastIndexOf("/");
-  return cleanFileName(source.redirect.sourceUrl.substring(index + 1)) + `_${source.redirect.id}`;
+  const index = source.sourceUrl.lastIndexOf("/");
+  return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
 };
 var selectDisplayName11 = (source) => {
-  let pathName = source.redirect.sourceUrl;
+  let pathName = source.sourceUrl;
   if (pathName.length > 30) {
-    const slashIndex = source.redirect.sourceUrl.indexOf("/", source.redirect.sourceUrl.length - 30);
+    const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
     pathName = "..." + pathName.substring(slashIndex);
   }
-  return `${pathName} (id: ${source.redirect.id})`;
+  return `${pathName} (id: ${source.id})`;
 };
 
 // src/commands/redirect/RedirectEngineDataSource.ts
@@ -4929,10 +4938,10 @@ function createRedirectDefinitionEngineDataSource({
     const { redirects } = await client.getRedirects();
     for await (const def of redirects) {
       const result = {
-        id: selectIdentifier11(def),
-        displayName: selectDisplayName11(def),
-        providerId: selectIdentifier11(def),
-        object: def
+        id: selectIdentifier11(def.redirect),
+        displayName: selectDisplayName11(def.redirect),
+        providerId: selectIdentifier11(def.redirect),
+        object: def.redirect
       };
       yield result;
     }
@@ -4943,7 +4952,7 @@ function createRedirectDefinitionEngineDataSource({
       await client.deleteRedirect(providerId);
     },
     writeObject: async (object) => {
-      await client.upsertRedirect(object.object.redirect);
+      await client.upsertRedirect(object.object);
     }
   };
 }
@@ -4998,7 +5007,7 @@ var RedirectDefinitionPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage3(directory, false);
       target = await createArraySyncEngineDataSource({
-        objects: packageContents ?? [],
+        objects: packageContents.redirects ?? [],
         selectIdentifier: selectIdentifier11,
         selectDisplayName: selectDisplayName11,
         onSyncComplete: async (_, synced) => {
@@ -5068,7 +5077,7 @@ var RedirectDefinitionPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage3(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: packageContents ?? [],
+        objects: packageContents.redirects ?? [],
         selectIdentifier: selectIdentifier11,
         selectDisplayName: selectDisplayName11
       });
@@ -5121,7 +5130,7 @@ var RedirectDefinitionUpdateModule = {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient6({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
-    await client.upsertRedirect(file.redirect);
+    await client.upsertRedirect(file);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.10.0",
+  "version": "19.12.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,11 +16,11 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.10.0",
-    "@uniformdev/context": "19.10.0",
-    "@uniformdev/project-map": "19.10.0",
-    "@uniformdev/redirect": "19.10.0",
-    "chalk": "^5.2.0",
+    "@uniformdev/canvas": "19.12.0",
+    "@uniformdev/context": "19.12.0",
+    "@uniformdev/project-map": "19.12.0",
+    "@uniformdev/redirect": "19.12.0",
+    "ansi-colors": "^4.1.3",
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
     "execa": "5.1.1",
@@ -28,14 +28,14 @@
     "graphql": "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    "inquirer": "9.2.1",
+    "inquirer": "9.2.3",
     "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": "9.1.0",
-    "ora": "6.3.0",
+    "ora": "6.3.1",
     "posthog-node": "3.1.1",
     "slugify": "1.6.6",
     "yargs": "^17.6.2",
@@ -47,7 +47,7 @@
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.16.8",
+    "@types/node": "18.16.13",
     "@types/yargs": "17.0.24"
   },
   "bin": {
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "149f942da715ed802545850283f9b99291829a04"
+  "gitHead": "ca508c44f1b274e3e47d90717a98036256ae8379"
 }