@zintrust/core 0.5.9 → 0.7.2

package/src/cli/commands/schedule/ScheduleCliSupport.js

@@ -1,25 +1,133 @@
+import { SpawnUtil } from '../../utils/spawn.js';
 import { databaseConfig } from '../../../config/database.js';
+import { ErrorFactory } from '../../../exceptions/ZintrustError.js';
+import { existsSync } from '../../../node-singletons/fs.js';
+import path from '../../../node-singletons/path.js';
 import { registerDatabasesFromRuntimeConfig } from '../../../orm/DatabaseRuntimeRegistration.js';
+import { ensureNodeStartupEnvLoaded } from '../../../runtime/NodeStartup.js';
+import { resolveNodeProjectRoot } from '../../../runtime/resolveNodeProjectRoot.js';
+import useFileLoader from '../../../runtime/useFileLoader.js';
 import { SchedulerRuntime } from '../../../scheduler/SchedulerRuntime.js';
+const SOURCE_REENTRY_ENV = 'ZINTRUST_SCHEDULE_CLI_SOURCE_REENTRY';
 const isSchedule = (value) => {
     if (value === undefined || value === null || typeof value !== 'object')
         return false;
     return 'name' in value && typeof value.name === 'string';
 };
-const loadScheduleModules = async () => {
-    const coreSchedules = await import('../../../schedules/index.js');
-    let appSchedules = {};
+const getProjectScheduleLoaders = () => [
+    useFileLoader('app/Schedules/index.ts'),
+    useFileLoader('app/Schedules.ts'),
+];
+const isTypeScriptFile = (filePath) => {
+    const ext = path.extname(filePath).toLowerCase();
+    return ext === '.ts' || ext === '.tsx' || ext === '.mts';
+};
+const getProjectSourceCliEntry = (projectRoot) => {
+    const candidates = [
+        path.join(projectRoot, 'bin', 'zin.ts'),
+        path.join(projectRoot, 'bin', 'zintrust.ts'),
+    ];
+    for (const candidate of candidates) {
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return undefined;
+};
+const isRunningProjectSourceCli = (projectRoot) => {
+    const script = String(process.argv[1] ?? '').trim();
+    if (script.length === 0)
+        return false;
+    const resolvedScript = path.resolve(script);
+    const sourceCliEntry = getProjectSourceCliEntry(projectRoot);
+    if (sourceCliEntry === undefined)
+        return false;
+    return resolvedScript === path.resolve(sourceCliEntry);
+};
+const getExistingProjectSchedulePath = () => {
+    for (const loader of getProjectScheduleLoaders()) {
+        if (loader.exists())
+            return loader.path();
+    }
+    return undefined;
+};
+const tryLoadProjectScheduleModuleFromFiles = async () => {
+    const existingLoaders = getProjectScheduleLoaders()
+        .filter((loader) => loader.exists())
+        .map((loader) => ({ loader, loadedPath: loader.path() }));
+    const tryAt = async (index, firstError) => {
+        const entry = existingLoaders[index];
+        if (entry === undefined) {
+            if (existingLoaders.length > 0 && firstError !== undefined)
+                throw firstError;
+            return undefined;
+        }
+        try {
+            return {
+                module: await entry.loader.get(),
+                loadedPath: entry.loadedPath,
+            };
+        }
+        catch (error) {
+            return tryAt(index + 1, firstError ?? error);
+        }
+    };
+    return tryAt(0);
+};
+const loadAppScheduleModule = async () => {
     try {
-        appSchedules = (await import('../../../../app/Schedules/index.js'));
+        return {
+            module: (await import('../../../../app/Schedules/index.js')),
+        };
     }
     catch {
-        appSchedules = {};
+        const fileLoaded = await tryLoadProjectScheduleModuleFromFiles();
+        return fileLoaded ?? { module: {} };
     }
+};
+const loadScheduleModules = async () => {
+    const coreSchedules = await import('../../../schedules/index.js');
+    const appSchedules = await loadAppScheduleModule();
     return {
         core: Object.values(coreSchedules).filter(isSchedule),
-        app: Object.values(appSchedules).filter(isSchedule),
+        app: Object.values(appSchedules.module).filter(isSchedule),
     };
 };
+const ensureProjectSourceContext = async () => {
+    await ensureNodeStartupEnvLoaded({ entry: 'schedule-cli' });
+    const projectRoot = await resolveNodeProjectRoot();
+    if ((process.env['ZINTRUST_PROJECT_ROOT'] ?? '').trim() === '') {
+        process.env['ZINTRUST_PROJECT_ROOT'] = projectRoot;
+    }
+    const existingSchedulePath = getExistingProjectSchedulePath();
+    if (existingSchedulePath === undefined || !isTypeScriptFile(existingSchedulePath)) {
+        return false;
+    }
+    if (String(process.env[SOURCE_REENTRY_ENV] ?? '') === '1') {
+        return false;
+    }
+    if (isRunningProjectSourceCli(projectRoot)) {
+        return false;
+    }
+    const sourceCliEntry = getProjectSourceCliEntry(projectRoot);
+    if (sourceCliEntry === undefined) {
+        throw ErrorFactory.createCliError('Source schedules require a project CLI entrypoint at bin/zin.ts or bin/zintrust.ts');
+    }
+    const relativeSourceCliEntry = path.relative(projectRoot, sourceCliEntry);
+    const exitCode = await SpawnUtil.spawnAndWait({
+        command: 'tsx',
+        args: [relativeSourceCliEntry, ...process.argv.slice(2)],
+        cwd: projectRoot,
+        env: {
+            ...process.env,
+            ZINTRUST_PROJECT_ROOT: projectRoot,
+            [SOURCE_REENTRY_ENV]: '1',
+        },
+    });
+    if (exitCode !== 0) {
+        throw ErrorFactory.createCliError(`Failed to execute schedule command via project source CLI (exit ${exitCode})`);
+    }
+    return true;
+};
 const shutdownCliResources = async () => {
     try {
         const mod = await import('../../../orm/ConnectionManager.js');
@@ -44,7 +152,9 @@ const shutdownCliResources = async () => {
     }
 };
 export const ScheduleCliSupport = Object.freeze({
+    ensureProjectSourceContext,
     async registerAll() {
+        await ensureNodeStartupEnvLoaded({ entry: 'schedule-cli' });
         registerDatabasesFromRuntimeConfig(databaseConfig);
         const modules = await loadScheduleModules();
         SchedulerRuntime.registerMany(modules.core, 'core');

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

@@ -1 +1 @@
-{"version":3,"file":"GovernanceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/GovernanceScaffolder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH,MAAM,MAAM,yBAAyB,GAAG,QAAQ,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAAC;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAuSH,eAAO,MAAM,oBAAoB;0BAEhB,MAAM,YACV,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC;EA+DpC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"GovernanceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/GovernanceScaffolder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH,MAAM,MAAM,yBAAyB,GAAG,QAAQ,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAAC;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AA2TH,eAAO,MAAM,oBAAoB;0BAEhB,MAAM,YACV,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC;EA+DpC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

package/src/cli/scaffolding/GovernanceScaffolder.js

@@ -51,17 +51,36 @@ const ensureDevDependency = (devDependencies, name, version) => {
         devDependencies[name] = version;
     }
 };
+const getBundledGovernanceVersion = () => {
+    try {
+        const pkgUrl = new URL('../../../packages/governance/package.json', import.meta.url);
+        const raw = FileGenerator.readFile(pkgUrl.toString());
+        const parsed = JSON.parse(raw);
+        return typeof parsed.version === 'string' && parsed.version.trim() !== ''
+            ? toCompatibleGovernanceVersion(parsed.version)
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
 const inferGovernanceVersion = (pkg) => {
+    const devDeps = getStringRecord(pkg.devDependencies);
+    const existingGovernance = devDeps?.['@zintrust/governance'];
+    if (typeof existingGovernance === 'string' && existingGovernance.trim() !== '') {
+        return existingGovernance;
+    }
     const deps = getStringRecord(pkg.dependencies);
     const core = deps?.['@zintrust/core'];
+    const bundledGovernanceVersion = getBundledGovernanceVersion();
     if (typeof core === 'string' && core.trim() !== '') {
-        return toCompatibleGovernanceVersion(core);
+        return bundledGovernanceVersion ?? toCompatibleGovernanceVersion(core);
     }
     const currentVersion = VersionChecker.getCurrentVersion().trim();
     if (currentVersion !== '' && currentVersion !== '0.0.0') {
-        return toCompatibleGovernanceVersion(currentVersion);
+        return bundledGovernanceVersion ?? toCompatibleGovernanceVersion(currentVersion);
     }
-    return '^0.4.0';
+    return bundledGovernanceVersion ?? '^0.4.0';
 };
 const writeEslintConfig = (projectRoot) => {
     const eslintConfigPath = path.join(projectRoot, 'eslint.config.mjs');

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

@@ -1 +1 @@
-{"version":3,"file":"MigrationGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/MigrationGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmB/F;AAED;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAwE7F;AAoRD;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;EAG7B,CAAC"}
+{"version":3,"file":"MigrationGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/MigrationGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmB/F;AAED;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAwE7F;AAqRD;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;EAG7B,CAAC"}

package/src/cli/scaffolding/MigrationGenerator.js

@@ -146,6 +146,7 @@ function generateMigrationContent(options) {
     }
 }
 function resolveMigrationImportBlock(migrationsPath) {
+    const coreImportSpecifier = ['@zintrust', 'core'].join('/');
     const projectRoot = path.resolve(migrationsPath, '..', '..');
     const packageJsonPath = path.join(projectRoot, 'package.json');
     if (FileGenerator.fileExists(packageJsonPath)) {
@@ -160,7 +161,7 @@ function resolveMigrationImportBlock(migrationsPath) {
             // fall through
         }
     }
-    return `import { MigrationSchema, type Blueprint, type IDatabase } from '../../index.js';`;
+    return `import { MigrationSchema, type Blueprint, type IDatabase } from '${coreImportSpecifier}';`;
 }
 /**
  * Generate CREATE migration

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;AAYH,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;AA4eD,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;AA8ID;;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;AAgBH,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;AA0kBD,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;AA8ID;;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

@@ -4,22 +4,93 @@
  */
 import { EnvFileBackfill } from '../env/EnvFileBackfill.js';
 import { EnvData } from '../scaffolding/env.js';
-import { toCompatibleGovernanceVersion } from '../scaffolding/ScaffoldingVersionUtils.js';
+import { extractMajorMinorVersion, toCompatibleGovernanceVersion, } from '../scaffolding/ScaffoldingVersionUtils.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.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 = () => {
+import { execFileSync } from 'node:child_process';
+const readBundledGovernancePackage = () => {
     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';
+        const packageUrl = new URL('../../../packages/governance/package.json', import.meta.url);
+        return JSON.parse(fs.readFileSync(packageUrl, 'utf-8'));
     }
     catch {
-        return '0.0.0';
+        return undefined;
+    }
+};
+const SAFE_PATH = '/usr/local/bin:/usr/bin:/bin';
+const NPM_VIEW_TIMEOUT_MS = 1500;
+const publishedVersionCache = new Map();
+const createSafeNpmEnv = () => ({
+    ...process.env,
+    NODE_ENV: process.env['NODE_ENV'] ?? 'development',
+    PATH: SAFE_PATH,
+});
+const loadPublishedNpmVersion = (packageName) => {
+    if (publishedVersionCache.has(packageName)) {
+        return publishedVersionCache.get(packageName);
+    }
+    try {
+        const raw = execFileSync('npm', ['view', packageName, 'version', '--json', '--loglevel=silent'], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+            env: createSafeNpmEnv(),
+            timeout: NPM_VIEW_TIMEOUT_MS,
+        }).trim();
+        const resolved = JSON.parse(raw);
+        const version = typeof resolved === 'string' && resolved.length > 0 ? resolved : undefined;
+        publishedVersionCache.set(packageName, version);
+        return version;
+    }
+    catch {
+        publishedVersionCache.set(packageName, undefined);
+        return undefined;
+    }
+};
+const loadBundledPublishedCoreVersion = () => {
+    const bundledGovernancePackage = readBundledGovernancePackage();
+    const peerDependencies = bundledGovernancePackage?.peerDependencies;
+    if (typeof peerDependencies !== 'object' || peerDependencies === null) {
+        return undefined;
+    }
+    const corePeerRange = peerDependencies['@zintrust/core'];
+    if (typeof corePeerRange !== 'string' || corePeerRange.trim() === '') {
+        return undefined;
+    }
+    const publishedLineVersion = extractMajorMinorVersion(corePeerRange);
+    if (publishedLineVersion === undefined) {
+        return '0.7.0';
+    }
+    return `${publishedLineVersion.major}.${publishedLineVersion.minor}.0`;
+};
+const loadScaffoldCoreVersion = () => {
+    const publishedVersion = loadPublishedNpmVersion('@zintrust/core');
+    if (typeof publishedVersion === 'string') {
+        return publishedVersion;
+    }
+    const publishedGovernanceVersion = loadPublishedNpmVersion('@zintrust/governance');
+    if (typeof publishedGovernanceVersion === 'string') {
+        return publishedGovernanceVersion;
+    }
+    const bundledPublishedCoreVersion = loadBundledPublishedCoreVersion();
+    if (typeof bundledPublishedCoreVersion === 'string') {
+        return bundledPublishedCoreVersion;
+    }
+    return '0.7.0';
+};
+const loadGovernanceVersion = () => {
+    const publishedVersion = loadPublishedNpmVersion('@zintrust/governance');
+    if (typeof publishedVersion === 'string') {
+        return publishedVersion;
+    }
+    const bundledPublishedCoreVersion = loadBundledPublishedCoreVersion();
+    if (typeof bundledPublishedCoreVersion === 'string') {
+        return bundledPublishedCoreVersion;
     }
+    return '0.7.0';
 };
 const createDirectories = (projectPath, directories) => {
     let count = 0;
@@ -476,8 +547,8 @@ const prepareContext = (state, options) => {
         .replaceAll(/[-:T.Z]/g, '')
         .slice(0, 14);
     state.variables = {
-        coreVersion: loadCoreVersion(),
-        governanceVersion: toCompatibleGovernanceVersion(loadCoreVersion()),
+        coreVersion: loadScaffoldCoreVersion(),
+        governanceVersion: toCompatibleGovernanceVersion(loadGovernanceVersion()),
         projectName: options.name,
         projectSlug: options.name,
         author: options.author ?? 'Your Name',

package/src/cli/scaffolding/ScaffoldingVersionUtils.js

@@ -26,7 +26,7 @@ export const extractMajorMinorVersion = (value) => {
         return undefined;
     return { major, minor };
 };
-export const toCompatibleGovernanceVersion = (value, fallback = '^0.4.0') => {
+export const toCompatibleGovernanceVersion = (value, fallback = '^1.0.0') => {
     const parsed = extractMajorMinorVersion(value);
     if (parsed === undefined)
         return fallback;

package/src/common/ContextLoader.d.ts

@@ -0,0 +1,27 @@
+export type ContextLoaderBatchKey = string | number;
+export type ContextLoaderMode = 'sequential' | 'batch';
+export type ContextLoaderContext = Record<string, unknown>;
+export type ContextLoaderResolver<TValue = unknown, TContext extends ContextLoaderContext = ContextLoaderContext> = (context: Readonly<TContext>) => Promise<TValue>;
+export type ContextLoaderBatchResult<TKey extends ContextLoaderBatchKey = ContextLoaderBatchKey> = Map<TKey, unknown> | Record<string, unknown> | null | undefined;
+export type ContextLoaderBatchHandler<TKey extends ContextLoaderBatchKey = ContextLoaderBatchKey> = (keys: TKey[]) => Promise<ContextLoaderBatchResult<TKey>>;
+export type ContextLoaderPlan = {
+    load: <TValue = unknown>(key: string, resolver: ContextLoaderResolver<TValue>) => ContextLoaderPlan;
+    fromBatch: <TKey extends ContextLoaderBatchKey = ContextLoaderBatchKey>(name: string, key: TKey) => Promise<unknown>;
+    resolve: <TResolved extends ContextLoaderContext = ContextLoaderContext>() => Promise<Readonly<TResolved>>;
+};
+export type ContextLoaderInstance = {
+    load: <TValue = unknown>(key: string, resolver: ContextLoaderResolver<TValue>) => ContextLoaderPlan;
+    batch: (name: string, handler: ContextLoaderBatchHandler) => ContextLoaderInstance;
+    fromBatch: (name: string, key: ContextLoaderBatchKey) => Promise<unknown>;
+    hasBatch: (name: string) => boolean;
+    listBatches: () => string[];
+    unregisterBatch: (name: string) => void;
+    clearBatches: () => void;
+};
+export type ContextLoaderNamespace = {
+    create: (options?: {
+        mode?: ContextLoaderMode;
+    }) => ContextLoaderInstance;
+};
+export declare const ContextLoader: ContextLoaderNamespace;
+//# sourceMappingURL=ContextLoader.d.ts.map

package/src/common/ContextLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextLoader.d.ts","sourceRoot":"","sources":["../../../src/common/ContextLoader.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,MAAM,CAAC;AACpD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,OAAO,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3D,MAAM,MAAM,qBAAqB,CAC/B,MAAM,GAAG,OAAO,EAChB,QAAQ,SAAS,oBAAoB,GAAG,oBAAoB,IAC1D,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAErD,MAAM,MAAM,wBAAwB,CAAC,IAAI,SAAS,qBAAqB,GAAG,qBAAqB,IAC3F,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,IAAI,GACJ,SAAS,CAAC;AAEd,MAAM,MAAM,yBAAyB,CAAC,IAAI,SAAS,qBAAqB,GAAG,qBAAqB,IAC9F,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,CAAC,MAAM,GAAG,OAAO,EACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,KACpC,iBAAiB,CAAC;IACvB,SAAS,EAAE,CAAC,IAAI,SAAS,qBAAqB,GAAG,qBAAqB,EACpE,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,IAAI,KACN,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,OAAO,EAAE,CAAC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,OAAO,OAAO,CACnF,QAAQ,CAAC,SAAS,CAAC,CACpB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,CAAC,MAAM,GAAG,OAAO,EACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,KACpC,iBAAiB,CAAC;IACvB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,KAAK,qBAAqB,CAAC;IACnF,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,qBAAqB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACpC,WAAW,EAAE,MAAM,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,iBAAiB,CAAA;KAAE,KAAK,qBAAqB,CAAC;CAC3E,CAAC;AAmQF,eAAO,MAAM,aAAa,EAAE,sBAE1B,CAAC"}

package/src/common/ContextLoader.js

@@ -0,0 +1,187 @@
+import { ErrorFactory } from '../exceptions/ZintrustError.js';
+import { isFunction, isNonEmptyString, isObject } from '../helper/index.js';
+const scheduleMicrotask = (task) => {
+    if (typeof globalThis.queueMicrotask === 'function') {
+        globalThis.queueMicrotask(task);
+        return;
+    }
+    void Promise.resolve().then(task);
+};
+const normalizeBatchName = (name) => {
+    const normalized = String(name ?? '')
+        .trim()
+        .toLowerCase();
+    if (!isNonEmptyString(normalized)) {
+        throw ErrorFactory.createValidationError('ContextLoader batch name must be a non-empty string');
+    }
+    return normalized;
+};
+const normalizeLoadKey = (key) => {
+    const normalized = String(key ?? '').trim();
+    if (!isNonEmptyString(normalized)) {
+        throw ErrorFactory.createValidationError('ContextLoader load key must be a non-empty string');
+    }
+    return normalized;
+};
+const assertBatchKey = (key) => {
+    if (typeof key === 'string' && key.trim() !== '') {
+        return;
+    }
+    if (typeof key === 'number' && Number.isFinite(key)) {
+        return;
+    }
+    throw ErrorFactory.createValidationError('ContextLoader batch key must be a non-empty string or finite number');
+};
+const extractBatchValue = (result, key) => {
+    if (result instanceof Map) {
+        return result.has(key) ? (result.get(key) ?? null) : null;
+    }
+    if (isObject(result)) {
+        const recordKey = typeof key === 'number' ? String(key) : key;
+        return recordKey in result ? (result[recordKey] ?? null) : null;
+    }
+    return null;
+};
+const dedupeBatchKeys = (requests) => {
+    const seen = new Set();
+    const keys = [];
+    for (const request of requests) {
+        const signature = `${typeof request.key}:${String(request.key)}`;
+        if (seen.has(signature)) {
+            continue;
+        }
+        seen.add(signature);
+        keys.push(request.key);
+    }
+    return keys;
+};
+const freezeContext = (context) => {
+    return Object.freeze({ ...context });
+};
+const executePlanSteps = async (steps) => {
+    const resolved = await steps.reduce(async (accPromise, step) => {
+        const accumulated = await accPromise;
+        const snapshot = freezeContext(accumulated);
+        return {
+            ...accumulated,
+            [step.key]: await step.resolver(snapshot),
+        };
+    }, Promise.resolve({}));
+    return freezeContext(resolved);
+};
+const createFlushBatch = (batchHandlers, batchQueues) => {
+    return async (name) => {
+        const queue = batchQueues.get(name);
+        const handler = batchHandlers.get(name);
+        if (!queue || !handler) {
+            return;
+        }
+        const requests = queue.requests.splice(0);
+        queue.scheduled = false;
+        if (requests.length === 0) {
+            return;
+        }
+        try {
+            const keys = dedupeBatchKeys(requests);
+            const result = await handler(keys);
+            for (const request of requests) {
+                request.resolve(extractBatchValue(result, request.key));
+            }
+        }
+        catch (error) {
+            for (const request of requests) {
+                request.reject(error);
+            }
+        }
+    };
+};
+const createSequentialBatchPromise = async (handler, key) => {
+    return handler([key]).then((result) => extractBatchValue(result, key));
+};
+const createPlan = (root, steps) => {
+    let resolvePromise = null;
+    const plan = Object.freeze({
+        load(key, resolver) {
+            const normalizedKey = normalizeLoadKey(key);
+            if (!isFunction(resolver)) {
+                throw ErrorFactory.createValidationError('ContextLoader resolver must be a function');
+            }
+            if (steps.some((step) => step.key === normalizedKey)) {
+                throw ErrorFactory.createValidationError(`ContextLoader key already registered: ${normalizedKey}`);
+            }
+            return createPlan(root, [...steps, { key: normalizedKey, resolver }]);
+        },
+        async fromBatch(name, key) {
+            return root.fromBatch(name, key);
+        },
+        async resolve() {
+            resolvePromise ??= executePlanSteps(steps);
+            return resolvePromise;
+        },
+    });
+    return plan;
+};
+const create = (options = {}) => {
+    const mode = options.mode ?? 'sequential';
+    const batchHandlers = new Map();
+    const batchQueues = new Map();
+    const flushBatch = createFlushBatch(batchHandlers, batchQueues);
+    const root = Object.freeze({
+        load(key, resolver) {
+            const normalizedKey = normalizeLoadKey(key);
+            if (!isFunction(resolver)) {
+                throw ErrorFactory.createValidationError('ContextLoader resolver must be a function');
+            }
+            return createPlan(root, [{ key: normalizedKey, resolver }]);
+        },
+        batch(name, handler) {
+            const normalizedName = normalizeBatchName(name);
+            if (!isFunction(handler)) {
+                throw ErrorFactory.createValidationError('ContextLoader batch handler must be a function');
+            }
+            batchHandlers.set(normalizedName, handler);
+            return this;
+        },
+        async fromBatch(name, key) {
+            const normalizedName = normalizeBatchName(name);
+            assertBatchKey(key);
+            const handler = batchHandlers.get(normalizedName);
+            if (!handler) {
+                throw ErrorFactory.createConfigError(`ContextLoader batch not registered: ${normalizedName}`);
+            }
+            if (mode === 'sequential') {
+                return createSequentialBatchPromise(handler, key);
+            }
+            return new Promise((resolve, reject) => {
+                const queue = batchQueues.get(normalizedName) ?? { requests: [], scheduled: false };
+                queue.requests.push({ key, resolve, reject });
+                batchQueues.set(normalizedName, queue);
+                if (!queue.scheduled) {
+                    queue.scheduled = true;
+                    scheduleMicrotask(() => {
+                        void flushBatch(normalizedName);
+                    });
+                }
+            });
+        },
+        hasBatch(name) {
+            return batchHandlers.has(normalizeBatchName(name));
+        },
+        listBatches() {
+            return Array.from(batchHandlers.keys()).sort((left, right) => left.localeCompare(right));
+        },
+        unregisterBatch(name) {
+            const normalizedName = normalizeBatchName(name);
+            batchHandlers.delete(normalizedName);
+            batchQueues.delete(normalizedName);
+        },
+        clearBatches() {
+            batchHandlers.clear();
+            batchQueues.clear();
+        },
+    });
+    return root;
+};
+export const ContextLoader = Object.freeze({
+    create,
+});

package/src/config/logger.d.ts

@@ -21,6 +21,8 @@ export declare const Logger: Readonly<{
     cleanLogsOnce: () => Promise<string[]>;
     scope: (scope: string) => ILogger;
     addSink: (fn: LogSink) => (() => void);
+    withTraceSkipContext: (context?: Record<string, unknown>) => Record<string, unknown>;
+    shouldSkipTraceLogContext: (context?: Record<string, unknown>) => boolean;
 }>;
 export default Logger;
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/config/logger.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,UAAU,OAAO;IACf,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClE;AAkzBD;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;AAkCpG,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,EAAE,CAYtD,CAAC;AAEF,eAAO,MAAM,MAAM;qBA3MQ,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;oBAuBjD,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;oBAuBhD,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;qBAuB/C,MAAM,UAAU,OAAO,aAAa,MAAM,KAAG,IAAI;qBA6BjD,MAAM,UAAU,OAAO,aAAa,MAAM,KAAG,IAAI;yBA2FrC,OAAO,CAAC,MAAM,EAAE,CAAC;mBA1DtB,MAAM,KAAG,OAAO;kBAiD7B,OAAO,KAAG,CAAC,MAAM,IAAI,CAAC;EAgCzC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/config/logger.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,UAAU,OAAO;IACf,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClE;AAkzBD;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;AA+CpG,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,EAAE,CAYtD,CAAC;AAEF,eAAO,MAAM,MAAM;qBAxNQ,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;oBAuBjD,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;oBAuBhD,MAAM,SAAS,OAAO,aAAa,MAAM,KAAG,IAAI;qBAuB/C,MAAM,UAAU,OAAO,aAAa,MAAM,KAAG,IAAI;qBA6BjD,MAAM,UAAU,OAAO,aAAa,MAAM,KAAG,IAAI;yBAwGrC,OAAO,CAAC,MAAM,EAAE,CAAC;mBAvEtB,MAAM,KAAG,OAAO;kBA8D7B,OAAO,KAAG,CAAC,MAAM,IAAI,CAAC;qCAlCH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;0CAO5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,OAAO;EA6D5E,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/src/config/logger.js

@@ -740,6 +740,16 @@ const createLoggerScope = (scope) => {
         },
     };
 };
+const TRACE_SKIP_LOG_CONTEXT_KEY = '__zintrustSkipTraceLog';
+const withTraceSkipContext = (context) => {
+    return {
+        ...(context ?? {}),
+        [TRACE_SKIP_LOG_CONTEXT_KEY]: true,
+    };
+};
+const shouldSkipTraceLogContext = (context) => {
+    return context?.[TRACE_SKIP_LOG_CONTEXT_KEY] === true;
+};
 const loggerSinks = [];
 const dispatchToSinks = (level, message, data) => {
     if (loggerSinks.length === 0)
@@ -795,5 +805,7 @@ export const Logger = Object.freeze({
     cleanLogsOnce,
     scope: createLoggerScope,
     addSink,
+    withTraceSkipContext,
+    shouldSkipTraceLogContext,
 });
 export default Logger;

package/src/index.d.ts

@@ -63,7 +63,9 @@ export { normalizeRouteMeta, RouteRegistry } from './routes/RouteRegistry';
 export type { RouteMeta, RouteMetaInput, RouteRegistration } from './routes/RouteRegistry';
 export { DatabaseAdapterRegistry } from './orm/DatabaseAdapterRegistry';
 export { generateSecureJobId, generateUuid, getString, Utilities, type UtilitiesType, } from './common/utility';
+export { ContextLoader } from './common/ContextLoader';
 export { delay, ensureDirSafe } from './common/index';
+export type { ContextLoaderBatchHandler, ContextLoaderBatchKey, ContextLoaderBatchResult, ContextLoaderContext, ContextLoaderInstance, ContextLoaderMode, ContextLoaderPlan, ContextLoaderResolver, } from './common/ContextLoader';
 export { collect, Collection } from './collections/index';
 export type { ICollection, PrimitiveKey } from './collections/index';
 export { HttpClient } from './tools/http/Http';
@@ -180,7 +182,9 @@ export { sendSlackWebhook } from './tools/notification/drivers/Slack';
 export { TermiiDriver } from './tools/notification/drivers/Termii';
 export { sendSms } from './tools/notification/drivers/Twilio';
 export { Notification } from './tools/notification/Notification';
+export { NotificationComposer } from './tools/notification/Composer';
 export { NotificationRegistry } from './tools/notification/Registry';
+export type { NotificationChannelHandler, NotificationComposeBuilder, NotificationComposeChannelResult, NotificationComposeError, NotificationComposeOptions, NotificationComposePolicy, NotificationComposeResult, } from './tools/notification/Composer';
 export { MarkdownRenderer } from './tools/templates';
 export { RuntimeHealthProbes } from './health/RuntimeHealthProbes';
 export { Broadcast } from './tools/broadcast/Broadcast';
@@ -218,6 +222,8 @@ export type { LoadedSeeder, SeederHandler } from './seeders/types';
 export { default as logCleanup } from './schedules/log-cleanup';
 export * as NodeSingletons from './node-singletons/index';
 export { Auth } from './auth/Auth';
+export { LoginFlow } from './auth/LoginFlow';
+export type { LoginFlowAuditEvent, LoginFlowAuditor, LoginFlowBuilder, LoginFlowCreateOptions, LoginFlowError, LoginFlowIdentity, LoginFlowIssuer, LoginFlowIssuerInput, LoginFlowProvider, LoginFlowResult, LoginFlowStage, LoginFlowVerifiedRecord, } from './auth/LoginFlow';
 export { MicroserviceGenerator } from './microservices/MicroserviceGenerator';
 export type { GenerateServiceOptions, IMicroserviceGenerator, } from './microservices/MicroserviceGenerator';
 export { ErrorHandler as ProxyErrorHandler } from './proxy/ErrorHandler';
@@ -230,6 +236,7 @@ export { PluginRegistry } from './runtime/PluginRegistry';
 export { nowIso } from './common/utility';
 export type { SanitizerError } from './exceptions/ZintrustError';
 export { randomBytes } from './node-singletons/crypto';
+export { SecurePayload, type SecurePayloadCoercionShape, type SecurePayloadCoercionType, type SecurePayloadDecodeOptions, type SecurePayloadDecryptor, type SecurePayloadPipeline, type SecurePayloadPipelineIssue, type SecurePayloadPipelineStage, } from './security/SecurePayload';
 export type { MiddlewaresType } from './config/middleware';
 export * from './config/redis';
 export type * from './config/type';