@uniformdev/cli 18.17.1-alpha.13 → 18.18.1-alpha.12

package/dist/index.mjs

@@ -2743,104 +2743,189 @@ var ContextCommand = {
   }
 };
 
-// src/commands/new/commands/new.ts
-import inquirer4 from "inquirer";
-
-// src/commands/new/actions/chooseTeam.ts
-import inquirer from "inquirer";
-async function chooseTeam(user, prompt, telemetry) {
-  const result = await inquirer.prompt([
-    {
-      type: "list",
-      name: "teamId",
-      message: prompt,
-      choices: user.teams.map((team) => ({
-        name: team.team.name,
-        value: team.team.id
-      }))
-    }
-  ]);
-  telemetry.send("team picked", { teamId: result.teamId });
-  return result;
-}
+// src/spinner.ts
+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());
+    spinners.push(spinner);
+    const minWait = new Promise((resolve) => setTimeout(resolve, 500));
+    return async () => {
+      await minWait;
+      spinner.stop();
+    };
+  };
+  return { stopAllSpinners, spin };
+};
 
-// src/commands/new/actions/cloneStarter.ts
+// src/telemetry/telemetry.ts
 import crypto from "crypto";
-import fs from "fs";
-import { copy } from "fs-jetpack";
-import * as git from "isomorphic-git";
-import * as http from "isomorphic-git/http/node";
-import os from "os";
-import path from "path";
+import { PostHog } from "posthog-node";
 
