@zintrust/core 0.4.18 → 0.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {

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

@@ -94,6 +94,22 @@ export declare const AddCommand: Readonly<{
             platform: "lambda" | "fargate" | "cloudflare" | "deno" | "all";
         }>;
         getDefaultResponseFields: (responseType: string) => ResponseField[];
+        isPascalCaseBase: (value: string) => boolean;
+        toSafeSnakeCase: (value: string) => string;
+        stripSuffix: (value: string, suffix: string) => string;
+        skipInlineWhitespace: (value: string, startIndex: number) => number;
+        findMatchingObjectBrace: (value: string, startIndex: number) => number | undefined;
+        findRouteBlockBounds: (configSource: string) => {
+            blockStart: number;
+            innerStart: number;
+            innerEnd: number;
+            blockEnd: number;
+        } | undefined;
+        hasTrailingMiddlewaresTypeCast: (configSource: string) => boolean;
+        registerMiddlewareRouteKey: (configSource: string, middlewareName: string, middlewareKey: string) => {
+            content: string;
+            updated: boolean;
+        };
     };
 }>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"AddCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/AddCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AddCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/AddCommand.ts"],"names":[],"mappings":"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"}

package/src/cli/commands/AddCommand.js

@@ -22,6 +22,127 @@ import fs from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 import { PluginManager } from '../../runtime/PluginManager.js';
 import inquirer from 'inquirer';
