@zintrust/core 0.1.4 → 0.1.6

package/src/cli/scaffolding/MigrationGenerator.js

@@ -2,10 +2,10 @@
  * MigrationGenerator - Generate database migrations
  * Creates migration files for schema changes
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { CommonUtils } from '../../common/index';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { CommonUtils } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate migration options
  */

package/src/cli/scaffolding/ModelGenerator.js

@@ -2,10 +2,10 @@
  * ModelGenerator - Generate ORM model files
  * Creates type-safe model modules with relationships and validation
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { CommonUtils } from '../../common/index';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { CommonUtils } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate model options
  */
@@ -84,7 +84,7 @@ function buildModelCode(options) {
  * Auto-generated model file
  */
 
-import { Model, IModel } from '../../orm/Model';
+import { type IModel, Model } from '@zintrust/core';
 
 export const ${options.name} = Object.freeze(
   Model.define({

package/src/cli/scaffolding/ProjectScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AAqWD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AAwID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}
+{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AAwaD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA0ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}

package/src/cli/scaffolding/ProjectScaffolder.js

@@ -2,10 +2,21 @@
  * Project Scaffolder - New project generation
  * Handles directory structure and boilerplate file creation
  */
-import { esmDirname } from '../../common/index';
-import { Logger } from '../../config/logger';
-import fs from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { Logger } from '../../config/logger.js';
+import { randomBytes } from '../../node-singletons/crypto.js';
+import fs from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
+import { fileURLToPath } from '../../node-singletons/url.js';
+const loadCoreVersion = () => {
+    try {
+        const packageUrl = new URL('../../../package.json', import.meta.url);
+        const packageJson = JSON.parse(fs.readFileSync(packageUrl, 'utf-8'));
+        return typeof packageJson.version === 'string' ? packageJson.version : '0.0.0';
+    }
+    catch {
+        return '0.0.0';
+    }
+};
 const createDirectories = (projectPath, directories) => {
     let count = 0;
     if (!fs.existsSync(projectPath)) {
@@ -99,13 +110,19 @@ const createEnvFile = (projectPath, variables) => {
         const name = typeof variables['projectName'] === 'string' ? variables['projectName'] : 'zintrust-app';
         const port = Number(variables['port'] ?? 3000);
         const database = typeof variables['database'] === 'string' ? variables['database'] : 'sqlite';
+        // Generate a secure APP_KEY (32 bytes = 256-bit, base64 encoded)
+        const appKeyBytes = randomBytes(32);
+        const appKey = appKeyBytes.toString('base64');
         const baseLines = [
             'NODE_ENV=development',
+            'STARTUP_REQUIRE_ENV=true',
             `APP_NAME=${name}`,
+            'HOST=localhost',
+            `PORT=${port}`,
             `APP_PORT=${port}`,
             'APP_DEBUG=true',
-            // Placeholders only (no generated secrets during scaffold)
-            'APP_KEY=',
+            // Auto-generated secure key for storage signing and encryption
+            `APP_KEY=${appKey}`,
             `DB_CONNECTION=${database}`,
         ];
         const dbLines = (() => {
@@ -119,7 +136,8 @@ const createEnvFile = (projectPath, variables) => {
                 ];
             }
             if (database === 'sqlite') {
-                return ['DB_DATABASE=./database.sqlite'];
+                // Provide both DB_DATABASE (used by the framework) and DB_PATH (common alias)
+                return ['DB_DATABASE=./database.sqlite', 'DB_PATH=./database.sqlite'];
             }
             return [];
         })();
@@ -127,7 +145,8 @@ const createEnvFile = (projectPath, variables) => {
             '',
             '# Logging',
             'LOG_LEVEL=debug',
-            'LOG_CHANNEL=file',
+            'LOG_CHANNEL=console',
+            'LOG_FORMAT=json',
             '',
             '# Auth / Security',
             'JWT_SECRET=',
@@ -156,9 +175,9 @@ const createEnvFile = (projectPath, variables) => {
     }
 };
 const getProjectTemplatesRoot = () => {
-    const thisDir = esmDirname(import.meta.url);
     // src/cli/scaffolding/ -> src/templates/project/
-    return path.resolve(thisDir, '..', '..', 'templates', 'project');
+    const templatesUrl = new URL('../../templates/project', import.meta.url);
+    return fileURLToPath(templatesUrl);
 };
 const listTemplateFilesRecursive = (dirPath) => {
     const entries = fs.readdirSync(dirPath, { withFileTypes: true });
@@ -204,12 +223,54 @@ const resolveTemplateMetadata = (templateName, meta, fallback) => {
 const loadTemplateFiles = (templateDir) => {
     const files = {};
     const allFiles = listTemplateFilesRecursive(templateDir);
+    const allowedConfigFiles = new Set([
+        'config/broadcast.ts',
+        'config/cache.ts',
+        'config/database.ts',
+        'config/logging/HttpLogger.ts',
+        'config/mail.ts',
+        'config/notification.ts',
+        'config/queue.ts',
+        'config/storage.ts',
+    ]);
+    const isENOENT = (error) => error !== null &&
+        typeof error === 'object' &&
+        'code' in error &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        error.code === 'ENOENT';
+    const normalizeRelPath = (relPath) => relPath.replaceAll('\\', '/');
+    const getOutputRelPath = (relPath) => relPath.endsWith('.tpl') ? relPath.slice(0, -'.tpl'.length) : relPath;
+    const shouldIncludeTemplateFile = (relPath) => {
+        if (relPath === 'template.json')
+            return false;
+        const normalized = normalizeRelPath(relPath);
+        if (!normalized.startsWith('config/'))
+            return true;
+        // Starter apps should only ship app-level config modules.
+        // Core/framework config internals (e.g. config/logging/*) remain core-owned.
+        const outputRel = normalizeRelPath(getOutputRelPath(relPath));
+        return allowedConfigFiles.has(outputRel);
+    };
+    const readUtf8FileOrUndefined = (absPath) => {
+        try {
+            return fs.readFileSync(absPath, 'utf8');
+        }
+        catch (error) {
+            // Some tests temporarily create/delete template files in parallel; if a file
+            // disappears between directory listing and read, skip it.
+            if (isENOENT(error))
+                return undefined;
+            throw error;
+        }
+    };
     for (const absPath of allFiles) {
         const rel = path.relative(templateDir, absPath);
-        if (rel === 'template.json')
+        if (!shouldIncludeTemplateFile(rel))
+            continue;
+        const content = readUtf8FileOrUndefined(absPath);
+        if (content === undefined)
             continue;
-        const content = fs.readFileSync(absPath, 'utf8');
-        const outputRel = rel.endsWith('.tpl') ? rel.slice(0, -'.tpl'.length) : rel;
+        const outputRel = getOutputRelPath(rel);
         files[outputRel] = content;
     }
     return files;
@@ -233,10 +294,10 @@ const BASIC_TEMPLATE = {
     name: 'basic',
     description: 'Basic Zintrust project structure',
     directories: [
+        'config',
         'app/Controllers',
         'app/Middleware',
         'app/Models',
-        'config',
         'database/migrations',
         'database/seeders',
         'logs',
@@ -289,7 +350,7 @@ const FULLSTACK_TEMPLATE = {
         'app/Controllers',
         'app/Middleware',
         'app/Models',
-        'config',
+        // Starter projects should not include framework config internals.
         'database/migrations',
         'database/seeders',
         'logs',
@@ -366,6 +427,7 @@ const prepareContext = (state, options) => {
         database: options.database ?? 'sqlite',
         template: state.templateName,
         migrationTimestamp,
+        coreVersion: loadCoreVersion(),
     };
 };
 const createDirectoriesForState = (state) => {
@@ -384,6 +446,7 @@ const createFilesForState = (state) => {
         files['.gitignore'] = `node_modules/
 dist/
 .env
+.env.*
 .env.local
 .DS_Store
 coverage/

package/src/cli/scaffolding/RequestFactoryGenerator.js

@@ -2,11 +2,11 @@
  * Request Factory Generator - Phase 6.3
  * Generates request/input DTO factories with built-in validation
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import { fsPromises as fs } from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { fsPromises as fs } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate request factory options
  */

package/src/cli/scaffolding/ResponseFactoryGenerator.js

@@ -2,11 +2,11 @@
  * Response Factory Generator - Phase 7
  * Generates response/output DTO factories with built-in validation
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import { fsPromises as fs } from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { fsPromises as fs } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate response factory options
  */

package/src/cli/scaffolding/RouteGenerator.js

@@ -2,9 +2,9 @@
  * RouteGenerator - Generate route files
  * Creates route definitions with middleware and parameters
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate route options
  */
@@ -93,7 +93,7 @@ ${routeRegistration}
  * Build import statements
  */
 function buildImports(options) {
-    const imports = ['import { Router } from "../../routing/Router";'];
+    const imports = ['import { Router } from "../../routing/Router.js";'];
     // Collect unique controllers
     const controllers = new Set();
     for (const route of options.routes) {

package/src/cli/scaffolding/SeederGenerator.js

@@ -3,12 +3,12 @@
  * Generates database seeders for populating development/staging databases
  * Uses factory generators for consistent data generation
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { CommonUtils } from '../../common/index';
-import { Logger } from '../../config/logger';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import { fsPromises as fs } from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { CommonUtils } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { fsPromises as fs } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Seeder Generator - Creates database seeders using factory classes
  * Enables rapid database population for development and staging
@@ -213,7 +213,7 @@ function buildSeederResetMethod(options) {
  */
 function buildImports(options) {
     const factoryName = getFactoryName(options);
-    return `import { Logger } from '../../config/logger';
+    return `import { Logger } from '../../config/logger.js';
 import { ${factoryName} } from '@database/factories/${factoryName}';
 import { ${options.modelName} } from '@app/Models/${options.modelName}';`;
 }

package/src/cli/scaffolding/ServiceIntegrationTestGenerator.js

@@ -2,10 +2,10 @@
  * Service Integration Test Generator
  * Generates integration tests for service-to-service communication
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { CommonUtils } from '../../common/index';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { CommonUtils } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate integration test options
  */
@@ -71,7 +71,7 @@ function buildTestCode(options) {
  */
 
 import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 
 interface ServiceConfig {
   baseUrl: string;

package/src/cli/scaffolding/ServiceRequestFactoryGenerator.js

@@ -2,10 +2,10 @@
  * ServiceRequestFactoryGenerator - Generate inter-service request factories
  * Creates type-safe factories for testing service-to-service API calls
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { CommonUtils } from '../../common/index';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { CommonUtils } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Validate options
  */

package/src/cli/scaffolding/ServiceScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ServiceScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AAEH;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAuB7F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAGnF;AAED;;GAEG;AAEH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,qBAAqB,CAAC,CA+ChC;AA4SD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}
+{"version":3,"file":"ServiceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ServiceScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AAEH;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAuB7F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAGnF;AAED;;GAEG;AAEH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,qBAAqB,CAAC,CA+ChC;AA6SD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}

package/src/cli/scaffolding/ServiceScaffolder.js

@@ -2,9 +2,9 @@
  * ServiceScaffolder - Generate microservices within a project
  * Creates service structure with controllers, models, routes, and config
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * ServiceScaffolder generates microservices with all necessary files
  */
@@ -97,6 +97,7 @@ function createServiceDirectories(servicePath) {
         'src/middleware',
         'src/migrations',
         'src/factories',
+        'routes',
     ];
     for (const dir of dirs) {
         FileGenerator.createDirectory(path.join(servicePath, dir));
@@ -110,7 +111,7 @@ function createServiceFiles(servicePath, options) {
     const files = [
         { path: 'service.config.json', content: generateServiceConfig(options) },
         { path: 'src/index.ts', content: generateServiceIndex(options) },
-        { path: 'src/routes.ts', content: generateServiceRoutes(options) },
+        { path: 'routes/api.ts', content: generateServiceRoutes(options) },
         { path: 'src/controllers/ExampleController.ts', content: generateExampleController(options) },
         { path: 'src/models/Example.ts', content: generateExampleModel(options) },
         { path: '.env', content: generateServiceEnv(options) },
@@ -161,24 +162,26 @@ function generateServiceIndex(options) {
  * Auth: ${options.auth ?? 'api-key'}
  */
 
-import { Application } from '../../boot/Application';
-import { Server } from '../../boot/Server';
-import { Logger } from '../../config/logger';
-import { Env } from '../../config/env';
-import { esmDirname } from '../../common/index';
-import * as path from '../../node-singletons/path';
+import { Application, Server } from '@zintrust/core';
+import { Logger } from '../../config/logger.js';
+import { Env } from '../../config/env.js';
+import { esmDirname } from '../../common/index.js';
+import * as path from '../../node-singletons/path.js';
 
 const __dirname = esmDirname(import.meta.url);
-const app = new Application(path.join(__dirname, '..'));
 const port = Env.getInt('${options.name?.toUpperCase()}_PORT', ${options.port ?? 3001});
 
-// Start server
-const server = new Server(app, port);
-server.start().then(() => {
+async function start(): Promise<void> {
+  const app = Application.create(path.join(__dirname, '..'));
+  await app.boot();
+
+  const server = Server.create(app, port);
+  await server.listen();
+
   Logger.info(\`${options.name} service running on port \${port}\`);
-});
+}
 
-export default app;
+await start();
 `;
 }
 /**
@@ -189,11 +192,11 @@ function generateServiceRoutes(options) {
  * ${options.name} Service Routes
  */
 
-import { Router } from '../../routing/Router';
+import { Router, type IRouter } from '@zintrust/core';
 
-export function registerRoutes(router: Router): void {
+export function registerRoutes(router: IRouter): void {
   // Example route
-  router.get('/', (req, res) => {
+  Router.get(router, '/', (_req, res) => {
     res.json({ message: '${options.name} service' });
   });
 }
@@ -208,9 +211,7 @@ function generateExampleController(options) {
  * Example Controller for ${options.name} Service
  */
 
-import { IRequest } from '../../http/Request';
-import { IResponse } from '../../http/Response';
-import { Controller } from '../../http/Controller';
+import { type IRequest, type IResponse, Controller } from '@zintrust/core';
 
 export const ${className} = {
   ...Controller,
@@ -263,7 +264,7 @@ function generateExampleModel(options) {
  * Example Model for ${options.name} Service
  */
 
-import { Model } from '../../orm/Model';
+import { Model } from '@zintrust/core';
 
 export const Example = Model.define({
   table: '${options.name}',

package/src/cli/scaffolding/TemplateEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateEngine.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/TemplateEngine.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,iBAAiB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAmDD;;GAEG;AACH,eAAO,MAAM,cAAc;sBAjDM,MAAM,aAAa,iBAAiB,KAAG,MAAM;6BAA7C,MAAM,aAAa,iBAAiB,KAAG,MAAM;0BAA7C,MAAM,aAAa,iBAAiB,KAAG,MAAM;6BAiBpE,iBAAiB,YACf,iBAAiB,KAC1B,iBAAiB;4BASmB,MAAM,KAAG,OAAO;gCASZ,MAAM,KAAG,MAAM,EAAE;EAmB1D,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAgDvD,CAAC"}
+{"version":3,"file":"TemplateEngine.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/TemplateEngine.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,iBAAiB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAmDD;;GAEG;AACH,eAAO,MAAM,cAAc;sBAjDM,MAAM,aAAa,iBAAiB,KAAG,MAAM;6BAA7C,MAAM,aAAa,iBAAiB,KAAG,MAAM;0BAA7C,MAAM,aAAa,iBAAiB,KAAG,MAAM;6BAiBpE,iBAAiB,YACf,iBAAiB,KAC1B,iBAAiB;4BASmB,MAAM,KAAG,OAAO;gCASZ,MAAM,KAAG,MAAM,EAAE;EAmB1D,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CA8CvD,CAAC"}

package/src/cli/scaffolding/TemplateEngine.js

@@ -70,7 +70,6 @@ export const BUILT_IN_TEMPLATES = {
             'routes',
             'tests/unit',
             'tests/integration',
-            'config',
             'database/migrations',
             'database/seeders',
         ],
@@ -95,7 +94,6 @@ export const BUILT_IN_TEMPLATES = {
             'routes',
             'tests/unit',
             'tests/integration',
-            'config',
             'database/migrations',
             'database/seeders',
             'services',

package/src/cli/scaffolding/TemplateGenerator.js

@@ -6,10 +6,10 @@
  * - Generates into application folders (default: src/mail/markdown and src/notification/markdown)
  * - Uses FileGenerator for consistent file I/O + logging
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import * as path from '../../node-singletons/path.js';
 const normalizeList = (items) => {
     const out = [];
     for (const raw of items) {

package/src/cli/scaffolding/WorkflowGenerator.js

@@ -2,10 +2,10 @@
  * Workflow Generator
  * Generates GitHub Actions workflows for deployment and CI/CD
  */
-import { FileGenerator } from '../scaffolding/FileGenerator';
-import { Logger } from '../../config/logger';
-import { fsPromises as fs } from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { Logger } from '../../config/logger.js';
+import { fsPromises as fs } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 /**
  * Generate a deployment workflow
  */

package/src/cli/scaffolding/index.js

@@ -1,19 +1,19 @@
 /**
  * Scaffolding Module Exports
  */
-export { ControllerGenerator } from '../scaffolding/ControllerGenerator';
-export { FactoryGenerator } from '../scaffolding/FactoryGenerator';
-export { FeatureScaffolder } from '../scaffolding/FeatureScaffolder';
-export { FileGenerator } from '../scaffolding/FileGenerator';
-export { MigrationGenerator } from '../scaffolding/MigrationGenerator';
-export { ModelGenerator } from '../scaffolding/ModelGenerator';
-export { ProjectScaffolder } from '../scaffolding/ProjectScaffolder';
-export { RequestFactoryGenerator } from '../scaffolding/RequestFactoryGenerator';
-export { ResponseFactoryGenerator } from '../scaffolding/ResponseFactoryGenerator';
-export { RouteGenerator } from '../scaffolding/RouteGenerator';
-export { SeederGenerator } from '../scaffolding/SeederGenerator';
-export { ServiceIntegrationTestGenerator } from '../scaffolding/ServiceIntegrationTestGenerator';
-export { ServiceRequestFactoryGenerator } from '../scaffolding/ServiceRequestFactoryGenerator';
-export { ServiceScaffolder } from '../scaffolding/ServiceScaffolder';
-export { BUILT_IN_TEMPLATES, TemplateEngine } from '../scaffolding/TemplateEngine';
-export { TemplateGenerator } from '../scaffolding/TemplateGenerator';
+export { ControllerGenerator } from '../scaffolding/ControllerGenerator.js';
+export { FactoryGenerator } from '../scaffolding/FactoryGenerator.js';
+export { FeatureScaffolder } from '../scaffolding/FeatureScaffolder.js';
+export { FileGenerator } from '../scaffolding/FileGenerator.js';
+export { MigrationGenerator } from '../scaffolding/MigrationGenerator.js';
+export { ModelGenerator } from '../scaffolding/ModelGenerator.js';
+export { ProjectScaffolder } from '../scaffolding/ProjectScaffolder.js';
+export { RequestFactoryGenerator } from '../scaffolding/RequestFactoryGenerator.js';
+export { ResponseFactoryGenerator } from '../scaffolding/ResponseFactoryGenerator.js';
+export { RouteGenerator } from '../scaffolding/RouteGenerator.js';
+export { SeederGenerator } from '../scaffolding/SeederGenerator.js';
+export { ServiceIntegrationTestGenerator } from '../scaffolding/ServiceIntegrationTestGenerator.js';
+export { ServiceRequestFactoryGenerator } from '../scaffolding/ServiceRequestFactoryGenerator.js';
+export { ServiceScaffolder } from '../scaffolding/ServiceScaffolder.js';
+export { BUILT_IN_TEMPLATES, TemplateEngine } from '../scaffolding/TemplateEngine.js';
+export { TemplateGenerator } from '../scaffolding/TemplateGenerator.js';

package/src/cli/utils/DistPackager.js

@@ -1,7 +1,7 @@
-import { Logger } from '../../config/logger';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import fs from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import fs from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 const readRootPackageJson = (rootPath) => {
     const rootPackageJsonPath = path.join(rootPath, 'package.json');
     if (!fs.existsSync(rootPackageJsonPath)) {

package/src/cli/utils/EnvFileLoader.js

@@ -1,5 +1,5 @@
-import { existsSync, readFileSync } from '../../node-singletons/fs';
-import { join } from '../../node-singletons/path';
+import { existsSync, readFileSync } from '../../node-singletons/fs.js';
+import { join } from '../../node-singletons/path.js';
 const normalizeAppMode = (value) => {
     const normalized = value.trim().toLowerCase();
     if (normalized === 'production' || normalized === 'pro' || normalized === 'prod')

package/src/cli/utils/spawn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/spawn.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA8BD,eAAO,MAAM,SAAS;wBACM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;EAwD7D,CAAC"}
+{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/spawn.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA8BD,eAAO,MAAM,SAAS;wBACM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;EAwE7D,CAAC"}

package/src/cli/utils/spawn.js

@@ -1,8 +1,8 @@
-import { appConfig } from '../../config/app';
-import { ErrorFactory } from '../../exceptions/ZintrustError';
-import { spawn } from '../../node-singletons/child-process';
-import { existsSync } from '../../node-singletons/fs';
-import * as path from '../../node-singletons/path';
+import { appConfig } from '../../config/app.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { spawn } from '../../node-singletons/child-process.js';
+import { existsSync } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
 const getExitCode = (exitCode, signal) => {
     if (typeof exitCode === 'number')
         return exitCode;
@@ -38,13 +38,24 @@ export const SpawnUtil = Object.freeze({
             env: input.env ?? appConfig.getSafeEnv(),
             stdio: 'inherit',
         });
-        const forwardSignals = input.forwardSignals !== false;
+        // In interactive shells, the foreground process group already receives SIGINT
+        // (and often SIGTERM) so forwarding can cause duplicates. `tsx watch` is
+        // especially sensitive here and can print "Previous process hasn't exited yet. Force killing...".
+        const forwardSignals = typeof input.forwardSignals === 'boolean' ? input.forwardSignals : !process.stdin.isTTY;
         const forwardSignal = (signal) => {
             try {
                 child.kill(signal);
             }
             catch (error) {
-                throw ErrorFactory.createTryCatchError('Failed to forward signal to child process', error);
+                const wrapped = ErrorFactory.createTryCatchError('Failed to forward signal to child process', error);
+                // Best-effort logging; then rethrow (tests/assertions rely on this behavior).
+                try {
+                    process.stderr.write(`${String(wrapped.message)}\n`);
+                }
+                catch {
+                    // ignore
+                }
+                throw wrapped;
             }
         };
         const onSigint = () => forwardSignal('SIGINT');

package/src/common/AwsSigV4.js

@@ -1,4 +1,4 @@
-import { createHash, createHmac } from '../node-singletons/crypto';
+import { createHash, createHmac } from '../node-singletons/crypto.js';
 export const AwsSigV4 = Object.freeze({
     sha256Hex(data) {
         return createHash('sha256').update(data).digest('hex');