-// src/commands/new/npm.ts
-import execa from "execa";
-var runNpm = async (workDir, args, { inherit, env } = {}) => {
-  let result;
-  try {
-    result = await execa("npm", args, {
-      cwd: workDir,
-      env: env != null ? env : {},
-      ...inherit ? { stdout: "inherit", stderr: "inherit" } : {}
-    });
-  } catch (err) {
-    throw new Error(`Failed to execute npm ${args.join(" ")}
-${err.message}`);
-  }
-  if (result.exitCode !== 0) {
-    throw new Error(`Command npm ${args.join(" ")} exitted with code ${result == null ? void 0 : result.exitCode}}: ${result.stderr}`);
+// package.json
+var package_default = {
+  name: "@uniformdev/cli",
+  version: "18.18.0",
+  description: "Uniform command line interface tool",
+  license: "SEE LICENSE IN LICENSE.txt",
+  main: "./cli.js",
+  types: "./dist/index.d.ts",
+  sideEffects: false,
+  scripts: {
+    uniform: "node ./cli.js",
+    build: "tsup",
+    dev: "tsup --watch",
+    clean: "rimraf dist",
+    test: "jest --maxWorkers=1 --passWithNoTests",
+    lint: 'eslint "src/**/*.{js,ts,tsx}"',
+    format: 'prettier --write "src/**/*.{js,ts,tsx}"'
+  },
+  dependencies: {
+    "@uniformdev/canvas": "workspace:*",
+    "@uniformdev/context": "workspace:*",
+    "@uniformdev/project-map": "workspace:*",
+    execa: "5.1.1",
+    "fs-jetpack": "5.1.0",
+    graphql: "16.6.0",
+    "graphql-request": "5.1.0",
+    inquirer: "8.2.5",
+    "isomorphic-git": "1.21.0",
+    jsonwebtoken: "9.0.0",
+    open: "8.4.0",
+    ora: "6.1.2",
+    "posthog-node": "2.2.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/js-yaml": "4.0.5",
+    "@types/lodash.isequalwith": "4.4.7",
+    "@types/yargs": "17.0.22",
+    "p-limit": "4.0.0"
+  },
+  bin: {
+    uniform: "./cli.js"
+  },
+  files: [
+    "/dist"
+  ],
+  publishConfig: {
+    access: "public"
   }
-  return result.stdout;
 };
 
-// src/commands/new/actions/cloneStarter.ts
-async function cloneStarter({
-  spin,
-  githubPath,
-  targetDir,
-  dotEnvFile
-}) {
-  const done = await spin("Fetching starter code...");
-  const cloneDir = path.join(os.tmpdir(), `uniform-new-${crypto.randomBytes(20).toString("hex")}`);
-  const [user, repo, ...pathSegments] = githubPath.split("/");
-  try {
-    await git.clone({
-      fs,
-      http,
-      url: `https://github.com/${user}/${repo}`,
-      dir: cloneDir,
-      singleBranch: true,
-      depth: 1
+// src/telemetry/telemetry.ts
+var POSTHOG_WRITE_ONLY_KEY = "phc_c8YoKI9984KOHBfNrCRfIKvL56aYd5OpYxOdYexRzH7";
+var Telemetry = class {
+  constructor(prefix, disable = false) {
+    this.prefix = prefix;
+    this.distinctId = crypto.randomBytes(20).toString("hex");
+    if (!disable) {
+      this.posthog = new PostHog(POSTHOG_WRITE_ONLY_KEY, {
+        flushAt: 1,
+        flushInterval: 1
+      });
+      this.send("started");
+    }
+  }
+  login(sub, user) {
+    if (!this.posthog) {
+      return;
+    }
+    const alias = this.distinctId;
+    this.distinctId = sub;
+    this.posthog.alias({ distinctId: this.distinctId, alias });
+    this.posthog.identify({
+      distinctId: this.distinctId,
+      properties: {
+        email: user.email_address,
+        sub,
+        teamCount: user.teams.length
+      }
     });
-  } catch (err) {
-    throw new Error(`Failed to fetch starter code: ${err.message}`);
+    this.send("logged in");
   }
-  await done();
-  if (fs.existsSync(targetDir) && fs.readdirSync(targetDir).length > 0) {
-    throw new Error(`"${targetDir}" is not empty`);
+  send(event, properties = {}) {
+    var _a;
+    (_a = this.posthog) == null ? void 0 : _a.capture({
+      distinctId: this.distinctId,
+      event: [this.prefix, event].join(" "),
+      properties: {
+        version: package_default.version,
+        ...properties
+      }
+    });
   }
-  const starterDir = path.join(cloneDir, ...pathSegments);
-  copy(starterDir, targetDir, { overwrite: true });
-  if (dotEnvFile) {
-    fs.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
+  shutdown() {
+    var _a;
+    this.send("exited", { exitCode: process.exitCode });
+    return (_a = this.posthog) == null ? void 0 : _a.shutdownAsync();
   }
-  console.log(`
-Your project now lives in ${targetDir} \u2728`);
-  return {
-    runNpmInstall: async () => {
-      console.log(`
-Installing project dependencies...
+};
 
-`);
-      await runNpm(targetDir, ["i"], { inherit: true });
+// src/commands/new/commands/new.ts
+import inquirer4 from "inquirer";
+
+// src/auth/getBearerToken.ts
+import inquirer from "inquirer";
+import jwt from "jsonwebtoken";
+import open from "open";
+
+// src/url.ts
+var makeUrl = (baseUrl, path4) => [baseUrl.trim().replace(/\/+$/, ""), path4.trim().replace(/^\/+/, "")].join("/");
+
+// src/auth/getBearerToken.ts
+async function getBearerToken(baseUrl) {
+  const { canOpen } = await inquirer.prompt([
+    {
+      type: "confirm",
+      name: "canOpen",
+      message: "Can we open a browser window to get a Uniform auth token?"
     }
+  ]);
+  if (canOpen) {
+    open(makeUrl(baseUrl, "/cli-login"));
+  }
+  const tokenAnswer = await inquirer.prompt([
+    {
+      type: "password",
+      name: "authToken",
+      message: "Paste your Uniform auth token"
+    }
+  ]);
+  const authToken = tokenAnswer.authToken.trim();
+  if (!authToken) {
+    throw new Error("No auth token provided.");
+  }
+  const decoded = jwt.decode(authToken, { complete: false });
+  if (!decoded) {
+    throw new Error("Could not parse the token pasted.");
+  }
+  if (typeof decoded.sub !== "string" || typeof decoded === "string") {
+    throw new Error("Invalid token pasted.");
+  }
+  return {
+    authToken,
+    decoded: { ...decoded, sub: decoded.sub }
   };
 }
 
-// src/commands/new/client.ts
+// src/client.ts
 import { z } from "zod";
 
-// src/commands/new/api-key.ts
+// src/auth/api-key.ts
 var READ_PERMISSIONS = ["PROJECT", "UPM_PUB", "OPT_PUB", "OPT_READ", "UPM_READ"];
 var WRITE_PERMISSIONS = [
   "PROJECT",
@@ -2888,10 +2973,7 @@ var makeApiKey = (teamId, projectId, name, permissions) => ({
 var makeReadApiKey = (teamId, projectId) => makeApiKey(teamId, projectId, "Created by Uniform New (read)", READ_PERMISSIONS);
 var makeWriteApiKey = (teamId, projectId) => makeApiKey(teamId, projectId, "Created by Uniform New (write)", WRITE_PERMISSIONS);
 
-// src/commands/new/url.ts
-var makeUrl = (baseUrl, path4) => [baseUrl.trim().replace(/\/+$/, ""), path4.trim().replace(/^\/+/, "")].join("/");
-
-// src/commands/new/client.ts
+// src/client.ts
 var createTeamOrProjectSchema = z.object({ id: z.string().min(1) });
 var createApiKeySchema = z.object({ apiKey: z.string().min(1) });
 var getLimitsSchema = z.object({
@@ -3034,124 +3116,80 @@ var createClient = (baseUrl, authToken) => {
   };
 };
 
-// src/commands/new/user-info.ts
-import { gql, request } from "graphql-request";
-import { z as z2 } from "zod";
-var query = gql`
-  query GetUserInfo($subject: String!) {
-    info: identities_by_pk(subject: $subject) {
-      name
-      email_address
-      teams: organizations_identities {
-        team: organization {
-          name
-          id
-          sites {
-            name
-            id
-          }
-        }
-      }
-    }
-  }
-`;
-var schema = z2.object({
-  info: z2.object({
-    name: z2.string().min(1),
-    email_address: z2.string().min(1),
-    teams: z2.array(
-      z2.object({
-        team: z2.object({
-          name: z2.string().min(1),
-          id: z2.string().min(1),
-          sites: z2.array(
-            z2.object({
-              name: z2.string().min(1),
-              id: z2.string().min(1)
-            })
-          )
-        })
-      })
-    )
-  })
-});
-var getUserInfo = async (baseUrl, authToken, subject) => {
+// src/npm.ts
+import execa from "execa";
+var runNpm = async (workDir, args, { inherit, env } = {}) => {
+  let result;
   try {
-    const endpoint = makeUrl(baseUrl, "/v1/graphql");
-    const res = await request(endpoint, query, { subject }, { Authorization: `Bearer ${authToken}` });
-    const parseResult = schema.safeParse(res);
-    if (parseResult.success) {
-      return parseResult.data.info;
-    } else {
-      throw new Error(`Invalid GraphQL response: ${parseResult.error.message}`);
-    }
+    result = await execa("npm", args, {
+      cwd: workDir,
+      env: env != null ? env : {},
+      ...inherit ? { stdout: "inherit", stderr: "inherit" } : {}
+    });
   } catch (err) {
-    throw new Error(`Failed to fetch user account:
-  ${err.message}`);
+    throw new Error(`Failed to execute npm ${args.join(" ")}
+${err.message}`);
   }
+  if (result.exitCode !== 0) {
+    throw new Error(`Command npm ${args.join(" ")} exitted with code ${result == null ? void 0 : result.exitCode}}: ${result.stderr}`);
+  }
+  return result.stdout;
 };
 
-// src/commands/new/actions/fetchUserAndEnsureTeamExists.ts
-async function fetchUserAndEnsureFirstTeamExists({
-  baseUrl,
-  auth: { authToken, decoded },
+// src/projects/cloneStarter.ts
+import crypto2 from "crypto";
+import fs from "fs";
+import { copy } from "fs-jetpack";
+import * as git from "isomorphic-git";
+import * as http from "isomorphic-git/http/node";
+import os from "os";
+import path from "path";
+async function cloneStarter({
   spin,
-  telemetry
+  githubPath,
+  targetDir,
+  dotEnvFile
 }) {
-  const uniformClient = createClient(baseUrl, authToken);
-  const done = await spin("Fetching user information...");
-  let user = await getUserInfo(baseUrl, authToken, decoded.sub);
-  if (user.teams.length < 1) {
-    await uniformClient.createTeam(`${user.name}'s team`);
-    user = await getUserInfo(baseUrl, authToken, decoded.sub);
-  }
-  await done();
-  telemetry.login(decoded.sub, user);
-  return user;
-}
-
-// src/commands/new/actions/getBearerToken.ts
-import inquirer2 from "inquirer";
-import jwt from "jsonwebtoken";
-import open from "open";
-async function getBearerToken(baseUrl) {
-  const { canOpen } = await inquirer2.prompt([
-    {
-      type: "confirm",
-      name: "canOpen",
-      message: "Can we open a browser window to get a Uniform auth token?"
-    }
-  ]);
-  if (canOpen) {
-    open(makeUrl(baseUrl, "/cli-login"));
-  }
-  const tokenAnswer = await inquirer2.prompt([
-    {
-      type: "password",
-      name: "authToken",
-      message: "Paste your Uniform auth token"
-    }
-  ]);
-  const authToken = tokenAnswer.authToken.trim();
-  if (!authToken) {
-    throw new Error("No auth token provided.");
+  const done = await spin("Fetching starter code...");
+  const cloneDir = path.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
+  const [user, repo, ...pathSegments] = githubPath.split("/");
+  try {
+    await git.clone({
+      fs,
+      http,
+      url: `https://github.com/${user}/${repo}`,
+      dir: cloneDir,
+      singleBranch: true,
+      depth: 1
+    });
+  } catch (err) {
+    throw new Error(`Failed to fetch starter code: ${err.message}`);
   }
-  const decoded = jwt.decode(authToken, { complete: false });
-  if (!decoded) {
-    throw new Error("Could not parse the token pasted.");
+  await done();
+  if (fs.existsSync(targetDir) && fs.readdirSync(targetDir).length > 0) {
+    throw new Error(`"${targetDir}" is not empty`);
   }
-  if (typeof decoded.sub !== "string" || typeof decoded === "string") {
-    throw new Error("Invalid token pasted.");
+  const starterDir = path.join(cloneDir, ...pathSegments);
+  copy(starterDir, targetDir, { overwrite: true });
+  if (dotEnvFile) {
+    fs.writeFileSync(path.resolve(targetDir, ".env"), dotEnvFile, "utf-8");
   }
+  console.log(`
+Your project now lives in ${targetDir} \u2728`);
   return {
-    authToken,
-    decoded: { ...decoded, sub: decoded.sub }
+    runNpmInstall: async () => {
+      console.log(`
+Installing project dependencies...
+
+`);
+      await runNpm(targetDir, ["i"], { inherit: true });
+    }
   };
 }
 
-// src/commands/new/actions/getOrCreateProject.ts
+// src/projects/getOrCreateProject.ts
 import fs2, { existsSync, mkdirSync } from "fs";
-import inquirer3 from "inquirer";
+import inquirer2 from "inquirer";
 import path2 from "path";
 import slugify from "slugify";
 var newProjectId = "$new";
@@ -3209,7 +3247,7 @@ async function getNewProjectName({
 }) {
   let projectName = explicitName;
   if (!projectName) {
-    const answer = await inquirer3.prompt([
+    const answer = await inquirer2.prompt([
       {
         type: "input",
         name: "name",
@@ -3253,7 +3291,7 @@ async function chooseExistingProject({
     value: t.id
   }));
   const choices = createNew ? [{ name: "Create new project...", value: newProjectId }].concat(projects) : projects;
-  const result = await inquirer3.prompt([
+  const result = await inquirer2.prompt([
     {
       type: "list",
       name: "projectId",
@@ -3287,6 +3325,100 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
   }
 }
 
+// src/teams/chooseTeam.ts
+import inquirer3 from "inquirer";
+async function chooseTeam(user, prompt, telemetry) {
+  const result = await inquirer3.prompt([
+    {
+      type: "list",
+      name: "teamId",
+      message: prompt,
+      choices: user.teams.map((team) => ({
+        name: team.team.name,
+        value: team.team.id
+      }))
+    }
+  ]);
+  telemetry.send("team picked", { teamId: result.teamId });
+  return result;
+}
+
+// src/auth/user-info.ts
+import { gql, request } from "graphql-request";
+import { z as z2 } from "zod";
+var query = gql`
+  query GetUserInfo($subject: String!) {
+    info: identities_by_pk(subject: $subject) {
+      name
+      email_address
+      teams: organizations_identities {
+        team: organization {
+          name
+          id
+          sites {
+            name
+            id
+          }
+        }
+      }
+    }
+  }
+`;
+var schema = z2.object({
+  info: z2.object({
+    name: z2.string().min(1),
+    email_address: z2.string().min(1),
+    teams: z2.array(
+      z2.object({
+        team: z2.object({
+          name: z2.string().min(1),
+          id: z2.string().min(1),
+          sites: z2.array(
+            z2.object({
+              name: z2.string().min(1),
+              id: z2.string().min(1)
+            })
+          )
+        })
+      })
+    )
+  })
+});
+var getUserInfo = async (baseUrl, authToken, subject) => {
+  try {
+    const endpoint = makeUrl(baseUrl, "/v1/graphql");
+    const res = await request(endpoint, query, { subject }, { Authorization: `Bearer ${authToken}` });
+    const parseResult = schema.safeParse(res);
+    if (parseResult.success) {
+      return parseResult.data.info;
+    } else {
+      throw new Error(`Invalid GraphQL response: ${parseResult.error.message}`);
+    }
+  } catch (err) {
+    throw new Error(`Failed to fetch user account:
+  ${err.message}`);
+  }
+};
+
+// src/teams/fetchUserAndEnsureTeamExists.ts
+async function fetchUserAndEnsureFirstTeamExists({
+  baseUrl,
+  auth: { authToken, decoded },
+  spin,
+  telemetry
+}) {
+  const uniformClient = createClient(baseUrl, authToken);
+  const done = await spin("Fetching user information...");
+  let user = await getUserInfo(baseUrl, authToken, decoded.sub);
+  if (user.teams.length < 1) {
+    await uniformClient.createTeam(`${user.name}'s team`);
+    user = await getUserInfo(baseUrl, authToken, decoded.sub);
+  }
+  await done();
+  telemetry.login(decoded.sub, user);
+  return user;
+}
+
 // src/commands/new/commands/new.ts
 async function newHandler({
   spin,
@@ -3518,138 +3650,6 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
   return { targetDir, typeSlug };
 }
 
-// src/commands/new/spinner.ts
-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());
-    spinners.push(spinner);
-    const minWait = new Promise((resolve) => setTimeout(resolve, 500));
-    return async () => {
-      await minWait;
-      spinner.stop();
-    };
-  };
-  return { stopAllSpinners, spin };
-};
-
-// src/commands/new/telemetry.ts
-import crypto2 from "crypto";
-import { PostHog } from "posthog-node";
-
-// package.json
-var package_default = {
-  name: "@uniformdev/cli",
-  version: "18.17.0",
-  description: "Uniform command line interface tool",
-  license: "SEE LICENSE IN LICENSE.txt",
-  main: "./cli.js",
-  types: "./dist/index.d.ts",
-  sideEffects: false,
-  scripts: {
-    uniform: "node ./cli.js",
-    build: "tsup",
-    dev: "tsup --watch",
-    clean: "rimraf dist",
-    test: "jest --maxWorkers=1 --passWithNoTests",
-    lint: 'eslint "src/**/*.{js,ts,tsx}"',
-    format: 'prettier --write "src/**/*.{js,ts,tsx}"'
-  },
-  dependencies: {
-    "@uniformdev/canvas": "workspace:*",
-    "@uniformdev/context": "workspace:*",
-    "@uniformdev/project-map": "workspace:*",
-    execa: "5.1.1",
-    "fs-jetpack": "5.1.0",
-    graphql: "16.6.0",
-    "graphql-request": "5.1.0",
-    inquirer: "8.2.5",
-    "isomorphic-git": "1.21.0",
-    jsonwebtoken: "9.0.0",
-    open: "8.4.0",
-    ora: "6.1.2",
-    "posthog-node": "2.2.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.2"
-  },
-  devDependencies: {
-    "@types/inquirer": "9.0.3",
-    "@types/jsonwebtoken": "9.0.1",
-    "@types/node": "18.11.17",
-    "@types/diff": "5.0.2",
-    "@types/js-yaml": "4.0.5",
-    "@types/lodash.isequalwith": "4.4.7",
-    "@types/yargs": "17.0.22",
-    "p-limit": "4.0.0"
-  },
-  bin: {
-    uniform: "./cli.js"
-  },
-  files: [
-    "/dist"
-  ],
-  publishConfig: {
-    access: "public"
-  }
-};
-
-// src/commands/new/telemetry.ts
-var POSTHOG_WRITE_ONLY_KEY = "phc_c8YoKI9984KOHBfNrCRfIKvL56aYd5OpYxOdYexRzH7";
-var Telemetry = class {
-  constructor(prefix, disable = false) {
-    this.prefix = prefix;
-    this.distinctId = crypto2.randomBytes(20).toString("hex");
-    if (!disable) {
-      this.posthog = new PostHog(POSTHOG_WRITE_ONLY_KEY, {
-        flushAt: 1,
-        flushInterval: 1
-      });
-      this.send("started");
-    }
-  }
-  login(sub, user) {
-    if (!this.posthog) {
-      return;
-    }
-    const alias = this.distinctId;
-    this.distinctId = sub;
-    this.posthog.alias({ distinctId: this.distinctId, alias });
-    this.posthog.identify({
-      distinctId: this.distinctId,
-      properties: {
-        email: user.email_address,
-        sub,
-        teamCount: user.teams.length
-      }
-    });
-    this.send("logged in");
-  }
-  send(event, properties = {}) {
-    var _a;
-    (_a = this.posthog) == null ? void 0 : _a.capture({
-      distinctId: this.distinctId,
-      event: [this.prefix, event].join(" "),
-      properties: {
-        version: package_default.version,
-        ...properties
-      }
-    });
-  }
-  shutdown() {
-    var _a;
-    this.send("exited", { exitCode: process.exitCode });
-    return (_a = this.posthog) == null ? void 0 : _a.shutdownAsync();
-  }
-};
-
 // src/commands/new/index.ts
 var stableApiHost = "https://uniform.app";
 var apiHostDefault = process.env.UNIFORM_CLI_BASE_URL || stableApiHost;