+const isAsciiLowercaseLetter = (value) => value >= 'a' && value <= 'z';
+const isAsciiUppercaseLetter = (value) => value >= 'A' && value <= 'Z';
+const isAsciiDigit = (value) => value >= '0' && value <= '9';
+const isAsciiLetter = (value) => isAsciiLowercaseLetter(value) || isAsciiUppercaseLetter(value);
+const isLowercaseLettersOnly = (value) => {
+    if (value.length === 0)
+        return false;
+    for (const char of value) {
+        if (!isAsciiLowercaseLetter(char))
+            return false;
+    }
+    return true;
+};
+const isSnakeCaseName = (value) => {
+    if (value.length === 0)
+        return false;
+    for (const char of value) {
+        if (isAsciiLowercaseLetter(char) || char === '_')
+            continue;
+        return false;
+    }
+    return true;
+};
+const isPascalCaseBase = (value) => {
+    if (value.length === 0)
+        return false;
+    if (!isAsciiUppercaseLetter(value[0] ?? ''))
+        return false;
+    for (let index = 1; index < value.length; index += 1) {
+        const char = value[index] ?? '';
+        if (isAsciiLetter(char) || isAsciiDigit(char))
+            continue;
+        return false;
+    }
+    return true;
+};
+const hasPascalCaseSuffix = (value, suffix) => {
+    if (!value.endsWith(suffix))
+        return false;
+    const base = value.slice(0, -suffix.length);
+    return isPascalCaseBase(base);
+};
+const toSafeSnakeCase = (value) => {
+    const snake = CommonUtils.toSnakeCase(value);
+    let output = '';
+    let previousWasUnderscore = false;
+    for (const char of snake) {
+        const isAllowed = isAsciiLowercaseLetter(char) || isAsciiDigit(char) || char === '_';
+        const nextChar = isAllowed ? char : '_';
+        if (nextChar === '_') {
+            if (previousWasUnderscore)
+                continue;
+            previousWasUnderscore = true;
+            output += '_';
+            continue;
+        }
+        previousWasUnderscore = false;
+        output += nextChar;
+    }
+    let start = 0;
+    while (start < output.length && output[start] === '_')
+        start += 1;
+    let end = output.length;
+    while (end > start && output[end - 1] === '_')
+        end -= 1;
+    return output.slice(start, end);
+};
+const stripSuffix = (value, suffix) => value.endsWith(suffix) ? value.slice(0, -suffix.length) : value;
+const skipInlineWhitespace = (value, startIndex) => {
+    let nextIndex = startIndex;
+    while (nextIndex < value.length) {
+        const nextChar = value[nextIndex];
+        if (nextChar === ' ' || nextChar === '\t' || nextChar === '\r') {
+            nextIndex += 1;
+            continue;
+        }
+        break;
+    }
+    return nextIndex;
+};
+const findMatchingObjectBrace = (value, startIndex) => {
+    let depth = 0;
+    for (let index = startIndex; index < value.length; index += 1) {
+        const char = value[index];
+        if (char === '{') {
+            depth += 1;
+            continue;
+        }
+        if (char !== '}')
+            continue;
+        depth -= 1;
+        if (depth === 0)
+            return index;
+    }
+    return undefined;
+};
+const findRouteBlockBounds = (configSource) => {
+    const routeLabel = 'route:';
+    const routeIndex = configSource.indexOf(routeLabel);
+    if (routeIndex === -1)
+        return undefined;
+    const braceStart = configSource.indexOf('{', routeIndex + routeLabel.length);
+    if (braceStart === -1)
+        return undefined;
+    const braceEnd = findMatchingObjectBrace(configSource, braceStart);
+    if (braceEnd === undefined)
+        return undefined;
+    const nextIndex = skipInlineWhitespace(configSource, braceEnd + 1);
+    if (configSource[nextIndex] !== ',')
+        return undefined;
+    return {
+        blockStart: routeIndex,
+        innerStart: braceStart + 1,
+        innerEnd: braceEnd,
+        blockEnd: nextIndex + 1,
+    };
+};
+const hasTrailingMiddlewaresTypeCast = (configSource) => {
+    const trimmed = configSource.trimEnd();
+    return trimmed.endsWith('} as MiddlewaresType;');
+};
 const addOptions = (command) => {
     command
         .argument('<type>', 'What to add: service, feature, migration, model, controller, routes, middleware, factory, seeder, requestfactory, responsefactory, workflow, or governance')
@@ -54,7 +175,7 @@ const promptServiceConfig = async (defaultName) => {
             name: 'name',
             message: 'Service name (lowercase, no spaces):',
             default: defaultName,
-            validate: (v) => /^[a-z]+$/.test(v) || 'Must be lowercase letters only',
+            validate: (v) => isLowercaseLettersOnly(v) || 'Must be lowercase letters only',
         },
         {
             type: 'input',
@@ -167,7 +288,7 @@ const promptMigrationConfig = async () => {
             type: 'input',
             name: 'name',
             message: 'Migration name (snake_case, e.g., create_users_table):',
-            validate: (v) => /^[a-z_]+$/.test(v) || 'Must be snake_case',
+            validate: (v) => isSnakeCaseName(v) || 'Must be snake_case',
         },
         {
             type: 'list',
@@ -187,13 +308,13 @@ const findMigrationBySuffix = (migrationsPath, suffix) => {
     return undefined;
 };
 const buildCreateTableMigrationName = (model) => {
-    const modelSnake = CommonUtils.toSnakeCase(model).replaceAll(/[^a-z0-9_]+/g, '_');
+    const modelSnake = toSafeSnakeCase(model);
     const tablePlural = pluralize(modelSnake);
     return `create_${tablePlural}_table`;
 };
 const buildAddColumnMigrationName = (column, model) => {
-    const colSnake = CommonUtils.toSnakeCase(column).replaceAll(/[^a-z0-9_]+/g, '_');
-    const modelSnake = CommonUtils.toSnakeCase(model).replaceAll(/[^a-z0-9_]+/g, '_');
+    const colSnake = toSafeSnakeCase(column);
+    const modelSnake = toSafeSnakeCase(model);
     const tablePlural = pluralize(modelSnake);
     return `add_${colSnake}_${tablePlural}_table`;
 };
@@ -226,9 +347,9 @@ const addMigration = async (cmd, migrationArgs, opts) => {
             throw ErrorFactory.createCliError(`Missing required create migration for model '${modelArg}'. Create it first: zin create migration ${modelArg}`);
         }
         name = buildAddColumnMigrationName(columnArg, modelArg);
-        table = pluralize(CommonUtils.toSnakeCase(modelArg).replaceAll(/[^a-z0-9_]+/g, '_'));
+        table = pluralize(toSafeSnakeCase(modelArg));
         // Store the normalized column name for generator placeholder.
-        column = CommonUtils.toSnakeCase(columnArg).replaceAll(/[^a-z0-9_]+/g, '_');
+        column = toSafeSnakeCase(columnArg);
     }
     cmd.info(`Creating migration: ${name}...`);
     const result = await MigrationGenerator.generateMigration({
@@ -250,7 +371,7 @@ const promptModelConfig = async () => {
             type: 'input',
             name: 'name',
             message: 'Model name (PascalCase, e.g., User, Post):',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*$/.test(v) || 'Must be PascalCase',
+            validate: (v) => isPascalCaseBase(v) || 'Must be PascalCase',
         },
         {
             type: 'confirm',
@@ -298,7 +419,7 @@ const promptControllerConfig = async () => {
             type: 'input',
             name: 'name',
             message: 'Controller name (PascalCase, e.g., UserController):',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*Controller$/.test(v) || 'Must be PascalCase ending with "Controller"',
+            validate: (v) => hasPascalCaseSuffix(v, 'Controller') || 'Must be PascalCase ending with "Controller"',
         },
         {
             type: 'list',
@@ -376,7 +497,7 @@ const promptMiddlewareConfig = async () => {
             name: 'name',
             message: 'Middleware name (PascalCase, e.g., AuthMiddleware):',
             validate: (value) => {
-                return /^[A-Z][a-zA-Z\d]*Middleware$/.test(value)
+                return hasPascalCaseSuffix(value, 'Middleware')
                     ? true
                     : 'Must be PascalCase ending with "Middleware"';
             },
@@ -384,7 +505,7 @@ const promptMiddlewareConfig = async () => {
     ]);
 };
 const buildMiddlewareKey = (middlewareName) => {
-    const withoutSuffix = middlewareName.replace(/Middleware$/, '');
+    const withoutSuffix = stripSuffix(middlewareName, 'Middleware');
     return `${CommonUtils.camelCase(withoutSuffix)}Middleware`;
 };
 const buildMiddlewareSource = (middlewareName) => {
@@ -415,24 +536,24 @@ const registerMiddlewareRouteKey = (configSource, middlewareName, middlewareKey)
     if (configSource.includes(`${middlewareKey}: ${middlewareName}`)) {
         return { content: configSource, updated: true };
     }
-    const routeBlockPattern = /route:\s*\{([\s\S]*?)\n\s*\},/;
-    if (routeBlockPattern.test(configSource)) {
+    const routeBlock = findRouteBlockBounds(configSource);
+    if (routeBlock !== undefined) {
+        const currentInner = configSource.slice(routeBlock.innerStart, routeBlock.innerEnd);
+        const middlewareEntry = `\n    ${middlewareKey}: ${middlewareName},`;
+        const routeInner = currentInner.trim() === '' ? middlewareEntry : `${currentInner.trimEnd()}${middlewareEntry}`;
         return {
-            content: configSource.replace(routeBlockPattern, (_match, inner) => {
-                const prefix = inner.trim() === '' ? '' : inner.replace(/\s*$/, '');
-                const nextInner = prefix === ''
-                    ? `\n    ${middlewareKey}: ${middlewareName},`
-                    : `${prefix}\n    ${middlewareKey}: ${middlewareName},`;
-                return `route: {${nextInner}\n  },`;
-            }),
+            content: configSource.slice(0, routeBlock.blockStart) +
+                `route: {${routeInner}\n  },` +
+                configSource.slice(routeBlock.blockEnd),
             updated: true,
         };
     }
-    const closingPattern = /\n\} as MiddlewaresType;\s*$/;
-    if (!closingPattern.test(configSource)) {
+    if (!hasTrailingMiddlewaresTypeCast(configSource)) {
         return { content: configSource, updated: false };
     }
-    const inserted = configSource.replace(closingPattern, `\n  global: [],\n  route: {\n    ${middlewareKey}: ${middlewareName},\n  },\n} as MiddlewaresType;\n`);
+    const trimmed = configSource.trimEnd();
+    const middlewareBlock = `\n  global: [],\n  route: {\n    ${middlewareKey}: ${middlewareName},\n  },\n} as MiddlewaresType;\n`;
+    const inserted = `${trimmed.slice(0, -'} as MiddlewaresType;'.length)}${middlewareBlock}`;
     return { content: inserted, updated: true };
 };
 const printManualMiddlewareRegistrationSnippet = (cmd, middlewareName, middlewareKey) => {
@@ -451,7 +572,7 @@ const addMiddleware = async (cmd, middlewareName, opts) => {
     else if (name === '') {
         throw ErrorFactory.createValidationError('Middleware name is required');
     }
-    if (!/^[A-Z][a-zA-Z\d]*Middleware$/.test(name)) {
+    if (!hasPascalCaseSuffix(name, 'Middleware')) {
         throw ErrorFactory.createValidationError('Middleware name must be PascalCase ending with "Middleware"');
     }
     const middlewareDir = path.join(projectRoot, 'app', 'Middleware');
@@ -501,13 +622,13 @@ const promptFactoryConfig = async () => {
             type: 'input',
             name: 'name',
             message: 'Factory name (PascalCase, must end with "Factory", e.g., UserFactory):',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*Factory$/.test(v) || 'Must be PascalCase ending with "Factory"',
+            validate: (v) => hasPascalCaseSuffix(v, 'Factory') || 'Must be PascalCase ending with "Factory"',
         },
         {
             type: 'input',
             name: 'model',
             message: 'Model name (e.g., User, Post):',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*$/.test(v) || 'Must be PascalCase',
+            validate: (v) => isPascalCaseBase(v) || 'Must be PascalCase',
         },
         {
             type: 'confirm',
@@ -599,14 +720,14 @@ const promptSeederConfig = async () => {
             type: 'input',
             name: 'name',
             message: 'Seeder name (PascalCase, must end with "Seeder", e.g., UserSeeder):',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*Seeder$/.test(v) || 'Must be PascalCase ending with "Seeder"',
+            validate: (v) => hasPascalCaseSuffix(v, 'Seeder') || 'Must be PascalCase ending with "Seeder"',
         },
         {
             type: 'input',
             name: 'model',
             message: 'Model name (e.g., User, Post):',
             when: (ans) => ans.name !== 'DatabaseSeeder',
-            validate: (v) => /^[A-Z][a-zA-Z\d]*$/.test(v) || 'Must be PascalCase',
+            validate: (v) => isPascalCaseBase(v) || 'Must be PascalCase',
         },
         {
             type: 'input',
@@ -1043,5 +1164,13 @@ export const AddCommand = Object.freeze({
         promptResponseFactoryConfig,
         promptWorkflowConfig,
         getDefaultResponseFields,
+        isPascalCaseBase,
+        toSafeSnakeCase,
+        stripSuffix,
+        skipInlineWhitespace,
+        findMatchingObjectBrace,
+        findRouteBlockBounds,
+        hasTrailingMiddlewaresTypeCast,
+        registerMiddlewareRouteKey,
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"DockerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DockerCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+JrE,eAAO,MAAM,aAAa;cACd,YAAY;EAuBtB,CAAC"}
+{"version":3,"file":"DockerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DockerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAqMrE,eAAO,MAAM,aAAa;cACd,YAAY;EAuBtB,CAAC"}

package/src/cli/commands/DockerCommand.js

@@ -1,10 +1,9 @@
-import { generateUuid } from '../../common/utility.js';
 import { BaseCommand } from '../BaseCommand.js';
 import { DockerPushCommand } from '../commands/DockerPushCommand.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { existsSync, renameSync } from '../../node-singletons/fs.js';
+import { existsSync, readdirSync, renameSync, unlinkSync } from '../../node-singletons/fs.js';
 import { join } from '../../node-singletons/path.js';
 const resolveDefaultWranglerConfig = (cwd) => {
     const candidates = [
@@ -52,15 +51,44 @@ const isContainersProxyConfig = (config) => {
         base === 'wrangler.containers-proxy.toml' ||
         base.startsWith('wrangler.containers-proxy.'));
 };
+const getDevVarsBackupPath = (cwd, name) => join(cwd, `${name}.disabled-by-zin`);
+const clearLegacyDevVarsBackups = (cwd, name) => {
+    const legacyPrefix = `${name}.disabled-by-zin-`;
+    const entries = readdirSync(cwd);
+    for (const entry of entries) {
+        if (!entry.startsWith(legacyPrefix))
+            continue;
+        try {
+            unlinkSync(join(cwd, entry));
+        }
+        catch {
+            // noop
+        }
+    }
+};
+const reconcileDevVarsBackup = (cwd, name) => {
+    const targetPath = join(cwd, name);
+    const backupPath = getDevVarsBackupPath(cwd, name);
+    clearLegacyDevVarsBackups(cwd, name);
+    const hasTarget = existsSync(targetPath);
+    const hasBackup = existsSync(backupPath);
+    if (!hasBackup)
+        return backupPath;
+    if (!hasTarget) {
+        renameSync(backupPath, targetPath);
+        return backupPath;
+    }
+    unlinkSync(backupPath);
+    return backupPath;
+};
 const withDevVarsForConfig = async (cwd, config, envName, fn) => {
-    const nonce = generateUuid();
     const moved = [];
     const swappedIn = [];
     const disable = (name) => {
         const from = join(cwd, name);
         if (!existsSync(from))
             return;
-        const to = join(cwd, `${name}.disabled-by-zin-${nonce}`);
+        const to = reconcileDevVarsBackup(cwd, name);
         renameSync(from, to);
         moved.push({ from, to });
     };

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

@@ -1,5 +1,12 @@
 import { type IBaseCommand } from '../BaseCommand';
 export declare const StartCommand: Readonly<{
     create(): IBaseCommand;
+    _helpers: {
+        isWranglerVarName: (value: string) => boolean;
+        toUpperSnakeCaseIdentifier: (value: string) => string;
+        isWindowsDriveAbsolutePath: (value: string) => boolean;
+        containsCommandToken: (value: string, command: string) => boolean;
+        containsZinCommand: (value: string) => boolean;
+    };
 }>;
 //# sourceMappingURL=StartCommand.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"StartCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/StartCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA26BvF,eAAO,MAAM,YAAY;cACb,YAAY;EAmCtB,CAAC"}
+{"version":3,"file":"StartCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/StartCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmhCvF,eAAO,MAAM,YAAY;cACb,YAAY;;mCAr9BU,MAAM,KAAG,OAAO;4CAaP,MAAM,KAAG,MAAM;4CA4Bf,MAAM,KAAG,OAAO;sCAetB,MAAM,WAAW,MAAM,KAAG,OAAO;oCAmBnC,MAAM,KAAG,OAAO;;EAq7BjD,CAAC"}

package/src/cli/commands/StartCommand.js

@@ -4,14 +4,85 @@ import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { readEnvString } from '../../common/ExternalServiceUtils.js';
 import * as Common from '../../common/index.js';
-import { generateUuid } from '../../common/utility.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { isNonEmptyString } from '../../helper/index.js';
 import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 import { ProjectRuntime } from '../../runtime/ProjectRuntime.js';
-const isWranglerVarName = (value) => /^[A-Za-z_]\w*$/.test(value);
-const isAbsolutePath = (value) => value.startsWith('/') || /^[A-Za-z]:[\\/]/.test(value);
+const isAsciiUppercaseLetter = (value) => value >= 'A' && value <= 'Z';
+const isAsciiLowercaseLetter = (value) => value >= 'a' && value <= 'z';
+const isAsciiLetter = (value) => isAsciiUppercaseLetter(value) || isAsciiLowercaseLetter(value);
+const isAsciiDigit = (value) => value >= '0' && value <= '9';
+const isWordCharacter = (value) => isAsciiLetter(value) || isAsciiDigit(value) || value === '_';
+const isWranglerVarName = (value) => {
+    if (value.length === 0)
+        return false;
+    const first = value[0] ?? '';
+    if (!(isAsciiLetter(first) || first === '_'))
+        return false;
+    for (let index = 1; index < value.length; index += 1) {
+        if (!isWordCharacter(value[index] ?? ''))
+            return false;
+    }
+    return true;
+};
+const toUpperSnakeCaseIdentifier = (value) => {
+    let output = '';
+    let previousWasUnderscore = false;
+    for (const char of value) {
+        const isAllowed = isAsciiLetter(char) || isAsciiDigit(char);
+        const nextChar = isAllowed ? char.toUpperCase() : '_';
+        if (nextChar === '_') {
+            if (previousWasUnderscore)
+                continue;
+            previousWasUnderscore = true;
+            output += '_';
+            continue;
+        }
+        previousWasUnderscore = false;
+        output += nextChar;
+    }
+    let start = 0;
+    while (start < output.length && output[start] === '_')
+        start += 1;
+    let end = output.length;
+    while (end > start && output[end - 1] === '_')
+        end -= 1;
+    return output.slice(start, end);
+};
+const isWindowsDriveAbsolutePath = (value) => {
+    if (value.length < 3)
+        return false;
+    const drive = value[0] ?? '';
+    const colon = value[1] ?? '';
+    const separator = value[2] ?? '';
+    return isAsciiLetter(drive) && colon === ':' && (separator === '\\' || separator === '/');
+};
+const isCommandTokenBoundary = (char) => {
+    if (char === undefined)
+        return true;
+    return !isAsciiLetter(char) && !isAsciiDigit(char);
+};
+const containsCommandToken = (value, command) => {
+    let startIndex = 0;
+    while (startIndex < value.length) {
+        const foundIndex = value.indexOf(command, startIndex);
+        if (foundIndex === -1)
+            return false;
+        const before = foundIndex === 0 ? undefined : value[foundIndex - 1];
+        const afterIndex = foundIndex + command.length;
+        const after = afterIndex >= value.length ? undefined : value[afterIndex];
+        if (isCommandTokenBoundary(before) && isCommandTokenBoundary(after))
+            return true;
+        startIndex = foundIndex + command.length;
+    }
+    return false;
+};
+const containsZinCommand = (value) => {
+    const lower = value.toLowerCase();
+    return containsCommandToken(lower, 'zintrust') || containsCommandToken(lower, 'zin');
+};
+const isAbsolutePath = (value) => value.startsWith('/') || isWindowsDriveAbsolutePath(value);
 const resolveNpmPath = () => {
     try {
         return typeof Common.resolveNpmPath === 'function' ? Common.resolveNpmPath() : 'npm';
@@ -68,10 +139,7 @@ const resolveStandaloneServicePortEnvValue = (cwd) => {
     if (!normalizedCwd.includes(serviceRootMarker))
         return '';
     const serviceName = path.basename(normalizedCwd).trim();
-    const servicePortKey = serviceName
-        .replaceAll(/[^A-Za-z0-9]+/g, '_')
-        .replaceAll(/^_+|_+$/g, '')
-        .toUpperCase();
+    const servicePortKey = toUpperSnakeCaseIdentifier(serviceName);
     const candidateKeys = [
         servicePortKey === '' ? '' : `${servicePortKey}_PORT`,
         'SERVICE_PORT',
@@ -277,14 +345,30 @@ const buildWorkerDevVarsContent = () => {
         .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
         .join('\n') + '\n');
 };
+const getWranglerEnvBackupPath = (targetPath) => `${targetPath}.disabled-by-zin`;
+const reconcileWranglerEnvBackup = (targetPath, backupPath) => {
+    const hasTarget = existsSync(targetPath);
+    const hasBackup = existsSync(backupPath);
+    if (!hasBackup)
+        return;
+    if (!hasTarget) {
+        renameSync(backupPath, targetPath);
+        return;
+    }
+    unlinkSync(backupPath);
+};
 async function withWranglerEnvSnapshot(cwd, envName, fn) {
     const normalizedEnv = typeof envName === 'string' ? envName.trim() : '';
     const targetName = normalizedEnv === '' ? '.dev.vars' : `.dev.vars.${normalizedEnv}`;
     const targetPath = path.join(cwd, targetName);
-    const backupPath = existsSync(targetPath)
-        ? `${targetPath}.disabled-by-zin-${generateUuid()}`
-        : undefined;
-    if (backupPath !== undefined) {
+    const backupPath = getWranglerEnvBackupPath(targetPath);
+    try {
+        reconcileWranglerEnvBackup(targetPath, backupPath);
+    }
+    catch {
+        // noop
+    }
+    if (existsSync(targetPath)) {
         renameSync(targetPath, backupPath);
     }
     try {
@@ -299,14 +383,12 @@ async function withWranglerEnvSnapshot(cwd, envName, fn) {
         catch {
             // noop
         }
-        if (backupPath !== undefined) {
-            try {
-                if (existsSync(backupPath))
-                    renameSync(backupPath, targetPath);
-            }
-            catch {
-                // noop
-            }
+        try {
+            if (existsSync(backupPath))
+                renameSync(backupPath, targetPath);
+        }
+        catch {
+            // noop
         }
     }
 }
@@ -404,7 +486,7 @@ const resolveNodeDevCommand = (cwd, packageJson) => {
     // IMPORTANT: avoid calling `npm run dev` when the dev script itself invokes `zin`/`zintrust`
     // (e.g. "dev": "zin s"), which would cause infinite recursion.
     const devScript = typeof packageJson.scripts?.['dev'] === 'string' ? String(packageJson.scripts['dev']) : '';
-    const devScriptCallsZin = /\bzin(?:trust)?\b/.test(devScript);
+    const devScriptCallsZin = containsZinCommand(devScript);
     if (hasDevScript(packageJson) && !devScriptCallsZin) {
         const npm = resolveNpmPath();
         return { command: npm, args: ['run', 'dev'] };
@@ -727,4 +809,11 @@ export const StartCommand = Object.freeze({
         });
         return cmd;
     },
+    _helpers: {
+        isWranglerVarName,
+        toUpperSnakeCaseIdentifier,
+        isWindowsDriveAbsolutePath,
+        containsCommandToken,
+        containsZinCommand,
+    },
 });

package/src/config/middleware.d.ts

@@ -1,5 +1,27 @@
 import type { MiddlewareConfigType } from './type';
 import type { Middleware } from '../middleware/MiddlewareStack';
+import type { MiddlewareFailureResponder } from '../middleware/MiddlewareFailureResponder';
+type SharedMiddlewares = {
+    log: Middleware;
+    error: Middleware;
+    security: Middleware;
+    rateLimit: Middleware;
+    sanitizeBody: Middleware;
+    fillRateLimit: Middleware;
+    authRateLimit: Middleware;
+    userMutationRateLimit: Middleware;
+    csrf: Middleware;
+    auth: Middleware;
+    jwt: Middleware;
+    bulletproof: Middleware;
+    validateLogin: Middleware;
+    validateRegister: Middleware;
+    validateUserStore: Middleware;
+    validateUserUpdate: Middleware;
+    validateUserFill: Middleware;
+};
+type MiddlewareResponderKey = keyof SharedMiddlewares;
+type MiddlewareResponderConfig = Partial<Record<MiddlewareResponderKey, MiddlewareFailureResponder>>;
 export declare const MiddlewareBody: {
     readonly email: "email";
     readonly password: "password";
@@ -23,6 +45,7 @@ export type MiddlewaresType = {
         max: number;
         message: string;
     };
+    responders?: MiddlewareResponderConfig;
     global?: ReadonlyArray<Middleware>;
     route?: Record<string, Middleware>;
 };

package/src/config/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/config/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAUzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAwD9D,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,qBAAqB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1E,MAAM,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;EAkBuB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,cAAc,CAAC;AAoOxD,wBAAgB,sBAAsB,IAAI,oBAAoB,CAwC7D;AAID;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAAO,IAE7C,CAAC;AAwBF,eAAO,MAAM,gBAAgB,EAAE,oBAY7B,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/config/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAUzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAK9D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AAgCzF,KAAK,iBAAiB,GAAG;IACvB,GAAG,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC;IACtB,YAAY,EAAE,UAAU,CAAC;IACzB,aAAa,EAAE,UAAU,CAAC;IAC1B,aAAa,EAAE,UAAU,CAAC;IAC1B,qBAAqB,EAAE,UAAU,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,UAAU,CAAC;IAChB,WAAW,EAAE,UAAU,CAAC;IACxB,aAAa,EAAE,UAAU,CAAC;IAC1B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,iBAAiB,EAAE,UAAU,CAAC;IAC9B,kBAAkB,EAAE,UAAU,CAAC;IAC/B,gBAAgB,EAAE,UAAU,CAAC;CAC9B,CAAC;AAEF,KAAK,sBAAsB,GAAG,MAAM,iBAAiB,CAAC;AACtD,KAAK,yBAAyB,GAAG,OAAO,CACtC,MAAM,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAC3D,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,qBAAqB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1E,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,MAAM,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;EAkBuB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,cAAc,CAAC;AA2RxD,wBAAgB,sBAAsB,IAAI,oBAAoB,CA0C7D;AAID;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAAO,IAE7C,CAAC;AAwBF,eAAO,MAAM,gBAAgB,EAAE,oBAY7B,CAAC;AAEH,eAAe,gBAAgB,CAAC"}