apiblaze 0.20.2 → 0.20.3

package/dist/index.js

@@ -932,7 +932,7 @@ var import_commander = require("commander");
 var import_chalk51 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.20.2";
+var version = "0.20.3";
 
 // src/index.ts
 init_types();
@@ -3666,7 +3666,7 @@ async function runRecipeInstall(nameArg, opts) {
   const assumeYes = !!opts.yes;
   const interactive = !!process.stdin.isTTY && !assumeYes;
   const caller = requireCallerForInstall();
-  const recipe = await fetchRecipeFile(ref, caller);
+  let recipe = await fetchRecipeFile(ref, caller);
   const pinned = `${recipe.name}@${recipe.revision}`;
   const picked = await chooseTeam(caller, opts.team, interactive);
   const teamId = picked.teamId;
@@ -3677,6 +3677,7 @@ async function runRecipeInstall(nameArg, opts) {
   if (recipe.summary) console.log(`  ${recipe.summary}`);
   console.log();
   let project;
+  let reuseTenant = false;
   let apiVersion;
   let tenant2;
   let reinstall = false;
@@ -3691,15 +3692,19 @@ async function runRecipeInstall(nameArg, opts) {
   } else {
     project = await chooseProxyName(ref.slug, opts.as, teamId, interactive);
     apiVersion = recipe.api_version || "1.0.0";
-    tenant2 = `${project}users`;
-    await assertTenantFree(tenant2, teamId);
-    printSummary(recipe, project, tenant2);
+    const chosenTenant = await chooseTenant(caller, project, teamId, opts.tenant, interactive);
+    tenant2 = chosenTenant.tenant;
+    reuseTenant = chosenTenant.existing;
+    printSummary(recipe, project, tenant2, reuseTenant);
     if (!assumeYes && !await confirmYesNo("  continue?", interactive)) {
       console.log(import_chalk26.default.yellow("  Cancelled \u2014 nothing was created."));
       return;
     }
   }
   const ctx = { project, tenant: tenant2 };
+  if (reuseTenant) {
+    recipe = { ...recipe, auth: { app_client: null, provider: null, key_types: [] }, questions: [] };
+  }
   const declined = assumeYes ? declineAll(recipe.requires_confirmation ?? []) : await askConsent(recipe.requires_confirmation ?? [], interactive);
   const answers = await askQuestions(recipe.questions ?? [], ctx, interactive);
   const started = Date.now();
@@ -4102,7 +4107,7 @@ async function assertTenantFree(tenant2, teamId) {
     );
   }
 }
