@tdk-landscape/tdk-cli-core 1.3.122 → 1.3.124

package/README.md

@@ -11,7 +11,7 @@
 [![Socket Badge](https://badge.socket.dev/npm/package/@tdk-landscape/tdk-cli-core/latest)](https://socket.dev/npm/package/@tdk-landscape/tdk-cli-core/overview)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-English | [简体中文](README-zh_cn.md) | [繁體中文](README-zh_tw.md) | [日本語](README-ja.md) | [한국어](README-ko.md)
+English | [简体中文](docs/README-zh_cn.md) | [繁體中文](docs/README-zh_tw.md) | [日本語](docs/README-ja.md) | [한국어](docs/README-ko.md)
 
 TDK CLI — start services on your laptop. It is not a deploy and not a Compose file: define each service in `service.json`, then run `tdk up`. No Kubernetes is needed on the machine.
 

package/cli/dist/commands/doctor.js

@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { hasVerdaccioLicense } from "../generator/extension-fetch.js";
 import { DEVCONTAINER_DOCKER_FIX, detectHost, isContainerHost, WEBCONTAINER_DOCS, WEBCONTAINER_UP_MESSAGE, } from "../utils/agent-host.js";
+import { projectNeedsBun } from "../utils/bun-requirement.js";
 import { MASTER_CONFIG_FILES, REQUIRED_PACKAGE_SCRIPTS } from "../utils/constants.js";
 import { isPathDiscovered, readDiscoveryPaths } from "../utils/discovery-paths.js";
 import { collectDoctorChecks, createDoctorReport, getDoctorExitCode, } from "../utils/doctor-report.js";
@@ -16,7 +17,6 @@ import { formatCount } from "../utils/formatting.js";
 import { getHostPortPlan } from "../utils/host-port-config.js";
 import { createHostPortPlan } from "../utils/host-port-plan.js";
 import { findProjectRoot, getPackageVersion } from "../utils/paths.js";
-import { isApiServiceType } from "../utils/resource-kind.js";
 import { EnvUnreadableError, envSecretValues, redactSecrets, redactValue, } from "../utils/secret-redaction.js";
 import { checkCircularDependencies, checkDependsOnShape, checkSchemaVersions, checkServicePorts, } from "../utils/service-config-checks.js";
 import { buildHealthTargets, pingHealthTargets } from "../utils/service-urls.js";
@@ -363,11 +363,7 @@ export async function checkBun(exec = execAsync) {
             message: "Not in a project - skipping Bun check",
         };
     }
-    const resources = discoverResourcesFromRoot(projectRoot);
-    const hasGeneratedJsServices = resources.some((resource) => isApiServiceType(resource.config?.appType) ||
-        resource.config?.appType === "frontend" ||
-        resource.config?.appType === "worker");
-    if (!hasGeneratedJsServices) {
+    if (!projectNeedsBun(discoverResourcesFromRoot(projectRoot))) {
         return {
             name: "Bun",
             didPass: true,

package/cli/dist/commands/up.js

@@ -18,6 +18,7 @@ import { findProjectRoot, getPackageVersion } from "../utils/paths.js";
 import { findAvailablePort } from "../utils/port-assignment.js";
 import { formatPortFallbackNotice } from "../utils/port-fallback-notice.js";
 import { isApiServiceType } from "../utils/resource-kind.js";
+import { enforceSchemaVersionGate } from "../utils/schema-version-gate.js";
 import { enforceServiceConfigGate, warnSchemaVersions } from "../utils/service-config-checks.js";
 import { appendHealthPath, resolveSubdomainBases } from "../utils/service-urls.js";
 import { discoverResources, discoverResourcesStrict, discoverStacks, stackExists, } from "../utils/services.js";
@@ -180,6 +181,13 @@ export const upCommand = new Command("up")
     const platformRefusal = nativeWindowsUpRefusal(process.platform, process.env.TDK_ALLOW_NATIVE_WINDOWS);
     if (platformRefusal)
         showErrorAndExit(platformRefusal);
+    // An unknown schemaVersion is refused before the machine check, so --json can name the file even when Bun is missing.
+    const schemaRoot = findProjectRoot();
+    if (schemaRoot) {
+        enforceSchemaVersionGate(schemaRoot, {
+            onInvalid: (message) => emit?.({ ok: false }, [{ code: "INVALID_SCHEMA_VERSION", message }]),
+        });
+    }
     if (!options.dryRun) {
         const { assertMachineReadyOrExit } = await import("../utils/cold-preflight.js");
         await assertMachineReadyOrExit();

package/cli/dist/utils/bun-requirement.js

@@ -0,0 +1,11 @@
+import { isApiServiceType } from "./resource-kind.js";
+/**
+ * Bun runs the generated JS services. A project without any has nothing for Bun to run, so neither `tdk doctor` nor
+ * `tdk up` needs it. Doctor and the start-up preflight share this rule so they cannot disagree.
+ */
+export function projectNeedsBun(resources) {
+    return resources.some((resource) => isApiServiceType(resource.config?.appType) ||
+        resource.config?.appType === "frontend" ||
+        resource.config?.appType === "worker");
+}
+//# sourceMappingURL=bun-requirement.js.map

package/cli/dist/utils/cold-preflight.js

@@ -3,6 +3,7 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { checkDockerCompose, checkDockerRuntime, checkDockerVersions, checkTilt, } from "../commands/doctor.js";
 import { BUN_FLOOR_LABEL, bunMeetsFloor } from "./bun-floor.js";
+import { projectNeedsBun } from "./bun-requirement.js";
 import { checkNatsBroker } from "./doctor-wiring.js";
 import { getHostPortPlan } from "./host-port-config.js";
 import { findProjectRoot } from "./paths.js";
@@ -79,8 +80,10 @@ export async function runColdPreflight(opts = {}) {
         return requireVerifiedDockerVersions(versions);
     }, "Docker Engine or Compose version check failed"));
     items.push(await safeCheck("tilt", checkTilt, "Tilt CLI not found"));
+    // Outside a project Bun stays required: `tdk project` is about to create services that need it.
+    const bunNeeded = projectRoot ? projectNeedsBun(discoverResourcesFromRoot(projectRoot)) : true;
     let bun = false;
-    const bunPath = findOnPath("bun");
+    const bunPath = bunNeeded ? findOnPath("bun") : undefined;
     if (bunPath) {
         try {
             const version = execFileSync(bunPath, ["--version"], {
@@ -93,14 +96,16 @@ export async function runColdPreflight(opts = {}) {
             /* reported as a failed runtime check */
         }
     }
-    items.push({
-        id: "bun",
-        ok: bun,
-        message: bun
-            ? `Bun ${BUN_FLOOR_LABEL} is available on PATH`
-            : `Bun ${BUN_FLOOR_LABEL} not found on PATH`,
-        fix: bun ? undefined : "curl -fsSL https://bun.sh/install | bash",
-    });
+    items.push(bunNeeded
+        ? {
+            id: "bun",
+            ok: bun,
+            message: bun
+                ? `Bun ${BUN_FLOOR_LABEL} is available on PATH`
+                : `Bun ${BUN_FLOOR_LABEL} not found on PATH`,
+            fix: bun ? undefined : "curl -fsSL https://bun.sh/install | bash",
+        }
+        : { id: "bun", ok: true, message: "Bun not needed: no generated JS services" });
     try {
         const plan = await getHostPortPlan(projectRoot ?? cwd);
         items.push({

package/cli/dist/utils/env-validator.js

@@ -59,21 +59,47 @@ function generatedValue(name, password) {
         return `postgresql://postgres:${password}@postgres:5432/app_dev`;
     return REQUIRED_ENV_VARS.find((v) => v.name === name)?.default ?? "";
 }
-/** Strips one layer of matching quotes, like a dotenv parser would. */
-function unquote(raw) {
+function parseEnvValue(raw) {
     const value = raw.trim();
-    if (value.length >= 2) {
-        const first = value[0];
-        if ((first === '"' || first === "'") && value[value.length - 1] === first) {
-            return value.slice(1, -1);
+    const quote = value[0];
+    if (quote === '"' || quote === "'") {
+        let escaped = false;
+        for (let index = 1; index < value.length; index += 1) {
+            const char = value[index];
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (char === "\\") {
+                escaped = true;
+                continue;
+            }
+            if (char === quote) {
+                const quoted = value.slice(1, index);
+                if (quote === '"') {
+                    const escapes = {
+                        n: "\n",
+                        r: "\r",
+                        t: "\t",
+                        '"': '"',
+                        "\\": "\\",
+                        $: "$",
+                    };
+                    return quoted.replace(/\\([nrt"\\$])/g, (_match, escapedChar) => escapes[escapedChar] ?? escapedChar);
+                }
+                return quoted.replace(/\\'/g, "'");
+            }
         }
+        return value;
     }
-    return value;
+    const commentIndex = raw.search(/\s#/);
+    return (commentIndex === -1 ? raw : raw.slice(0, commentIndex)).trim();
 }
-/** Parses the assignments in a dotenv file: `NAME=value` and `export NAME=value`, ignoring comments and blank lines. */
+/** Parses the Compose-compatible subset used by TDK for project environment files. */
 export function parseEnv(content) {
     const result = new Map();
-    for (const rawLine of content.split(/\r?\n/)) {
+    const normalized = content.startsWith("\uFEFF") ? content.slice(1) : content;
+    for (const rawLine of normalized.split(/\r?\n/)) {
         const line = rawLine.trim();
         if (!line || line.startsWith("#"))
             continue;
@@ -84,7 +110,7 @@ export function parseEnv(content) {
         const name = assignment.slice(0, equals).trim();
         if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name))
             continue;
-        result.set(name, unquote(assignment.slice(equals + 1)));
+        result.set(name, parseEnvValue(assignment.slice(equals + 1)));
     }
     return result;
 }

package/cli/dist/utils/schema-version-gate.js

@@ -0,0 +1,39 @@
+import { relative } from "node:path";
+import chalk from "chalk";
+import { formatCount } from "./formatting.js";
+import { SERVICE_MANIFEST_SCHEMA_VERSION } from "./service-manifest.js";
+import { discoverResourcesFromRoot } from "./services.js";
+/**
+ * A service.json that declares a schemaVersion this tdk does not know is refused before anything starts: a newer format
+ * read as if it were the old one could start the wrong thing. A missing schemaVersion is not refused (see
+ * warnSchemaVersions), because every project began without one.
+ */
+export function enforceSchemaVersionGate(projectRoot, options = {}, exit = process.exit) {
+    // A root that cannot be read is reported by the checks that run next; this gate only refuses what it can read.
+    let resources;
+    try {
+        resources = discoverResourcesFromRoot(projectRoot);
+    }
+    catch {
+        return;
+    }
+    const unsupported = resources.flatMap((resource) => {
+        const version = resource.config?.schemaVersion;
+        if (version === undefined || version === SERVICE_MANIFEST_SCHEMA_VERSION)
+            return [];
+        const file = relative(projectRoot, resource.configPath) || resource.configPath;
+        return [
+            `${file} schemaVersion ${JSON.stringify(version)}: this tdk supports ${SERVICE_MANIFEST_SCHEMA_VERSION}`,
+        ];
+    });
+    if (unsupported.length === 0)
+        return;
+    const verb = unsupported.length === 1 ? "declares" : "declare";
+    const message = `${formatCount(unsupported.length, "service.json file")} ${verb} a schemaVersion this tdk does not support:\n    ${unsupported.join("\n    ")}`;
+    const fix = "Upgrade tdk to a version that supports these files. Changing schemaVersion by hand is not a fix";
+    options.onInvalid?.(`${message}\nFix: ${fix}`);
+    console.error(chalk.red(`✗ ${message}`));
+    console.error(chalk.gray(`  Fix: ${fix}`));
+    exit(1);
+}
+//# sourceMappingURL=schema-version-gate.js.map

package/cli/dist/utils/services.js

@@ -99,6 +99,8 @@ function parseResource(serviceJsonPath) {
         configPath: serviceJsonPath,
         config,
         stack: config.stack,
+        port: config.port,
+        type: config.appType,
     };
 }
 export function discoverResourcesWithProblems(projectRoot) {

package/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdk-cli-internal",
   "private": true,
-  "version": "1.3.122",
+  "version": "1.3.124",
   "description": "TDK CLI — start services on your laptop.",
   "keywords": [
     "tdk",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdk-landscape/tdk-cli-core",
-  "version": "1.3.122",
+  "version": "1.3.124",
   "description": "TDK CLI — start services on your laptop.",
   "homepage": "https://tdk-landscape.github.io/tdk-website",
   "repository": {