@saptools/bruno 0.3.1 → 0.3.2

package/dist/index.js

@@ -3,38 +3,7 @@
 // src/types.ts
 var CF_META_KEYS = ["__cf_region", "__cf_org", "__cf_space", "__cf_app"];
 
-// src/paths.ts
-import { homedir } from "os";
-import { join } from "path";
-var SAPTOOLS_DIR_NAME = ".saptools";
-var BRUNO_CONTEXT_FILENAME = "bruno-context.json";
-var REGION_FOLDER_PREFIX = "region__";
-var ORG_FOLDER_PREFIX = "org__";
-var SPACE_FOLDER_PREFIX = "space__";
-var ENVIRONMENTS_DIR = "environments";
-function saptoolsDir() {
-  return join(homedir(), SAPTOOLS_DIR_NAME);
-}
-function brunoContextPath() {
-  return join(saptoolsDir(), BRUNO_CONTEXT_FILENAME);
-}
-function regionFolderName(key) {
-  return `${REGION_FOLDER_PREFIX}${key}`;
-}
-function orgFolderName(name) {
-  return `${ORG_FOLDER_PREFIX}${name}`;
-}
-function spaceFolderName(name) {
-  return `${SPACE_FOLDER_PREFIX}${name}`;
-}
-function parsePrefixedName(dirName, prefix) {
-  if (!dirName.startsWith(prefix)) {
-    return void 0;
-  }
-  return dirName.slice(prefix.length);
-}
-
-// src/bru-parser.ts
+// src/bruno/parser.ts
 var HEADER_REGEX = /(^|\n)[^\S\n]*([a-zA-Z][a-zA-Z0-9:_-]*)[^\S\n]*([{[])/g;
 function findMatchingClose(raw, open, openIdx) {
   const close = open === "{" ? "}" : "]";
@@ -122,7 +91,7 @@ function parseBruEnvFile(raw) {
   return { vars: { entries }, secrets };
 }
 
-// src/bru-writer.ts
+// src/bruno/writer.ts
 function formatVarsBlock(entries) {
   const lines = [];
   for (const [key, value] of entries) {
@@ -185,7 +154,7 @@ function ensureSecretEntry(raw, secretName) {
   return { content: `${before}${rebuilt}${after}`, changed: true };
 }
 
-// src/cf-info.ts
+// src/cf/info.ts
 import {
   getRegionView as getRegionViewApi,
   readRegionsView,
@@ -260,7 +229,7 @@ async function resolveRef(ref, deps = defaultCfInfoDeps) {
   return { region, org, space, app };
 }
 
-// src/cf-meta.ts
+// src/cf/meta.ts
 import { readFile, writeFile } from "fs/promises";
 function readCfMetaFromVars(vars) {
   const region = vars.get("__cf_region");
@@ -309,9 +278,42 @@ async function writeCfMetaToFile(path, ref, baseUrl) {
   return changed;
 }
 
-// src/folder-scan.ts
+// src/collection/folder-scan.ts
 import { readdir, readFile as readFile2 } from "fs/promises";
 import { join as join2 } from "path";
+
+// src/collection/paths.ts
+import { homedir } from "os";
+import { join } from "path";
+var SAPTOOLS_DIR_NAME = ".saptools";
+var BRUNO_CONTEXT_FILENAME = "bruno-context.json";
+var REGION_FOLDER_PREFIX = "region__";
+var ORG_FOLDER_PREFIX = "org__";
+var SPACE_FOLDER_PREFIX = "space__";
+var ENVIRONMENTS_DIR = "environments";
+function saptoolsDir() {
+  return join(homedir(), SAPTOOLS_DIR_NAME);
+}
+function brunoContextPath() {
+  return join(saptoolsDir(), BRUNO_CONTEXT_FILENAME);
+}
+function regionFolderName(key) {
+  return `${REGION_FOLDER_PREFIX}${key}`;
+}
+function orgFolderName(name) {
+  return `${ORG_FOLDER_PREFIX}${name}`;
+}
+function spaceFolderName(name) {
+  return `${SPACE_FOLDER_PREFIX}${name}`;
+}
+function parsePrefixedName(dirName, prefix) {
+  if (!dirName.startsWith(prefix)) {
+    return void 0;
+  }
+  return dirName.slice(prefix.length);
+}
+
+// src/collection/folder-scan.ts
 async function safeReaddir(path) {
   try {
     const entries = await readdir(path, { withFileTypes: true });
@@ -429,193 +431,11 @@ function parseShorthandPath(shorthand) {
   return environment ? { region, org, space, app, environment, filePath } : { region, org, space, app, filePath };
 }
 
-// src/context.ts
-import { mkdir, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { dirname } from "path";
-async function readContext() {
-  try {
-    const raw = await readFile3(brunoContextPath(), "utf8");
-    return JSON.parse(raw);
-  } catch (err) {
-    if (err.code === "ENOENT") {
-      return void 0;
-    }
-    throw err;
-  }
-}
-async function writeContext(ctx) {
-  const updated = { ...ctx, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  const path = brunoContextPath();
-  await mkdir(dirname(path), { recursive: true });
-  await writeFile2(path, `${JSON.stringify(updated, null, 2)}
-`, "utf8");
-  return updated;
-}
-
-// src/setup-app.ts
-import { mkdir as mkdir2, readdir as readdir2, writeFile as writeFile3 } from "fs/promises";
-import { basename, join as join3 } from "path";
-var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
-var BRUNO_COLLECTION_CONFIG_FILENAME = "bruno.json";
-var ENV_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
-function assertValidEnvName(name) {
-  if (!ENV_NAME_PATTERN.test(name)) {
-    throw new Error(
-      `Invalid environment name '${name}': only letters, digits, dot, underscore, and dash are allowed.`
-    );
-  }
-}
-function emptyEnvContent(envName, ref) {
-  const lines = [
-    "vars {",
-    `  __cf_region: ${ref.region}`,
-    `  __cf_org: ${ref.org}`,
-    `  __cf_space: ${ref.space}`,
-    `  __cf_app: ${ref.app}`,
-    `  environment: ${envName}`,
-    "  baseUrl: ",
-    "}",
-    ""
-  ];
-  return lines.join("\n");
-}
-function normalizeCollectionName(root) {
-  const candidate = basename(root).replace(/^\.+/, "").trim();
-  return candidate.length > 0 ? candidate : "bruno-collection";
-}
-function defaultBrunoConfig(root) {
-  return `${JSON.stringify(
-    {
-      version: "1",
-      name: normalizeCollectionName(root),
-      type: "collection",
-      ignore: ["node_modules", ".git"]
-    },
-    null,
-    2
-  )}
-`;
-}
-async function ensureCollectionConfig(root) {
-  const filePath = join3(root, BRUNO_COLLECTION_CONFIG_FILENAME);
-  try {
-    await writeFile3(filePath, defaultBrunoConfig(root), { encoding: "utf8", flag: "wx" });
-  } catch (err) {
-    if (err.code !== "EEXIST") {
-      throw err;
-    }
-  }
-}
-async function ensureEnvFile(appPath, envName, ref) {
-  const envDir = join3(appPath, ENVIRONMENTS_DIR);
-  await mkdir2(envDir, { recursive: true });
-  const filePath = join3(envDir, `${envName}.bru`);
-  try {
-    await writeFile3(filePath, emptyEnvContent(envName, ref), { encoding: "utf8", flag: "wx" });
-  } catch (err) {
-    if (err.code !== "EEXIST") {
-      throw err;
-    }
-    await writeCfMetaToFile(filePath, ref);
-  }
-  return filePath;
-}
-function pickRegion(regions) {
-  return regions.map((r) => ({ value: r.key, name: `${r.key} \u2014 ${r.label} (${r.orgCount.toString()} org${r.orgCount === 1 ? "" : "s"})` }));
-}
-function pickOrg(region) {
-  return region.orgs.map((o) => ({ value: o.name, name: `${o.name} (${o.spaces.length.toString()} space${o.spaces.length === 1 ? "" : "s"})` }));
-}
-function pickSpace(org) {
-  return org.spaces.map((s) => ({ value: s.name, name: `${s.name} (${s.apps.length.toString()} app${s.apps.length === 1 ? "" : "s"})` }));
-}
-function pickApp(space) {
-  return space.apps.map((a) => ({ value: a.name, name: a.name }));
-}
-async function setupApp(options) {
-  const deps = options.deps ?? defaultCfInfoDeps;
-  const log = options.log ?? (() => void 0);
-  const regions = await listRegionsWithContent(deps);
-  if (regions.length === 0) {
-    throw new Error("No CF regions with orgs are cached. Run `cf-sync sync` first.");
-  }
-  const regionKey = await options.prompts.selectRegion(pickRegion(regions));
-  const regionView = await deps.readRegionView(regionKey);
-  if (!regionView) {
-    throw new Error(`Region ${regionKey} is not cached. Run \`cf-sync region ${regionKey}\` or \`cf-sync sync\` first.`);
-  }
-  const region = regionView.region;
-  if (region.orgs.length === 0) {
-    throw new Error(`Region ${regionKey} has no accessible orgs.`);
-  }
-  const orgName = await options.prompts.selectOrg(pickOrg(region));
-  const org = region.orgs.find((o) => o.name === orgName);
-  if (!org) {
-    throw new Error(`Org ${orgName} not found in region ${regionKey}`);
-  }
-  if (org.spaces.length === 0) {
-    throw new Error(`Org ${orgName} has no spaces.`);
-  }
-  const spaceName = await options.prompts.selectSpace(pickSpace(org));
-  const space = org.spaces.find((s) => s.name === spaceName);
-  if (!space) {
-    throw new Error(`Space ${spaceName} not found in org ${orgName}`);
-  }
-  if (space.apps.length === 0) {
-    throw new Error(`Space ${spaceName} has no apps.`);
-  }
-  const appName = await options.prompts.selectApp(pickApp(space));
-  const ref = { region: regionKey, org: orgName, space: spaceName, app: appName };
-  const appPath = join3(
-    options.root,
-    regionFolderName(regionKey),
-    orgFolderName(orgName),
-    spaceFolderName(spaceName),
-    appName
-  );
-  const confirmed = await options.prompts.confirmCreate(appPath);
-  if (!confirmed) {
-    return { ref, appPath, environments: [], created: false };
-  }
-  await mkdir2(appPath, { recursive: true });
-  await ensureCollectionConfig(appPath);
-  const existingEnvs = await listExistingEnvs(appPath);
-  const common = [...COMMON_ENVIRONMENTS];
-  const selected = await options.prompts.selectEnvironments({ common, existing: existingEnvs });
-  const merged = [];
-  for (const name of selected) {
-    const trimmed = name.trim();
-    if (trimmed.length === 0 || merged.includes(trimmed)) {
-      continue;
-    }
-    assertValidEnvName(trimmed);
-    merged.push(trimmed);
-  }
-  if (merged.length === 0) {
-    throw new Error("At least one environment is required.");
-  }
-  const created = [];
-  for (const envName of merged) {
-    const path = await ensureEnvFile(appPath, envName, ref);
-    created.push(path);
-    log(`\u2022 ${path}`);
-  }
-  return { ref, appPath, environments: created, created: true };
-}
-async function listExistingEnvs(appPath) {
-  try {
-    const entries = await readdir2(join3(appPath, ENVIRONMENTS_DIR), { withFileTypes: true });
-    return entries.filter((e) => e.isFile() && e.name.endsWith(".bru")).map((e) => e.name.replace(/\.bru$/, ""));
-  } catch {
-    return [];
-  }
-}
-
-// src/run.ts
+// src/commands/run.ts
 import { spawn } from "child_process";
-import { readFile as readFile4, stat, writeFile as writeFile4 } from "fs/promises";
+import { readFile as readFile3, stat, writeFile as writeFile2 } from "fs/promises";
 import { createRequire } from "module";
-import { delimiter, dirname as dirname2, isAbsolute, join as join4, relative, resolve, sep } from "path";
+import { delimiter, dirname, isAbsolute, join as join3, relative, resolve, sep } from "path";
 import { getTokenCached as getTokenCachedApi } from "@saptools/cf-xsuaa";
 var require2 = createRequire(import.meta.url);
 function pathEntries(env) {
@@ -633,7 +453,7 @@ async function findCommandOnPath(command, env) {
   const candidates = pathCandidates(command, env);
   for (const entry of pathEntries(env)) {
     for (const candidate of candidates) {
-      const fullPath = join4(entry, candidate);
+      const fullPath = join3(entry, candidate);
       if (await exists(fullPath)) {
         return fullPath;
       }
@@ -662,7 +482,7 @@ function defaultResolvePackageJsonPath() {
   return require2.resolve("@usebruno/cli/package.json");
 }
 async function defaultReadTextFile(path) {
-  return await readFile4(path, "utf8");
+  return await readFile3(path, "utf8");
 }
 async function resolveBundledBruBinPath(deps) {
   try {
@@ -672,7 +492,7 @@ async function resolveBundledBruBinPath(deps) {
     if (!binPath) {
       return void 0;
     }
-    return resolve(dirname2(packageJsonPath), binPath);
+    return resolve(dirname(packageJsonPath), binPath);
   } catch {
     return void 0;
   }
@@ -728,7 +548,7 @@ async function resolveTarget(root, target) {
     throw new Error(`Target not found: ${target}`);
   }
   const { region, org, space, app, filePath } = shorthand;
-  const appDir = join4(
+  const appDir = join3(
     root,
     regionFolderName(region),
     orgFolderName(org),
@@ -738,7 +558,7 @@ async function resolveTarget(root, target) {
   if (!filePath) {
     return { filePath: appDir, shorthand };
   }
-  const candidate = join4(appDir, filePath);
+  const candidate = join3(appDir, filePath);
   if (await exists(candidate)) {
     return { filePath: candidate, shorthand };
   }
@@ -750,7 +570,7 @@ async function resolveTarget(root, target) {
 }
 async function chooseEnvironmentFile(appDir, environment) {
   if (environment) {
-    const envFile = join4(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
+    const envFile = join3(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
     if (!await exists(envFile)) {
       throw new Error(`Environment file not found: ${envFile}`);
     }
@@ -782,13 +602,13 @@ function findAppDirFromFile(filePath, root) {
   if (!regionDir || !orgDir || !spaceDir || !appDir) {
     throw new Error(`File is not inside a CF-structured bruno collection: ${filePath}`);
   }
-  return join4(root, regionDir, orgDir, spaceDir, appDir);
+  return join3(root, regionDir, orgDir, spaceDir, appDir);
 }
 async function persistAccessToken(envFile, token) {
-  const raw = await readFile4(envFile, "utf8");
+  const raw = await readFile3(envFile, "utf8");
   const { content, changed } = upsertVars(raw, /* @__PURE__ */ new Map([["accessToken", token]]));
   if (changed) {
-    await writeFile4(envFile, content, "utf8");
+    await writeFile2(envFile, content, "utf8");
   }
 }
 async function buildRunPlan(options) {
@@ -840,7 +660,189 @@ async function runBruno(options) {
   return { ...plan, ...result };
 }
 
-// src/use.ts
+// src/commands/setup-app.ts
+import { mkdir, readdir as readdir2, writeFile as writeFile3 } from "fs/promises";
+import { basename, join as join4 } from "path";
+var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
+var BRUNO_COLLECTION_CONFIG_FILENAME = "bruno.json";
+var ENV_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
+function assertValidEnvName(name) {
+  if (!ENV_NAME_PATTERN.test(name)) {
+    throw new Error(
+      `Invalid environment name '${name}': only letters, digits, dot, underscore, and dash are allowed.`
+    );
+  }
+}
+function emptyEnvContent(envName, ref) {
+  const lines = [
+    "vars {",
+    `  __cf_region: ${ref.region}`,
+    `  __cf_org: ${ref.org}`,
+    `  __cf_space: ${ref.space}`,
+    `  __cf_app: ${ref.app}`,
+    `  environment: ${envName}`,
+    "  baseUrl: ",
+    "}",
+    ""
+  ];
+  return lines.join("\n");
+}
+function normalizeCollectionName(root) {
+  const candidate = basename(root).replace(/^\.+/, "").trim();
+  return candidate.length > 0 ? candidate : "bruno-collection";
+}
+function defaultBrunoConfig(root) {
+  return `${JSON.stringify(
+    {
+      version: "1",
+      name: normalizeCollectionName(root),
+      type: "collection",
+      ignore: ["node_modules", ".git"]
+    },
+    null,
+    2
+  )}
+`;
+}
+async function ensureCollectionConfig(root) {
+  const filePath = join4(root, BRUNO_COLLECTION_CONFIG_FILENAME);
+  try {
+    await writeFile3(filePath, defaultBrunoConfig(root), { encoding: "utf8", flag: "wx" });
+  } catch (err) {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+  }
+}
+async function ensureEnvFile(appPath, envName, ref) {
+  const envDir = join4(appPath, ENVIRONMENTS_DIR);
+  await mkdir(envDir, { recursive: true });
+  const filePath = join4(envDir, `${envName}.bru`);
+  try {
+    await writeFile3(filePath, emptyEnvContent(envName, ref), { encoding: "utf8", flag: "wx" });
+  } catch (err) {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+    await writeCfMetaToFile(filePath, ref);
+  }
+  return filePath;
+}
+function pickRegion(regions) {
+  return regions.map((r) => ({ value: r.key, name: `${r.key} \u2014 ${r.label} (${r.orgCount.toString()} org${r.orgCount === 1 ? "" : "s"})` }));
+}
+function pickOrg(region) {
+  return region.orgs.map((o) => ({ value: o.name, name: `${o.name} (${o.spaces.length.toString()} space${o.spaces.length === 1 ? "" : "s"})` }));
+}
+function pickSpace(org) {
+  return org.spaces.map((s) => ({ value: s.name, name: `${s.name} (${s.apps.length.toString()} app${s.apps.length === 1 ? "" : "s"})` }));
+}
+function pickApp(space) {
+  return space.apps.map((a) => ({ value: a.name, name: a.name }));
+}
+async function setupApp(options) {
+  const deps = options.deps ?? defaultCfInfoDeps;
+  const log = options.log ?? (() => void 0);
+  const regions = await listRegionsWithContent(deps);
+  if (regions.length === 0) {
+    throw new Error("No CF regions with orgs are cached. Run `cf-sync sync` first.");
+  }
+  const regionKey = await options.prompts.selectRegion(pickRegion(regions));
+  const regionView = await deps.readRegionView(regionKey);
+  if (!regionView) {
+    throw new Error(`Region ${regionKey} is not cached. Run \`cf-sync region ${regionKey}\` or \`cf-sync sync\` first.`);
+  }
+  const region = regionView.region;
+  if (region.orgs.length === 0) {
+    throw new Error(`Region ${regionKey} has no accessible orgs.`);
+  }
+  const orgName = await options.prompts.selectOrg(pickOrg(region));
+  const org = region.orgs.find((o) => o.name === orgName);
+  if (!org) {
+    throw new Error(`Org ${orgName} not found in region ${regionKey}`);
+  }
+  if (org.spaces.length === 0) {
+    throw new Error(`Org ${orgName} has no spaces.`);
+  }
+  const spaceName = await options.prompts.selectSpace(pickSpace(org));
+  const space = org.spaces.find((s) => s.name === spaceName);
+  if (!space) {
+    throw new Error(`Space ${spaceName} not found in org ${orgName}`);
+  }
+  if (space.apps.length === 0) {
+    throw new Error(`Space ${spaceName} has no apps.`);
+  }
+  const appName = await options.prompts.selectApp(pickApp(space));
+  const ref = { region: regionKey, org: orgName, space: spaceName, app: appName };
+  const appPath = join4(
+    options.root,
+    regionFolderName(regionKey),
+    orgFolderName(orgName),
+    spaceFolderName(spaceName),
+    appName
+  );
+  const confirmed = await options.prompts.confirmCreate(appPath);
+  if (!confirmed) {
+    return { ref, appPath, environments: [], created: false };
+  }
+  await mkdir(appPath, { recursive: true });
+  await ensureCollectionConfig(appPath);
+  const existingEnvs = await listExistingEnvs(appPath);
+  const common = [...COMMON_ENVIRONMENTS];
+  const selected = await options.prompts.selectEnvironments({ common, existing: existingEnvs });
+  const merged = [];
+  for (const name of selected) {
+    const trimmed = name.trim();
+    if (trimmed.length === 0 || merged.includes(trimmed)) {
+      continue;
+    }
+    assertValidEnvName(trimmed);
+    merged.push(trimmed);
+  }
+  if (merged.length === 0) {
+    throw new Error("At least one environment is required.");
+  }
+  const created = [];
+  for (const envName of merged) {
+    const path = await ensureEnvFile(appPath, envName, ref);
+    created.push(path);
+    log(`\u2022 ${path}`);
+  }
+  return { ref, appPath, environments: created, created: true };
+}
+async function listExistingEnvs(appPath) {
+  try {
+    const entries = await readdir2(join4(appPath, ENVIRONMENTS_DIR), { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && e.name.endsWith(".bru")).map((e) => e.name.replace(/\.bru$/, ""));
+  } catch {
+    return [];
+  }
+}
+
+// src/state/context.ts
+import { mkdir as mkdir2, readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
+import { dirname as dirname2 } from "path";
+async function readContext() {
+  try {
+    const raw = await readFile4(brunoContextPath(), "utf8");
+    return JSON.parse(raw);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return void 0;
+    }
+    throw err;
+  }
+}
+async function writeContext(ctx) {
+  const updated = { ...ctx, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  const path = brunoContextPath();
+  await mkdir2(dirname2(path), { recursive: true });
+  await writeFile4(path, `${JSON.stringify(updated, null, 2)}
+`, "utf8");
+  return updated;
+}
+
+// src/commands/use.ts
 function parseContextShorthand(shorthand) {
   const segs = shorthand.split("/").filter((s) => s.length > 0);
   if (segs.length !== 4) {