@zintrust/core 0.4.30 → 0.4.32

package/README.md

@@ -30,6 +30,21 @@ If you’re targeting a different runtime:
 
 The canonical CLI is `zin`. `z` is a shorthand alias.
 
+## Reuse The Stock Bootstrap
+
+If your project needs a `src/boot/bootstrap.ts` entry for Docker, Node, or custom startup layout, you do not need to copy the full ZinTrust bootstrap implementation into your app.
+
+Use a thin bootstrap file that delegates to the published core boot entrypoint:
+
+```typescript
+// src/boot/bootstrap.ts
+import '@zintrust/core/boot';
+
+export {};
+```
+
+Use a full custom bootstrap only when you intentionally need behavior different from the stock ZinTrust bootstrap. If you replace it completely, you are also responsible for running any worker startup lifecycle that your app depends on.
+
 ## Install adapters (database/cache/etc.)
 
 ZinTrust keeps the core package minimal. Integrations like database drivers are installed explicitly via adapter packages.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.4.30",
+  "version": "0.4.32",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -22,6 +22,10 @@
       "types": "./src/start.d.ts",
       "import": "./src/start.js"
     },
+    "./boot": {
+      "types": "./src/boot.d.ts",
+      "import": "./src/boot.js"
+    },
     "./cli": {
       "types": "./src/cli.d.ts",
       "import": "./src/cli.js"

package/src/boot.d.ts

@@ -0,0 +1,3 @@
+import './boot/bootstrap';
+export {};
+//# sourceMappingURL=boot.d.ts.map

package/src/boot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"boot.d.ts","sourceRoot":"","sources":["../../src/boot.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAEzB,OAAO,EAAE,CAAC"}

package/src/boot.js

@@ -0,0 +1 @@
+import './boot/bootstrap.js';

package/src/cli/commands/D1ProxyCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA6PrE,eAAO,MAAM,cAAc;cACf,YAAY;EAwCtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmHrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/cli/commands/D1ProxyCommand.js

@@ -1,12 +1,7 @@
-import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode } from '../commands/ProxyCommandUtils.js';
-import { SpawnUtil } from '../utils/spawn.js';
+import { findQuotedValue, trimNonEmptyOption } from '../commands/ProxyScaffoldUtils.js';
+import { addWranglerProxyBaseOptions, createWranglerProxyCommand, } from '../commands/WranglerProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
-import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { isNonEmptyString } from '../../helper/index.js';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from '../../node-singletons/fs.js';
-import { join } from '../../node-singletons/path.js';
 const DEFAULT_CONFIG = 'wrangler.jsonc';
 const DEFAULT_COMPATIBILITY_DATE = '2026-03-12';
 const DEFAULT_BINDING = 'ZIN_DB';
@@ -14,76 +9,25 @@ const DEFAULT_DATABASE_NAME = 'd1-proxy-db';
 const DEFAULT_DATABASE_ID = '<your-d1-database-id>';
 const DEFAULT_MIGRATIONS_DIR = 'database/migrations/d1';
 const DEFAULT_ENTRY_FILE = 'src/proxy/d1/ZintrustD1Proxy.ts';
+const DEFAULT_ROUTE_PATTERN = 'd1-proxy.example.com';
 const CORE_PROXY_MODULE = ['@zintrust', 'core', 'proxy'].join('/');
