@uniformdev/cli 19.11.0 → 19.13.0

package/dist/index.mjs

@@ -244,7 +244,7 @@ async function createFileSyncEngineDataSource({
     for (const filename of filenames) {
       const fullFilename = join(directory, filename);
       try {
-        const contents = readFileToObject(fullFilename);
+        const contents = await readFileToObject(fullFilename);
         const displayName = selectDisplayName12(contents);
         const object = {
           id: selectIdentifier12(contents),
@@ -932,7 +932,7 @@ var CompositionListModule = {
       state: convertCompositionState(state),
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
-      skipParameterResolution: !resolveOverrides
+      skipOverridesResolution: !resolveOverrides
     });
     emitWithFormat(res.compositions, format, filename);
   }
@@ -960,7 +960,6 @@ function createComponentInstanceEngineDataSource({
         offset,
         state: stateId,
         skipPatternResolution: true,
-        skipParameterResolution: true,
         skipOverridesResolution: true,
         withComponentIDs: true
       })).compositions,
@@ -3102,7 +3101,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.11.0",
+  version: "19.13.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3130,14 +3129,14 @@ var package_default = {
     graphql: "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    inquirer: "9.2.3",
+    inquirer: "9.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: "9.1.0",
-    ora: "6.3.0",
+    ora: "6.3.1",
     "posthog-node": "3.1.1",
     slugify: "1.6.6",
     yargs: "^17.6.2",
@@ -3149,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.9",
+    "@types/node": "18.16.13",
     "@types/yargs": "17.0.24"
   },
   bin: {
@@ -3321,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(
@@ -3334,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) {
@@ -3363,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",
@@ -4912,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
@@ -4934,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;
     }
@@ -4948,7 +4952,7 @@ function createRedirectDefinitionEngineDataSource({
       await client.deleteRedirect(providerId);
     },
     writeObject: async (object) => {
-      await client.upsertRedirect(object.object.redirect);
+      await client.upsertRedirect(object.object);
     }
   };
 }
@@ -5003,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) => {
@@ -5073,7 +5077,7 @@ var RedirectDefinitionPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage3(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: packageContents ?? [],
+        objects: packageContents.redirects ?? [],
         selectIdentifier: selectIdentifier11,
         selectDisplayName: selectDisplayName11
       });
@@ -5126,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.11.0",
+  "version": "19.13.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,10 +16,10 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.11.0",
-    "@uniformdev/context": "19.11.0",
-    "@uniformdev/project-map": "19.11.0",
-    "@uniformdev/redirect": "19.11.0",
+    "@uniformdev/canvas": "19.13.0",
+    "@uniformdev/context": "19.13.0",
+    "@uniformdev/project-map": "19.13.0",
+    "@uniformdev/redirect": "19.13.0",
     "ansi-colors": "^4.1.3",
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
@@ -28,14 +28,14 @@
     "graphql": "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    "inquirer": "9.2.3",
+    "inquirer": "9.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": "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.9",
+    "@types/node": "18.16.13",
     "@types/yargs": "17.0.24"
   },
   "bin": {
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "25d492fe923f313b517cbc70d3ff13fdcf97fa34"
+  "gitHead": "1670a0e2475a7a98745ea737cd3b2b09649fe1a1"
 }