@uniformdev/cli 18.17.1-alpha.13 → 18.19.0

package/dist/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -886,6 +890,8 @@ var require_route = __commonJS({
       const models = Object.keys(conversions);
       for (let len = models.length, i = 0; i < len; i++) {
         graph[models[i]] = {
+          // http://jsperf.com/1-vs-infinity
+          // micro-opt, but this is simple.
           distance: -1,
           parent: null
         };
@@ -1061,6 +1067,7 @@ var require_ansi_styles = __commonJS({
       const styles = {
         modifier: {
           reset: [0, 0],
+          // 21 isn't widely supported and 22 does the same thing
           bold: [1, 22],
           dim: [2, 22],
           italic: [3, 23],
@@ -1078,6 +1085,7 @@ var require_ansi_styles = __commonJS({
           magenta: [35, 39],
           cyan: [36, 39],
           white: [37, 39],
+          // Bright color
           blackBright: [90, 39],
           redBright: [91, 39],
           greenBright: [92, 39],
@@ -1096,6 +1104,7 @@ var require_ansi_styles = __commonJS({
           bgMagenta: [45, 49],
           bgCyan: [46, 49],
           bgWhite: [47, 49],
+          // Bright color
           bgBlackBright: [100, 49],
           bgRedBright: [101, 49],
           bgGreenBright: [102, 49],
@@ -1664,7 +1673,13 @@ function withApiOptions(yargs18) {
   var _a, _b, _c;
   return yargs18.option("apiKey", {
     describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
-    default: (_c = (_b = (_a = process.env.UNIFORM_CLI_API_KEY) != null ? _a : process.env.CANVAS_CLI_API_KEY) != null ? _b : process.env.UPM_CLI_API_KEY) != null ? _c : process.env.UNIFORM_API_KEY,
+    default: (_c = (_b = (_a = process.env.UNIFORM_CLI_API_KEY) != null ? _a : (
+      // deprecated
+      process.env.CANVAS_CLI_API_KEY
+    )) != null ? _b : (
+      // deprecated
+      process.env.UPM_CLI_API_KEY
+    )) != null ? _c : process.env.UNIFORM_API_KEY,
     demandOption: true,
     type: "string"
   }).option("apiHost", {
@@ -1703,7 +1718,13 @@ function withProjectOptions(yargs18) {
   var _a, _b, _c;
   return yargs18.option("project", {
     describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
-    default: (_c = (_b = (_a = process.env.UNIFORM_CLI_PROJECT_ID) != null ? _a : process.env.CANVAS_CLI_PROJECT_ID) != null ? _b : process.env.UPM_CLI_PROJECT_ID) != null ? _c : process.env.UNIFORM_PROJECT_ID,
+    default: (_c = (_b = (_a = process.env.UNIFORM_CLI_PROJECT_ID) != null ? _a : (
+      // deprecated
+      process.env.CANVAS_CLI_PROJECT_ID
+    )) != null ? _b : (
+      // deprecated
+      process.env.UPM_CLI_PROJECT_ID
+    )) != null ? _c : process.env.UNIFORM_PROJECT_ID,
     demandOption: true,
     type: "string",
     alias: ["p"]
@@ -1867,6 +1888,7 @@ async function syncEngine({
   mode,
   allowEmptySource = false,
   whatIf = false,
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   log = () => {
   }
 }) {
@@ -2523,6 +2545,10 @@ var CompositionListModule = {
               default: false,
               describe: "Resolve pattern references in the composition"
             },
+            resolveOverrides: {
+              type: "boolean",
+              default: false
+            },
             componentIDs: {
               type: "boolean",
               default: false,
@@ -2544,6 +2570,7 @@ var CompositionListModule = {
     project: projectId,
     state,
     resolvePatterns,
+    resolveOverrides,
     componentIDs
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -2553,7 +2580,8 @@ var CompositionListModule = {
       offset,
       state: convertCompositionState(state),
       skipPatternResolution: !resolvePatterns,
-      withComponentIDs: componentIDs
+      withComponentIDs: componentIDs,
+      skipParameterResolution: !resolveOverrides
     });
     emitWithFormat(res.compositions, format, filename);
   }
@@ -2585,6 +2613,7 @@ function createComponentInstanceEngineDataSource({
         state: stateId,
         skipPatternResolution: true,
         skipParameterResolution: true,
+        skipOverridesResolution: true,
         withComponentIDs: true
       })).compositions,
       { pageSize: 100 }
@@ -2900,6 +2929,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" })
       )
     )
@@ -4717,104 +4747,189 @@ var ContextCommand = {
   }
 };
 
-// src/commands/new/commands/new.ts
-var import_inquirer4 = __toESM(require("inquirer"));
-
-// src/commands/new/actions/chooseTeam.ts
-var import_inquirer = __toESM(require("inquirer"));
-async function chooseTeam(user, prompt, telemetry) {
-  const result = await import_inquirer.default.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
 var import_crypto = __toESM(require("crypto"));
-var import_fs6 = __toESM(require("fs"));
-var import_fs_jetpack = require("fs-jetpack");
-var git = __toESM(require("isomorphic-git"));
-var http = __toESM(require("isomorphic-git/http/node"));
-var import_os = __toESM(require("os"));
-var import_path3 = __toESM(require("path"));
+var import_posthog_node = require("posthog-node");
 
-// src/commands/new/npm.ts
-var import_execa = __toESM(require("execa"));
-var runNpm = async (workDir, args, { inherit, env } = {}) => {
-  let result;
-  try {
-    result = await (0, import_execa.default)("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.19.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:*",
+    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.5.3",
+    slugify: "1.6.5",
+    yargs: "^17.6.2",
+    zod: "3.20.6"
+  },
+  devDependencies: {
+    "@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"
+  },
+  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 = import_path3.default.join(import_os.default.tmpdir(), `uniform-new-${import_crypto.default.randomBytes(20).toString("hex")}`);
-  const [user, repo, ...pathSegments] = githubPath.split("/");
-  try {
-    await git.clone({
-      fs: import_fs6.default,
-      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 = import_crypto.default.randomBytes(20).toString("hex");
+    if (!disable) {
+      this.posthog = new import_posthog_node.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 (import_fs6.default.existsSync(targetDir) && import_fs6.default.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 = import_path3.default.join(cloneDir, ...pathSegments);
-  (0, import_fs_jetpack.copy)(starterDir, targetDir, { overwrite: true });
-  if (dotEnvFile) {
-    import_fs6.default.writeFileSync(import_path3.default.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
+var import_inquirer4 = __toESM(require("inquirer"));
+
+// src/auth/getBearerToken.ts
+var import_inquirer = __toESM(require("inquirer"));
+var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
+var import_open = __toESM(require("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 import_inquirer.default.prompt([
+    {
+      type: "confirm",
+      name: "canOpen",
+      message: "Can we open a browser window to get a Uniform auth token?"
+    }
+  ]);
+  if (canOpen) {
+    (0, import_open.default)(makeUrl(baseUrl, "/cli-login"));
+  }
+  const tokenAnswer = await import_inquirer.default.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 = import_jsonwebtoken.default.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
 var import_zod = require("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",
@@ -4862,10 +4977,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 = import_zod.z.object({ id: import_zod.z.string().min(1) });
 var createApiKeySchema = import_zod.z.object({ apiKey: import_zod.z.string().min(1) });
 var getLimitsSchema = import_zod.z.object({
@@ -5008,124 +5120,80 @@ var createClient = (baseUrl, authToken) => {
   };
 };
 
-// src/commands/new/user-info.ts
-var import_graphql_request = require("graphql-request");
-var import_zod2 = require("zod");
-var query = import_graphql_request.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 = import_zod2.z.object({
-  info: import_zod2.z.object({
-    name: import_zod2.z.string().min(1),
-    email_address: import_zod2.z.string().min(1),
-    teams: import_zod2.z.array(
-      import_zod2.z.object({
-        team: import_zod2.z.object({
-          name: import_zod2.z.string().min(1),
-          id: import_zod2.z.string().min(1),
-          sites: import_zod2.z.array(
-            import_zod2.z.object({
-              name: import_zod2.z.string().min(1),
-              id: import_zod2.z.string().min(1)
-            })
-          )
-        })
-      })
-    )
-  })
-});
-var getUserInfo = async (baseUrl, authToken, subject) => {
+// src/npm.ts
+var import_execa = __toESM(require("execa"));
+var runNpm = async (workDir, args, { inherit, env } = {}) => {
+  let result;
   try {
-    const endpoint = makeUrl(baseUrl, "/v1/graphql");
-    const res = await (0, import_graphql_request.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 (0, import_execa.default)("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
+var import_crypto2 = __toESM(require("crypto"));
+var import_fs6 = __toESM(require("fs"));
+var import_fs_jetpack = require("fs-jetpack");
+var git = __toESM(require("isomorphic-git"));
+var http = __toESM(require("isomorphic-git/http/node"));
+var import_os = __toESM(require("os"));
+var import_path3 = __toESM(require("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);
+  const done = await spin("Fetching starter code...");
+  const cloneDir = import_path3.default.join(import_os.default.tmpdir(), `uniform-new-${import_crypto2.default.randomBytes(20).toString("hex")}`);
+  const [user, repo, ...pathSegments] = githubPath.split("/");
+  try {
+    await git.clone({
+      fs: import_fs6.default,
+      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}`);
   }
   await done();
-  telemetry.login(decoded.sub, user);
-  return user;
-}
-
-// src/commands/new/actions/getBearerToken.ts
-var import_inquirer2 = __toESM(require("inquirer"));
-var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
-var import_open = __toESM(require("open"));
-async function getBearerToken(baseUrl) {
-  const { canOpen } = await import_inquirer2.default.prompt([
-    {
-      type: "confirm",
-      name: "canOpen",
-      message: "Can we open a browser window to get a Uniform auth token?"
-    }
-  ]);
-  if (canOpen) {
-    (0, import_open.default)(makeUrl(baseUrl, "/cli-login"));
-  }
-  const tokenAnswer = await import_inquirer2.default.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 = import_jsonwebtoken.default.decode(authToken, { complete: false });
-  if (!decoded) {
-    throw new Error("Could not parse the token pasted.");
+  if (import_fs6.default.existsSync(targetDir) && import_fs6.default.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 = import_path3.default.join(cloneDir, ...pathSegments);
+  (0, import_fs_jetpack.copy)(starterDir, targetDir, { overwrite: true });
+  if (dotEnvFile) {
+    import_fs6.default.writeFileSync(import_path3.default.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
 var import_fs7 = __toESM(require("fs"));
-var import_inquirer3 = __toESM(require("inquirer"));
+var import_inquirer2 = __toESM(require("inquirer"));
 var import_path4 = __toESM(require("path"));
 var import_slugify = __toESM(require("slugify"));
 var newProjectId = "$new";
@@ -5183,7 +5251,7 @@ async function getNewProjectName({
 }) {
   let projectName = explicitName;
   if (!projectName) {
-    const answer = await import_inquirer3.default.prompt([
+    const answer = await import_inquirer2.default.prompt([
       {
         type: "input",
         name: "name",
@@ -5227,7 +5295,7 @@ async function chooseExistingProject({
     value: t.id
   }));
   const choices = createNew ? [{ name: "Create new project...", value: newProjectId }].concat(projects) : projects;
-  const result = await import_inquirer3.default.prompt([
+  const result = await import_inquirer2.default.prompt([
     {
       type: "list",
       name: "projectId",
@@ -5261,6 +5329,100 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
   }
 }
 
+// src/teams/chooseTeam.ts
+var import_inquirer3 = __toESM(require("inquirer"));
+async function chooseTeam(user, prompt, telemetry) {
+  const result = await import_inquirer3.default.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
+var import_graphql_request = require("graphql-request");
+var import_zod2 = require("zod");
+var query = import_graphql_request.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 = import_zod2.z.object({
+  info: import_zod2.z.object({
+    name: import_zod2.z.string().min(1),
+    email_address: import_zod2.z.string().min(1),
+    teams: import_zod2.z.array(
+      import_zod2.z.object({
+        team: import_zod2.z.object({
+          name: import_zod2.z.string().min(1),
+          id: import_zod2.z.string().min(1),
+          sites: import_zod2.z.array(
+            import_zod2.z.object({
+              name: import_zod2.z.string().min(1),
+              id: import_zod2.z.string().min(1)
+            })
+          )
+        })
+      })
+    )
+  })
+});
+var getUserInfo = async (baseUrl, authToken, subject) => {
+  try {
+    const endpoint = makeUrl(baseUrl, "/v1/graphql");
+    const res = await (0, import_graphql_request.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,
@@ -5492,138 +5654,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
-var import_crypto2 = __toESM(require("crypto"));
-var import_posthog_node = require("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 = import_crypto2.default.randomBytes(20).toString("hex");
-    if (!disable) {
-      this.posthog = new import_posthog_node.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;