-const trimOption = (value) => {
-    if (!isNonEmptyString(value))
-        return undefined;
-    const trimmed = value.trim();
-    return trimmed.length > 0 ? trimmed : undefined;
-};
-const resolveConfigPath = (raw) => {
-    const trimmed = trimOption(raw);
-    return trimmed ?? DEFAULT_CONFIG;
-};
-const isJsonWhitespace = (char) => {
-    return char === ' ' || char === '\n' || char === '\r' || char === '\t';
-};
-const findJsonKeyValueStart = (content, key) => {
-    const keyPosition = content.indexOf(`"${key}"`);
-    if (keyPosition < 0)
-        return -1;
-    let cursor = keyPosition + key.length + 2;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    if (content[cursor] !== ':')
-        return -1;
-    cursor++;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    return cursor;
-};
-const findQuotedValue = (content, key) => {
-    const valueStart = findJsonKeyValueStart(content, key);
-    if (valueStart < 0 || content[valueStart] !== '"')
-        return undefined;
-    const valueEnd = content.indexOf('"', valueStart + 1);
-    if (valueEnd < 0)
-        return undefined;
-    return trimOption(content.slice(valueStart + 1, valueEnd));
-};
-const hasEnvBlock = (content, envName) => {
-    const valueStart = findJsonKeyValueStart(content, envName);
-    return valueStart >= 0 && content[valueStart] === '{';
-};
-const findEnvObjectStart = (content) => {
-    const valueStart = findJsonKeyValueStart(content, 'env');
-    if (valueStart < 0 || content[valueStart] !== '{')
-        return -1;
-    return valueStart;
-};
-const isObjectEffectivelyEmpty = (content, objectStart) => {
-    let cursor = objectStart + 1;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    return content[cursor] === '}';
-};
 const resolveConfigValues = (content, options) => {
     const fileContent = content ?? '';
     return {
-        binding: trimOption(options.binding) ??
-            trimOption(Env.get('D1_BINDING', '')) ??
+        binding: trimNonEmptyOption(options.binding) ??
+            trimNonEmptyOption(Env.get('D1_BINDING', '')) ??
             findQuotedValue(fileContent, 'D1_BINDING') ??
             findQuotedValue(fileContent, 'binding') ??
             DEFAULT_BINDING,
-        databaseName: trimOption(options.databaseName) ??
-            trimOption(Env.get('D1_DATABASE_NAME', '')) ??
+        databaseName: trimNonEmptyOption(options.databaseName) ??
+            trimNonEmptyOption(Env.get('D1_DATABASE_NAME', '')) ??
             findQuotedValue(fileContent, 'database_name') ??
             DEFAULT_DATABASE_NAME,
-        databaseId: trimOption(options.databaseId) ??
-            trimOption(Env.get('D1_DATABASE_ID', '')) ??
+        databaseId: trimNonEmptyOption(options.databaseId) ??
+            trimNonEmptyOption(Env.get('D1_DATABASE_ID', '')) ??
             findQuotedValue(fileContent, 'database_id') ??
             DEFAULT_DATABASE_ID,
-        migrationsDir: trimOption(options.migrationsDir) ??
+        migrationsDir: trimNonEmptyOption(options.migrationsDir) ??
             findQuotedValue(fileContent, 'migrations_dir') ??
             DEFAULT_MIGRATIONS_DIR,
     };
@@ -111,81 +55,19 @@ const renderD1ProxyEnvBlock = (values) => {
         `          "database_id": "${values.databaseId}",`,
         `          "migrations_dir": "${values.migrationsDir}"`,
         '        }',
-        '      ]',
+        '      ],',
+        '      // Add routes here when ready:',
+        `      // "routes": [{ "pattern": "${DEFAULT_ROUTE_PATTERN}", "custom_domain": true }]`,
         '    }',
     ].join('\n');
 };
