@chrisluyi/daas-cli 1.5.4 → 1.6.1

package/dist/index.js

@@ -2445,7 +2445,7 @@ function stripScope(name) {
   return name.replace(/^@[^/]+\//, "").replace(/-/g, "_");
 }
 // package.json
-var version = "1.5.4";
+var version = "1.6.1";
 
 // src/version.ts
 function getCliVersion() {
@@ -3605,7 +3605,6 @@ function getPackageName(cwd) {
 import { spawnSync } from "child_process";
 import { existsSync as existsSync8, readdirSync as readdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
 import { relative as relative2, resolve as resolve9 } from "path";
-
 class RegionError extends Error {
   constructor(message) {
     super(message);
@@ -3616,6 +3615,17 @@ var DEFAULT_ALIASES = {
   "@region-config": "./src/config/regions/{region}/config",
   "@regional": "./src/config/regions/{region}/index"
 };
+var DEFAULT_TARGET_ALIASES = {
+  ...DEFAULT_ALIASES,
+  "@platform-config": "./src/config/platforms/{platform}",
+  "@product-config": "./src/config/products/{product}"
+};
+function parseSelector(selector) {
+  if (selector.split("-").length >= 4) {
+    return { selector, ...parseTarget(selector) };
+  }
+  return { selector, region: selector };
+}
 function readRegionalConfig(cwd = process.cwd()) {
   const pkgPath = resolve9(cwd, "package.json");
   if (!existsSync8(pkgPath)) {
@@ -3626,6 +3636,8 @@ function readRegionalConfig(cwd = process.cwd()) {
   return {
     ...r4,
     regionsDir: r4.regionsDir ?? "src/config/regions",
+    platformsDir: r4.platformsDir ?? "src/config/platforms",
+    productsDir: r4.productsDir ?? "src/config/products",
     tsconfig: r4.tsconfig ?? "tsconfig.daas.json",
     extends: r4.extends ?? "./tsconfig.json",
     bunPaths: r4.bunPaths ?? false
@@ -3644,31 +3656,119 @@ function discoverRegions(cwd, cfg) {
   }
   return regions;
 }
-function renderRegionTsconfig(cwd, cfg, region) {
+function discoverDimension(cwd, dir, explicit) {
+  const abs = resolve9(cwd, dir);
+  if (!existsSync8(abs))
+    return null;
+  const entries = readdirSync2(abs, { withFileTypes: true }).filter((e3) => e3.isDirectory() || e3.name.endsWith(".ts")).map((e3) => ({
+    name: e3.isDirectory() ? e3.name : e3.name.replace(/\.ts$/, ""),
+    rel: `${dir}/${e3.name}`
+  })).sort((a4, b4) => a4.name.localeCompare(b4.name));
+  if (explicit && explicit.length > 0) {
+    return entries.filter((e3) => explicit.includes(e3.name));
+  }
+  return entries;
+}
+function renderRegionTsconfig(cwd, cfg, selectorArg) {
+  const sel = parseSelector(selectorArg);
   const regions = discoverRegions(cwd, cfg);
-  if (!regions.includes(region)) {
-    throw new RegionError(`Unknown region "${region}". Known: ${regions.join(", ")}`);
-  }
-  const aliases = cfg.aliases ?? DEFAULT_ALIASES;
-  const paths = Object.fromEntries(Object.entries(aliases).map(([k3, v3]) => [
-    k3,
-    [v3.replaceAll("{region}", region)]
-  ]));
+  if (!regions.includes(sel.region)) {
+    throw new RegionError(`Unknown region "${sel.region}". Known: ${regions.join(", ")}`);
+  }
+  const aliases = cfg.aliases ?? (sel.platform ? DEFAULT_TARGET_ALIASES : DEFAULT_ALIASES);
+  const substitutions = {
+    "{region}": sel.region,
+    "{platform}": sel.platform,
+    "{product}": sel.product,
+    "{environment}": sel.environment
+  };
+  const paths = Object.fromEntries(Object.entries(aliases).map(([k3, v3]) => {
+    let out = v3;
+    for (const [ph, value] of Object.entries(substitutions)) {
+      if (!out.includes(ph))
+        continue;
+      if (value === undefined) {
+        throw new RegionError(`Alias "${k3}" uses ${ph} \u2014 pass a full target ({region}-{product}-{platform}-{environment}), not a bare region`);
+      }
+      out = out.replaceAll(ph, value);
+    }
+    return [k3, [out]];
+  }));
   const tsconfigDir = resolve9(cwd, cfg.tsconfig, "..");
+  const toRel = (p) => relative2(tsconfigDir, resolve9(cwd, p));
+  const nonSelected = regions.filter((r4) => r4 !== sel.region);
+  const exclude = nonSelected.map((r4) => toRel(`${cfg.regionsDir}/${r4}`));
   const regionsDirAbs = resolve9(cwd, cfg.regionsDir);
-  const others = regions.filter((r4) => r4 !== region).map((r4) => relative2(tsconfigDir, resolve9(regionsDirAbs, r4)));
-  const exclude = [...others, ...cfg.multiRegionFiles ?? []];
+  const aliasTreeRoots = new Set;
+  for (const value of Object.values(aliases)) {
+    if (!value.includes("{region}"))
+      continue;
+    let prefix = value.slice(0, value.indexOf("{region}"));
+    let resolvable = true;
+    for (const [ph, v3] of Object.entries(substitutions)) {
+      if (ph === "{region}" || !prefix.includes(ph))
+        continue;
+      if (v3 === undefined) {
+        resolvable = false;
+        break;
+      }
+      prefix = prefix.replaceAll(ph, v3);
+    }
+    if (!resolvable)
+      continue;
+    const rootAbs = resolve9(tsconfigDir, prefix);
+    if (rootAbs !== regionsDirAbs)
+      aliasTreeRoots.add(rootAbs);
+  }
+  for (const rootAbs of aliasTreeRoots) {
+    for (const r4 of nonSelected) {
+      exclude.push(relative2(tsconfigDir, resolve9(rootAbs, r4)));
+    }
+  }
+  const resolveDimDir = (template) => {
+    let out = template;
+    for (const [ph, value] of Object.entries(substitutions)) {
+      if (!out.includes(ph))
+        continue;
+      if (value === undefined)
+        return null;
+      out = out.replaceAll(ph, value);
+    }
+    return out;
+  };
+  for (const [dim, dirTemplate, explicit] of [
+    ["platform", cfg.platformsDir, cfg.platforms],
+    ["product", cfg.productsDir, cfg.products]
+  ]) {
+    const selected = sel[dim];
+    if (!selected)
+      continue;
+    const dir = resolveDimDir(dirTemplate);
+    if (!dir)
+      continue;
+    const entries = discoverDimension(cwd, dir, explicit);
+    if (!entries)
+      continue;
+    if (!entries.some((e3) => e3.name === selected)) {
+      throw new RegionError(`Unknown ${dim} "${selected}". Known: ${entries.map((e3) => e3.name).join(", ")}`);
+    }
+    for (const e3 of entries) {
+      if (e3.name !== selected)
+        exclude.push(toRel(e3.rel));
+    }
+  }
+  exclude.push(...cfg.multiRegionFiles ?? []);
   const compilerOptions = {
     ...cfg.bunPaths ? { baseUrl: ".", ignoreDeprecations: "6.0" } : {},
     paths
   };
   const body = JSON.stringify({ extends: cfg.extends, compilerOptions, exclude }, null, 2);
-  return `// GENERATED by \`daas region ${region}\` \u2014 do not edit; regenerate or \`daas region --reset\`.
+  return `// GENERATED by \`daas region ${sel.selector}\` \u2014 do not edit; regenerate or \`daas region --reset\`.
 ${body}
 `;
 }
-function writeRegionTsconfig(cwd, cfg, region, applyTo) {
-  const content = renderRegionTsconfig(cwd, cfg, region);
+function writeRegionTsconfig(cwd, cfg, selector, applyTo) {
+  const content = renderRegionTsconfig(cwd, cfg, selector);
   const out = resolve9(cwd, cfg.tsconfig);
   writeFileSync5(out, content);
   if (applyTo) {
@@ -3695,11 +3795,12 @@ function runRegionCheck(cwd, cfg, runner = (p) => {
   });
   return { ok: r4.status === 0, output: `${r4.stdout ?? ""}${r4.stderr ?? ""}` };
 }) {
+  const selectors = cfg.targets && cfg.targets.length > 0 ? cfg.targets : discoverRegions(cwd, cfg);
   const results = [];
-  for (const region of discoverRegions(cwd, cfg)) {
-    writeRegionTsconfig(cwd, cfg, region);
+  for (const selector of selectors) {
+    writeRegionTsconfig(cwd, cfg, selector);
     const { ok, output } = runner(resolve9(cwd, cfg.tsconfig));
-    results.push({ region, ok, output });
+    results.push({ region: selector, ok, output });
   }
   return results;
 }
@@ -3713,14 +3814,18 @@ var regionCommand = defineCommand({
   args: {
     region: {
       type: "positional",
-      description: "Region to select (see --list)",
+      description: "Region, or full target string {region}-{product}-{platform}-{environment} e.g. sg-digibank-shared-dev (see --list)",
       required: false
     },
-    list: { type: "boolean", default: false, description: "List regions" },
+    list: {
+      type: "boolean",
+      default: false,
+      description: "List regions (and configured targets)"
+    },
     check: {
       type: "boolean",
       default: false,
-      description: "Matrix gate: generate + tsc --noEmit for EVERY region; fails if any region's program fails"
+      description: "Matrix gate: generate + tsc --noEmit per daas.regional.targets entry (else per region); fails if any program fails"
     },
     apply: {
       type: "string",
@@ -3751,9 +3856,12 @@ var regionCommand = defineCommand({
       if (args.list) {
         const regions = discoverRegions(cwd, cfg);
         if (args.json)
-          writeJsonSuccess("region", { regions });
-        else
+          writeJsonSuccess("region", { regions, targets: cfg.targets ?? [] });
+        else {
           consola.info(`Regions: ${regions.join(", ")}`);
+          if (cfg.targets && cfg.targets.length > 0)
+            consola.info(`Targets: ${cfg.targets.join(", ")}`);
+        }
         return;
       }
       if (args.check) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrisluyi/daas-cli",
-  "version": "1.5.4",
+  "version": "1.6.1",
   "type": "module",
   "bin": {
     "daas": "./dist/index.js"
@@ -22,8 +22,8 @@
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@chrisluyi/daas-logger": "1.1.1",
-    "@chrisluyi/daas-rsbuild-config": "1.5.4",
-    "@chrisluyi/daas-template": "1.5.4",
+    "@chrisluyi/daas-rsbuild-config": "1.6.1",
+    "@chrisluyi/daas-template": "1.6.1",
     "@rsbuild/core": "*",
     "citty": "^0.1.6",
     "consola": "^3.2.3",