-function printSummary(recipe, project, tenant2) {
+function printSummary(recipe, project, tenant2, reuseTenant = false) {
   const hosts = upstreamHosts(recipe);
   const routes = countRoutes(recipe.openapi);
   const keyTypes = recipe.auth?.key_types?.length ?? 0;
@@ -4110,7 +4115,11 @@ function printSummary(recipe, project, tenant2) {
   console.log();
   if (hosts.length) console.log(`  ${import_chalk26.default.dim("sends requests to")}  ${hosts.join(", ")}`);
   console.log(`  ${import_chalk26.default.dim("creates          ")}  ${describeCreates(keyTypes, routes, recipe.settings.mcp_enabled === true)}`);
-  console.log(`  ${import_chalk26.default.dim("asks you for     ")}  ${questions} value${questions === 1 ? "" : "s"}`);
+  console.log(`  ${import_chalk26.default.dim("asks you for     ")}  ${reuseTenant ? "nothing" : `${questions} value${questions === 1 ? "" : "s"}`}`);
+  if (reuseTenant) {
+    console.log(`  ${import_chalk26.default.dim("users live in    ")}  ${tenant2} ${import_chalk26.default.dim("(existing \u2014 its login is used as it is)")}`);
+    console.log(import_chalk26.default.dim(`  ${" ".repeat(17)}  the recipe's own login setup is not applied`));
+  }
   if (recipe.settings.publish_openapi === true) {
     console.log(`  ${import_chalk26.default.dim("makes public     ")}  this API's spec, at ${project}.abz.run/${recipe.api_version}/openapi.json`);
   }
@@ -4300,6 +4309,55 @@ async function chooseTeam(caller, optTeam, interactive) {
   const match = teams.find((t) => t.teamId === picked);
   return { teamId: picked, teamName: match?.name, chosen: true };
 }
+async function chooseTenant(caller, project, teamId, optTenant, interactive) {
+  const fresh = `${project}users`;
+  const owned = await teamTenants(caller, teamId);
+  const isOwned = (t2) => owned.some((o) => o === t2);
+  if (optTenant) {
+    const t2 = normalizeName2(optTenant);
+    if (isOwned(t2)) return { tenant: t2, existing: true };
+    await assertTenantFree(t2, teamId);
+    return { tenant: t2, existing: false };
+  }
+  if (!interactive || !owned.length) {
+    await assertTenantFree(fresh, teamId);
+    return { tenant: fresh, existing: false };
+  }
+  const { default: inquirer3 } = await import("inquirer");
+  const { picked } = await inquirer3.prompt([{
+    type: "list",
+    name: "picked",
+    message: "  where should this proxy's users live?",
+    default: "__new__",
+    choices: [
+      { name: `create ${fresh}  ${import_chalk26.default.dim("(a fresh tenant, set up by the recipe)")}`, value: "__new__" },
+      new inquirer3.Separator(import_chalk26.default.dim("  \u2014 or reuse one you already have \u2014")),
+      ...owned.map((t2) => ({
+        name: `${t2}  ${import_chalk26.default.dim("(existing \u2014 its own login is kept)")}`,
+        value: t2
+      }))
+    ]
+  }]);
+  if (picked !== "__new__") return { tenant: picked, existing: true };
+  const { name } = await inquirer3.prompt([{
+    type: "input",
+    name: "name",
+    message: "  new tenant name",
+    default: fresh,
+    filter: (v) => normalizeName2(v)
+  }]);
+  const t = normalizeName2(String(name || fresh));
+  await assertTenantFree(t, teamId);
+  return { tenant: t, existing: false };
+}
+async function teamTenants(caller, teamId) {
+  const out = await producer(caller, {
+    method: "GET",
+    path: `/teams/${encodeURIComponent(teamId)}/tenants`,
+    summary: "List the team's tenants"
+  }).catch(() => ({ tenants: [] }));
+  return (out?.tenants ?? []).map((t) => typeof t === "string" ? t : t.disabled ? "" : t.tenant_name ?? t.name ?? "").filter(Boolean);
+}
 
 // src/commands/recipe-publish.ts
 var import_chalk27 = __toESM(require("chalk"));
@@ -10008,7 +10066,7 @@ program.command("projects").description("List the projects in your team").action
 });
 program.command("search").description("Find a published recipe \u2014 a whole working proxy someone else set up").argument("[query]", "Words to match against a recipe name or summary").option("--limit <n>", "Maximum results (default 25)").option("--json", "Output machine-readable JSON").action(action((query, opts) => runRecipeSearch(query, opts)));
 program.command("show").description("Read a recipe before you install it (upstreams, questions, transforms, spec)").argument("<recipe>", "Recipe name, e.g. @julien/gmail or @julien/gmail@2").option("--settings", "Print the settings section").option("--auth", "Print the auth section (login provider, key types)").option("--transforms", "Print the transform rules and mapping tables").option("--openapi", "Print the OpenAPI document").option("--json", "Output machine-readable JSON").action(action((recipe, opts) => runRecipeShow(recipe, opts)));
-program.command("install").description("Create a proxy from a recipe, with your own credentials").argument("<recipe>", "Recipe name, e.g. @julien/gmail or @julien/gmail@2 to pin a revision").option("--as <name>", "Proxy name (skips the name prompt)").option("--into <proxy>", "Reinstall over an existing proxy \u2014 replaces its settings, transforms and spec").option("--team <id|name>", "Team the proxy is created in (you are asked when you belong to several)").option("--apiversion <v>", "API version of the proxy named by --into").option("-y, --yes", "Skip the routine prompts (installs WITHOUT anything needing consent)").action(action((recipe, opts) => runRecipeInstall(recipe, opts)));
+program.command("install").description("Create a proxy from a recipe, with your own credentials").argument("<recipe>", "Recipe name, e.g. @julien/gmail or @julien/gmail@2 to pin a revision").option("--as <name>", "Proxy name (skips the name prompt)").option("--into <proxy>", "Reinstall over an existing proxy \u2014 replaces its settings, transforms and spec").option("--team <id|name>", "Team the proxy is created in (you are asked when you belong to several)").option("--apiversion <v>", "API version of the proxy named by --into").option("--tenant <slug>", "Where this proxy's users live. One of yours is reused as it is; a new name is created").option("-y, --yes", "Skip the routine prompts (installs WITHOUT anything needing consent)").action(action((recipe, opts) => runRecipeInstall(recipe, opts)));
 program.command("publish").description("Publish one of your proxies as a recipe others can install").argument("<project>", "Project name or id (see `apiblaze projects`)").option("--as <name>", "Recipe name. Defaults to your GitHub handle + the proxy name; pass `pokedex` for just the name, or `@acme/pokedex` to set both").option("--private", "Only your team can see or install it (default is public)").option("--tenant <slug>", "Which tenant's auth setup the recipe carries (asked when a proxy has several)").option("--display-name <text>", "Human-readable title").option("--summary <text>", "One-line description shown in search").option("--license <id>", "Licence identifier, e.g. MIT").option("--team <id|name>", "Team the project is in (defaults to active team)").option("--apiversion <v>", "API version to publish (defaults to the first match)").option("-y, --yes", "Skip routine confirmations (never accepts scanner findings)").option("--json", "Output machine-readable JSON").action(action((project, opts) => runRecipePublish(project, opts)));
 program.command("withdraw").description("Permanently delete one published recipe revision").argument("<recipe>", "Recipe revision, e.g. @julien/gmail@3").option("--team <id|name>", "Team that published it (defaults to active team)").option("--json", "Output machine-readable JSON").action(action((recipe, opts) => runRecipeWithdraw(recipe, opts)));
 program.command("delete").description("Delete a proxy and everything under it (asks first)").argument("<project>", "Project name or id (see `apiblaze projects`)").argument("[version]", "API version (defaults to the first match)").option("--team <id|name>", "Team the project is in (defaults to active team)").option("-y, --yes", "Skip the confirmation prompt").option("--json", "Output machine-readable JSON").action(action((project, version2, opts) => runDelete(project, version2, opts)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "description": "APIblaze CLI — Chat with your APIs, Manage your API keys, users and groups with the APIblaze serverless proxy",
   "keywords": [
     "apiblaze",