-const renderDefaultWranglerConfig = (values) => {
-    return [
-        '{',
-        '  "name": "zintrust-api",',
-        '  "main": "./src/functions/cloudflare.ts",',
-        `  "compatibility_date": "${DEFAULT_COMPATIBILITY_DATE}",`,
-        '  "compatibility_flags": ["nodejs_compat"],',
-        '  "env": {',
-        renderD1ProxyEnvBlock(values),
-        '  }',
-        '}',
-        '',
-    ].join('\n');
-};
-const ensureProxyEntrypoint = (cwd) => {
-    const entryFilePath = join(cwd, DEFAULT_ENTRY_FILE);
-    if (existsSync(entryFilePath)) {
-        return { created: false, entryFilePath };
-    }
-    mkdirSync(join(cwd, 'src/proxy/d1'), { recursive: true });
-    writeFileSync(entryFilePath, [
-        `export { ZintrustD1Proxy } from '${CORE_PROXY_MODULE}';`,
-        `export { ZintrustD1Proxy as default } from '${CORE_PROXY_MODULE}';`,
-        '',
-    ].join('\n'), 'utf-8');
-    return { created: true, entryFilePath };
-};
-const injectEnvBlock = (content, block) => {
-    if (hasEnvBlock(content, 'd1-proxy'))
-        return content;
-    const envObjectStart = findEnvObjectStart(content);
-    if (envObjectStart >= 0 && isObjectEffectivelyEmpty(content, envObjectStart)) {
-        const closingBraceIndex = content.indexOf('}', envObjectStart);
-        if (closingBraceIndex >= 0) {
-            return `${content.slice(0, envObjectStart)}{\n${block}\n  }${content.slice(closingBraceIndex + 1)}`;
-        }
-    }
-    if (envObjectStart >= 0) {
-        return `${content.slice(0, envObjectStart + 1)}\n${block},${content.slice(envObjectStart + 1)}`;
-    }
-    const closingIndex = content.lastIndexOf('}');
-    if (closingIndex < 0) {
-        throw ErrorFactory.createCliError('Invalid wrangler.jsonc: missing closing brace.');
-    }
-    const before = content.slice(0, closingIndex).trimEnd();
-    const suffix = before.endsWith('{') ? '\n' : ',\n';
-    return `${before}${suffix}  "env": {\n${block}\n  }\n}\n`;
-};
-const ensureWranglerConfig = (configPath, options) => {
-    if (!existsSync(configPath)) {
-        const values = resolveConfigValues(undefined, options);
-        writeFileSync(configPath, renderDefaultWranglerConfig(values), 'utf-8');
-        return { createdFile: true, insertedEnv: true, values };
-    }
-    const content = readFileSync(configPath, 'utf-8');
-    const values = resolveConfigValues(content, options);
-    const next = injectEnvBlock(content, renderD1ProxyEnvBlock(values));
-    if (next !== content) {
-        writeFileSync(configPath, next, 'utf-8');
-        return { createdFile: false, insertedEnv: true, values };
-    }
-    return { createdFile: false, insertedEnv: false, values };
-};
 const warnOnPlaceholderDatabaseId = (values) => {
     if (values.databaseId !== DEFAULT_DATABASE_ID)
         return;
     Logger.warn('Could not resolve a D1 database id automatically. Update wrangler.jsonc or pass --database-id before relying on the generated d1-proxy environment.');
 };
 const addOptions = (command) => {
-    command.option('-c, --config <path>', 'Wrangler config file', DEFAULT_CONFIG);
-    command.option('--watch', 'Auto-restart proxy on file changes');
+    addWranglerProxyBaseOptions(command, DEFAULT_CONFIG);
     command.option('--binding <name>', 'D1 binding name', DEFAULT_BINDING);
     command.option('--database-name <name>', 'Cloudflare D1 database name');
     command.option('--database-id <id>', 'Cloudflare D1 database id');
@@ -193,37 +75,20 @@ const addOptions = (command) => {
 };
 export const D1ProxyCommand = Object.freeze({
     create() {
-        return BaseCommand.create({
+        return createWranglerProxyCommand({
             name: 'proxy:d1',
             aliases: ['d1:proxy'],
             description: 'Start the local Cloudflare D1 proxy Worker via Wrangler and scaffold env.d1-proxy in wrangler.jsonc when missing',
+            envName: 'd1-proxy',
+            defaultConfig: DEFAULT_CONFIG,
+            compatibilityDate: DEFAULT_COMPATIBILITY_DATE,
+            entryFile: DEFAULT_ENTRY_FILE,
+            exportName: 'ZintrustD1Proxy',
+            moduleSpecifier: CORE_PROXY_MODULE,
             addOptions,
-            execute: async (options) => {
-                await maybeRunProxyWatchMode(options.watch);
-                const cwd = process.cwd();
-                const entrypoint = ensureProxyEntrypoint(cwd);
-                const configPath = join(cwd, resolveConfigPath(options.config));
-                const result = ensureWranglerConfig(configPath, options);
-                if (entrypoint.created) {
-                    Logger.info(`Created ${entrypoint.entryFilePath} from @zintrust/core proxy entrypoint.`);
-                }
-                if (result.createdFile) {
-                    Logger.info(`Created ${configPath} with a default d1-proxy environment.`);
-                }
-                else if (result.insertedEnv) {
-                    Logger.info(`Added env.d1-proxy to ${configPath}.`);
-                }
-                warnOnPlaceholderDatabaseId(result.values);
-                const exitCode = await SpawnUtil.spawnAndWait({
-                    command: 'wrangler',
-                    args: ['dev', '--config', configPath, '--env', 'd1-proxy'],
-                    env: process.env,
-                    forwardSignals: false,
-                });
-                if (exitCode !== 0) {
-                    process.exit(exitCode);
-                }
-            },
+            resolveValues: resolveConfigValues,
+            renderEnvBlock: renderD1ProxyEnvBlock,
+            afterConfigResolved: warnOnPlaceholderDatabaseId,
         });
     },
 });

package/src/cli/commands/KvProxyCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KvProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/KvProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0OrE,eAAO,MAAM,cAAc;cACf,YAAY;EAwCtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"KvProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/KvProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmGrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/cli/commands/KvProxyCommand.js

@@ -1,83 +1,30 @@
-import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode } from '../commands/ProxyCommandUtils.js';
-import { SpawnUtil } from '../utils/spawn.js';
+import { findQuotedValue, trimNonEmptyOption } from '../commands/ProxyScaffoldUtils.js';
+import { addWranglerProxyBaseOptions, createWranglerProxyCommand, } from '../commands/WranglerProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
-import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { isNonEmptyString } from '../../helper/index.js';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from '../../node-singletons/fs.js';
-import { join } from '../../node-singletons/path.js';
 const DEFAULT_CONFIG = 'wrangler.jsonc';
 const DEFAULT_COMPATIBILITY_DATE = '2026-03-12';
 const DEFAULT_BINDING = 'ZIN_KV';
 const DEFAULT_NAMESPACE_ID = '<your-kv-namespace-id>';
 const DEFAULT_ENTRY_FILE = 'src/proxy/kv/ZintrustKvProxy.ts';
+const DEFAULT_ROUTE_PATTERN = 'kv-proxy.example.com';
 const CORE_PROXY_MODULE = ['@zintrust', 'core', 'proxy'].join('/');
-const trimOption = (value) => {
-    if (!isNonEmptyString(value))
-        return undefined;
-    const trimmed = value.trim();
-    return trimmed.length > 0 ? trimmed : undefined;
-};
-const resolveConfigPath = (raw) => trimOption(raw) ?? DEFAULT_CONFIG;
-const isJsonWhitespace = (char) => {
-    return char === ' ' || char === '\n' || char === '\r' || char === '\t';
-};
-const findJsonKeyValueStart = (content, key) => {
-    const keyPosition = content.indexOf(`"${key}"`);
-    if (keyPosition < 0)
-        return -1;
-    let cursor = keyPosition + key.length + 2;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    if (content[cursor] !== ':')
-        return -1;
-    cursor++;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    return cursor;
-};
-const findQuotedValue = (content, key) => {
-    const valueStart = findJsonKeyValueStart(content, key);
-    if (valueStart < 0 || content[valueStart] !== '"')
-        return undefined;
-    const valueEnd = content.indexOf('"', valueStart + 1);
-    if (valueEnd < 0)
-        return undefined;
-    return trimOption(content.slice(valueStart + 1, valueEnd));
-};
-const hasEnvBlock = (content, envName) => {
-    const valueStart = findJsonKeyValueStart(content, envName);
-    return valueStart >= 0 && content[valueStart] === '{';
-};
-const findEnvObjectStart = (content) => {
-    const valueStart = findJsonKeyValueStart(content, 'env');
-    if (valueStart < 0 || content[valueStart] !== '{')
-        return -1;
-    return valueStart;
-};
-const isObjectEffectivelyEmpty = (content, objectStart) => {
-    let cursor = objectStart + 1;
-    while (isJsonWhitespace(content[cursor]))
-        cursor++;
-    return content[cursor] === '}';
-};
 const resolveConfigValues = (content, options) => {
     const fileContent = content ?? '';
-    const namespaceId = trimOption(options.namespaceId) ??
-        trimOption(Env.get('KV_NAMESPACE_ID', '')) ??
+    const namespaceId = trimNonEmptyOption(options.namespaceId) ??
+        trimNonEmptyOption(Env.get('KV_NAMESPACE_ID', '')) ??
         findQuotedValue(fileContent, 'preview_id') ??
         findQuotedValue(fileContent, 'id') ??
         DEFAULT_NAMESPACE_ID;
     return {
-        binding: trimOption(options.binding) ??
-            trimOption(Env.get('KV_NAMESPACE', '')) ??
+        binding: trimNonEmptyOption(options.binding) ??
+            trimNonEmptyOption(Env.get('KV_NAMESPACE', '')) ??
             findQuotedValue(fileContent, 'KV_NAMESPACE') ??
             findQuotedValue(fileContent, 'binding') ??
             DEFAULT_BINDING,
         namespaceId,
-        previewId: trimOption(options.previewId) ??
-            trimOption(Env.get('KV_NAMESPACE_PREVIEW_ID', '')) ??
+        previewId: trimNonEmptyOption(options.previewId) ??
+            trimNonEmptyOption(Env.get('KV_NAMESPACE_PREVIEW_ID', '')) ??
             findQuotedValue(fileContent, 'preview_id') ??
             namespaceId,
     };
@@ -100,118 +47,39 @@ const renderKvProxyEnvBlock = (values) => {
         `          "preview_id": "${values.previewId}",`,
         '          "remote": false',
         '        }',
-        '      ]',
+        '      ],',
+        '      // Add routes here when ready:',
+        `      // "routes": [{ "pattern": "${DEFAULT_ROUTE_PATTERN}", "custom_domain": true }]`,
         '    }',
     ].join('\n');
 };
-const renderDefaultWranglerConfig = (values) => {
-    return [
-        '{',
-        '  "name": "zintrust-api",',
-        '  "main": "./src/functions/cloudflare.ts",',
-        `  "compatibility_date": "${DEFAULT_COMPATIBILITY_DATE}",`,
-        '  "compatibility_flags": ["nodejs_compat"],',
-        '  "env": {',
-        renderKvProxyEnvBlock(values),
-        '  }',
-        '}',
-        '',
-    ].join('\n');
-};
-const ensureProxyEntrypoint = (cwd) => {
-    const entryFilePath = join(cwd, DEFAULT_ENTRY_FILE);
-    if (existsSync(entryFilePath)) {
-        return { created: false, entryFilePath };
-    }
-    mkdirSync(join(cwd, 'src/proxy/kv'), { recursive: true });
-    writeFileSync(entryFilePath, [
-        `export { ZintrustKvProxy } from '${CORE_PROXY_MODULE}';`,
-        `export { ZintrustKvProxy as default } from '${CORE_PROXY_MODULE}';`,
-        '',
-    ].join('\n'), 'utf-8');
-    return { created: true, entryFilePath };
-};
-const injectEnvBlock = (content, block) => {
-    if (hasEnvBlock(content, 'kv-proxy'))
-        return content;
-    const envObjectStart = findEnvObjectStart(content);
-    if (envObjectStart >= 0 && isObjectEffectivelyEmpty(content, envObjectStart)) {
-        const closingBraceIndex = content.indexOf('}', envObjectStart);
-        if (closingBraceIndex >= 0) {
-            return `${content.slice(0, envObjectStart)}{\n${block}\n  }${content.slice(closingBraceIndex + 1)}`;
-        }
-    }
-    if (envObjectStart >= 0) {
-        return `${content.slice(0, envObjectStart + 1)}\n${block},${content.slice(envObjectStart + 1)}`;
-    }
-    const closingIndex = content.lastIndexOf('}');
-    if (closingIndex < 0) {
-        throw ErrorFactory.createCliError('Invalid wrangler.jsonc: missing closing brace.');
-    }
-    const before = content.slice(0, closingIndex).trimEnd();
-    const suffix = before.endsWith('{') ? '\n' : ',\n';
-    return `${before}${suffix}  "env": {\n${block}\n  }\n}\n`;
-};
-const ensureWranglerConfig = (configPath, options) => {
-    if (!existsSync(configPath)) {
-        const values = resolveConfigValues(undefined, options);
-        writeFileSync(configPath, renderDefaultWranglerConfig(values), 'utf-8');
-        return { createdFile: true, insertedEnv: true, values };
-    }
-    const content = readFileSync(configPath, 'utf-8');
-    const values = resolveConfigValues(content, options);
-    const next = injectEnvBlock(content, renderKvProxyEnvBlock(values));
-    if (next !== content) {
-        writeFileSync(configPath, next, 'utf-8');
-        return { createdFile: false, insertedEnv: true, values };
-    }
-    return { createdFile: false, insertedEnv: false, values };
-};
 const warnOnPlaceholderNamespaceId = (values) => {
     if (values.namespaceId !== DEFAULT_NAMESPACE_ID)
         return;
     Logger.warn('Could not resolve a KV namespace id automatically. Update wrangler.jsonc or pass --namespace-id before relying on the generated kv-proxy environment.');
 };
 const addOptions = (command) => {
-    command.option('-c, --config <path>', 'Wrangler config file', DEFAULT_CONFIG);
-    command.option('--watch', 'Auto-restart proxy on file changes');
+    addWranglerProxyBaseOptions(command, DEFAULT_CONFIG);
     command.option('--binding <name>', 'KV binding name', DEFAULT_BINDING);
     command.option('--namespace-id <id>', 'Cloudflare KV namespace id');
     command.option('--preview-id <id>', 'Cloudflare KV preview namespace id');
 };
 export const KvProxyCommand = Object.freeze({
     create() {
-        return BaseCommand.create({
+        return createWranglerProxyCommand({
             name: 'proxy:kv',
             aliases: ['kv:proxy'],
             description: 'Start the local Cloudflare KV proxy Worker via Wrangler and scaffold env.kv-proxy in wrangler.jsonc when missing',
+            envName: 'kv-proxy',
+            defaultConfig: DEFAULT_CONFIG,
+            compatibilityDate: DEFAULT_COMPATIBILITY_DATE,
+            entryFile: DEFAULT_ENTRY_FILE,
+            exportName: 'ZintrustKvProxy',
+            moduleSpecifier: CORE_PROXY_MODULE,
             addOptions,
-            execute: async (options) => {
-                await maybeRunProxyWatchMode(options.watch);
-                const cwd = process.cwd();
-                const entrypoint = ensureProxyEntrypoint(cwd);
-                const configPath = join(cwd, resolveConfigPath(options.config));
-                const result = ensureWranglerConfig(configPath, options);
-                if (entrypoint.created) {
-                    Logger.info(`Created ${entrypoint.entryFilePath} from @zintrust/core proxy entrypoint.`);
-                }
-                if (result.createdFile) {
-                    Logger.info(`Created ${configPath} with a default kv-proxy environment.`);
-                }
-                else if (result.insertedEnv) {
-                    Logger.info(`Added env.kv-proxy to ${configPath}.`);
-                }
-                warnOnPlaceholderNamespaceId(result.values);
-                const exitCode = await SpawnUtil.spawnAndWait({
-                    command: 'wrangler',
-                    args: ['dev', '--config', configPath, '--env', 'kv-proxy'],
-                    env: process.env,
-                    forwardSignals: false,
-                });
-                if (exitCode !== 0) {
-                    process.exit(exitCode);
-                }
-            },
+            resolveValues: resolveConfigValues,
+            renderEnvBlock: renderKvProxyEnvBlock,
+            afterConfigResolved: warnOnPlaceholderNamespaceId,
         });
     },
 });

package/src/cli/commands/ProxyScaffoldUtils.d.ts

@@ -0,0 +1,31 @@
+type EnsureProxyEntrypointOptions = {
+    cwd: string;
+    entryFile: string;
+    exportName: string;
+    moduleSpecifier: string;
+};
+type EnsureWranglerConfigOptions<TValues, TOptions> = {
+    configPath: string;
+    options: TOptions;
+    envName: string;
+    resolveValues: (content: string | undefined, options: TOptions) => TValues;
+    renderEnvBlock: (values: TValues) => string;
+    compatibilityDate: string;
+};
+type EnsureWranglerConfigResult<TValues> = {
+    createdFile: boolean;
+    insertedEnv: boolean;
+    values: TValues;
+};
+export declare const trimNonEmptyOption: (value: string | undefined) => string | undefined;
+export declare const resolveConfigPath: (raw: string | undefined, fallback?: string) => string;
+export declare const findQuotedValue: (content: string, key: string) => string | undefined;
+export declare const injectEnvBlock: (content: string, envName: string, block: string) => string;
+export declare const renderDefaultWranglerConfig: (envBlock: string, compatibilityDate: string) => string;
+export declare const ensureProxyEntrypoint: (options: EnsureProxyEntrypointOptions) => {
+    created: boolean;
+    entryFilePath: string;
+};
+export declare const ensureWranglerConfig: <TValues, TOptions>(options: EnsureWranglerConfigOptions<TValues, TOptions>) => EnsureWranglerConfigResult<TValues>;
+export {};
+//# sourceMappingURL=ProxyScaffoldUtils.d.ts.map

package/src/cli/commands/ProxyScaffoldUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProxyScaffoldUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyScaffoldUtils.ts"],"names":[],"mappings":"AAKA,KAAK,4BAA4B,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,EAAE,QAAQ,IAAI;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IAAI;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAIvE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,GAAG,SAAS,EAAE,iBAA2B,KAAG,MAExF,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,GAAG,SAQvE,CAAC;AAmBF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAuBhF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,mBAAmB,MAAM,KACxB,MAaF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAoB3C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,EAAE,QAAQ,EACpD,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACtD,0BAA0B,CAAC,OAAO,CAqBpC,CAAC"}