@teqfw/di 2.6.2 → 2.8.0

package/src/Config/NamespaceRegistry.mjs

@@ -2,218 +2,8 @@
 
 /**
  * @namespace TeqFw_Di_Config_NamespaceRegistry
- * @description Deterministic loader for package namespace rules.
+ * @description Deprecated compatibility re-export for the Node.js namespace registry.
+ * @deprecated Use @teqfw/di/node/registry/namespace in new integrations.
  */
 
-/**
- * @typedef {object} TeqFw_Di_Config_NamespaceRegistry_Dependencies
- * @property {{readFile(path: string, encoding: string): Promise<string>, readdir(path: string): Promise<string[]>, realpath(path: string): Promise<string>, stat(path: string): Promise<{isDirectory(): boolean}>}} fs
- * @property {{join(...paths: string[]): string, dirname(path: string): string, relative(from: string, to: string): string, resolve(...paths: string[]): string, isAbsolute(path: string): boolean}} path
- * @property {string} appRoot
- */
-
-/**
- * @typedef {object} TeqFw_Di_Config_NamespaceRegistry_Entry
- * @property {string} prefix
- * @property {string} dirAbs
- * @property {string} ext
- */
-
-/**
- * Builds deterministic immutable namespace registry from root package and installed dependencies.
- */
-export default class TeqFw_Di_Config_NamespaceRegistry {
-    /**
-     * @param {TeqFw_Di_Config_NamespaceRegistry_Dependencies} deps
-     */
-    constructor({fs, path, appRoot}) {
-        const appRootAbs = path.resolve(appRoot);
-
-        /**
-         * @param {string} fileAbs
-         * @returns {Promise<Record<string, unknown>>}
-         */
-        const readJson = async function (fileAbs) {
-            const content = await fs.readFile(fileAbs, 'utf8');
-            return /** @type {Record<string, unknown>} */ (JSON.parse(content));
-        };
-
-        /**
-         * @param {string} absPath
-         * @returns {Promise<boolean>}
-         */
-        const isDirectory = async function (absPath) {
-            try {
-                const stat = await fs.stat(absPath);
-                return stat.isDirectory();
-            } catch {
-                return false;
-            }
-        };
-
-        /**
-         * @param {string} rootAbs
-         * @param {string} candidateAbs
-         * @returns {boolean}
-         */
-        const isInside = function (rootAbs, candidateAbs) {
-            const rel = path.relative(rootAbs, candidateAbs);
-            return (rel === '') || (!rel.startsWith('..') && !path.isAbsolute(rel));
-        };
-
-        /**
-         * @param {string} packageRootAbs
-         * @param {string} dirAbs
-         * @returns {Promise<void>}
-         */
-        const assertInsidePackageRoot = async function (packageRootAbs, dirAbs) {
-            const packageRootReal = await fs.realpath(packageRootAbs);
-            const dirReal = await fs.realpath(dirAbs);
-            if (!isInside(packageRootReal, dirReal)) {
-                throw new Error(`Namespace path resolves outside package root: '${dirAbs}'.`);
-            }
-        };
-
-        /**
-         * @param {unknown} ext
-         * @returns {string}
-         */
-        const normalizeExt = function (ext) {
-            if (ext === undefined) return '.mjs';
-            if ((typeof ext !== 'string') || (ext.length === 0)) {
-                throw new Error('Namespace extension must be a non-empty string.');
-            }
-            const normalized = ext.startsWith('.') ? ext : `.${ext}`;
-            if ((normalized !== '.mjs') && (normalized !== '.js')) {
-                throw new Error(`Namespace extension is not ESM-compatible: '${normalized}'.`);
-            }
-            return normalized;
-        };
-
-        /**
-         * @param {unknown} raw
-         * @param {string} packageRootAbs
-         * @returns {Promise<TeqFw_Di_Config_NamespaceRegistry_Entry>}
-         */
-        const normalizeEntry = async function (raw, packageRootAbs) {
-            if ((raw === null) || (typeof raw !== 'object')) {
-                throw new Error('Namespace entry must be an object.');
-            }
-            const item = /** @type {Record<string, unknown>} */ (raw);
-
-            const prefix = item.prefix;
-            if ((typeof prefix !== 'string') || (prefix.length === 0) || !prefix.endsWith('_')) {
-                throw new Error(`Namespace prefix is invalid: '${String(prefix)}'.`);
-            }
-
-            const rawPath = item.path;
-            if ((typeof rawPath !== 'string') || (rawPath.length === 0) || path.isAbsolute(rawPath)) {
-                throw new Error(`Namespace path must be a non-empty relative path: '${String(rawPath)}'.`);
-            }
-            const dirAbs = path.resolve(packageRootAbs, rawPath);
-            if (!(await isDirectory(dirAbs))) {
-                throw new Error(`Namespace path does not point to existing directory: '${dirAbs}'.`);
-            }
-            await assertInsidePackageRoot(packageRootAbs, dirAbs);
-
-            const ext = normalizeExt(item.ext);
-
-            return {prefix, dirAbs, ext};
-        };
-
-        /**
-         * @param {string} packageRootAbs
-         * @returns {Promise<{namespaces: unknown[], dependencies: string[]}>}
-         */
-        const readPackageMetadata = async function (packageRootAbs) {
-            const packageJsonAbs = path.join(packageRootAbs, 'package.json');
-            const packageJson = await readJson(packageJsonAbs);
-            const teqfw = (packageJson.teqfw && typeof packageJson.teqfw === 'object')
-                ? /** @type {Record<string, unknown>} */ (packageJson.teqfw)
-                : {};
-            const namespaces = Array.isArray(teqfw.namespaces) ? teqfw.namespaces : [];
-            const dependencies = (packageJson.dependencies && typeof packageJson.dependencies === 'object')
-                ? Object.keys(/** @type {Record<string, unknown>} */ (packageJson.dependencies)).sort()
-                : [];
-            return {namespaces, dependencies};
-        };
-
-        /**
-         * Checks whether package.json exists inside a dependency directory.
-         *
-         * @param {string} candidateAbs
-         * @returns {Promise<boolean>}
-         */
-        const hasPackageJson = async function (candidateAbs) {
-            try {
-                await fs.stat(path.join(candidateAbs, 'package.json'));
-                return true;
-            } catch {
-                return false;
-            }
-        };
-
-        /**
-         * @param {string} packageName
-         * @param {string} fromPackageRootAbs
-         * @returns {Promise<string>}
-         */
-        const resolveDependencyPackageRoot = async function (packageName, fromPackageRootAbs) {
-            let cursor = fromPackageRootAbs;
-            while (isInside(appRootAbs, cursor)) {
-                const candidate = path.join(cursor, 'node_modules', packageName);
-                if (await isDirectory(candidate) && (await hasPackageJson(candidate))) {
-                    return path.resolve(candidate);
-                }
-                if (cursor === appRootAbs) break;
-                const parent = path.dirname(cursor);
-                if (parent === cursor) break;
-                cursor = parent;
-            }
-            throw new Error(`Installed dependency is not found: '${packageName}' from '${fromPackageRootAbs}'.`);
-        };
-
-        /**
-         * @returns {Promise<Readonly<TeqFw_Di_Config_NamespaceRegistry_Entry[]>>}
-         */
-        this.build = async function () {
-            /** @type {{name: string, rootAbs: string}[]} */
-            const queue = [{rootAbs: appRootAbs}];
-            /** @type {Set<string>} */
-            const visitedRoots = new Set();
-            /** @type {Set<string>} */
-            const uniquePrefixes = new Set();
-            /** @type {TeqFw_Di_Config_NamespaceRegistry_Entry[]} */
-            const entries = [];
-
-            while (queue.length > 0) {
-                const current = queue.shift();
-                const packageRootAbs = current.rootAbs;
-                const packageRootReal = await fs.realpath(packageRootAbs);
-                if (visitedRoots.has(packageRootReal)) continue;
-                visitedRoots.add(packageRootReal);
-
-                const meta = await readPackageMetadata(packageRootAbs);
-                for (const raw of meta.namespaces) {
-                    const normalized = await normalizeEntry(raw, packageRootAbs);
-                    if (uniquePrefixes.has(normalized.prefix)) {
-                        throw new Error(`Duplicate namespace prefix is not allowed: '${normalized.prefix}'.`);
-                    }
-                    uniquePrefixes.add(normalized.prefix);
-                    entries.push(normalized);
-                }
-
-                for (const depName of meta.dependencies) {
-                    const depRootAbs = await resolveDependencyPackageRoot(depName, packageRootAbs);
-                    queue.push({rootAbs: depRootAbs});
-                }
-            }
-
-            entries.sort((a, b) => b.prefix.length - a.prefix.length);
-            for (const entry of entries) {
-                Object.freeze(entry);
-            }
-            return Object.freeze(entries);
-        };
-    }
-}
+export {default} from "../Node/Registry/Namespace.mjs";

package/src/Container/Executor.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @namespace TeqFw_Di_Container_Wrapper_Executor
+ * @namespace TeqFw_Di_Container_Executor
  * @description Applies wrapper pipeline to resolved values.
  */
 
@@ -11,7 +11,7 @@
  * Executes wrapper pipeline declared in `depId.wrappers` using functions
  * exported by the resolved module namespace.
  */
-export default class TeqFw_Di_Container_Wrapper_Executor {
+export default class TeqFw_Di_Container_Executor {
 
     /**
      * Creates wrapper executor instance.

package/src/Container/GraphResolver.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @namespace TeqFw_Di_Container_Resolve_GraphResolver
+ * @namespace TeqFw_Di_Container_GraphResolver
  * @description Dependency graph resolver for container preloading.
  */
 
@@ -13,25 +13,27 @@
  */
 
 /**
- * @typedef {object} TeqFw_Di_Container_Resolve_GraphResolver_Dependencies
- * @property {TeqFw_Di_Parser} parser
+ * @typedef {object} TeqFw_Di_Container_GraphResolver_Dependencies
+ * @property {(specifier: string) => TeqFw_Di_DepId__DTO} canonicalize
+ * @property {(depId: TeqFw_Di_DepId__DTO) => {found: boolean, value: unknown}} findMock
  * @property {TeqFw_Di_Resolver} resolver
  * @property {{log(message: string): void}|null} [logger]
  */
 
 /**
- * @typedef {{depId: TeqFw_Di_DepId__DTO, namespace: object}} TeqFw_Di_Container_Resolve_GraphResolver_Node
+ * @typedef {{depId: TeqFw_Di_DepId__DTO, namespace: object|null, dependencies: Map<string, string>, mock: {found: boolean, value: unknown}}} TeqFw_Di_Container_GraphResolver_Node
  */
 
 import {buildDependencyKey} from '../Internal/DependencyKey.mjs';
 import {readDepsDecl} from '../Internal/DepsDecl.mjs';
 
-export default class TeqFw_Di_Container_Resolve_GraphResolver {
+export default class TeqFw_Di_Container_GraphResolver {
 
     /**
-     * @param {TeqFw_Di_Container_Resolve_GraphResolver_Dependencies} deps
+     * @param {TeqFw_Di_Container_GraphResolver_Dependencies} deps
      */
-    constructor({parser, resolver, logger = null}) {
+    constructor({canonicalize, parser, findMock = () => ({found: false, value: undefined}), resolver, logger = null}) {
+        canonicalize ??= parser.parse.bind(parser);
         /** @type {{log(message: string): void}|null} */
         const log = logger;
 
@@ -43,7 +45,7 @@ export default class TeqFw_Di_Container_Resolve_GraphResolver {
 
         /**
          * @param {TeqFw_Di_DepId__DTO} depId
-         * @param {Map<string, TeqFw_Di_Container_Resolve_GraphResolver_Node>} out
+         * @param {Map<string, TeqFw_Di_Container_GraphResolver_Node>} out
          * @param {Set<string>} stack
          * @param {string[]} chain
          * @returns {Promise<void>}
@@ -61,19 +63,28 @@ export default class TeqFw_Di_Container_Resolve_GraphResolver {
             const key = makeNodeKey(depId);
             if (out.has(key)) return;
 
+            const mock = findMock(depId);
+            if (mock.found) {
+                out.set(key, {depId, namespace: null, dependencies: new Map(), mock});
+                return;
+            }
+
             stack.add(identity);
             chain.push(identity);
             try {
                 /** @type {object} */
                 const namespace = await resolver.resolve(depId);
                 if (log) log.log(`GraphResolver.walk: resolved '${key}'.`);
-                out.set(key, {depId, namespace});
+                /** @type {Map<string, string>} */
+                const dependencies = new Map();
+                out.set(key, {depId, namespace, dependencies, mock});
 
                 /** @type {Record<string, unknown>} */
                 const depsMap = readDepsDecl(namespace, depId);
-                for (const nextCdc of Object.values(depsMap)) {
+                for (const [name, nextSpecifier] of Object.entries(depsMap)) {
                     /** @type {TeqFw_Di_DepId__DTO} */
-                    const nextDepId = parser.parse(/** @type {string} */ (nextCdc));
+                    const nextDepId = canonicalize(/** @type {string} */ (nextSpecifier));
+                    dependencies.set(name, makeNodeKey(nextDepId));
                     if (log) log.log(`GraphResolver.walk: edge '${key}' -> '${nextDepId.platform}::${nextDepId.moduleName}'.`);
                     await walk(nextDepId, out, stack, chain);
                 }
@@ -87,10 +98,10 @@ export default class TeqFw_Di_Container_Resolve_GraphResolver {
          * Resolves full dependency graph for a root depId.
          *
          * @param {TeqFw_Di_DepId__DTO} depId
-         * @returns {Promise<Map<string, TeqFw_Di_Container_Resolve_GraphResolver_Node>>}
+         * @returns {Promise<Map<string, TeqFw_Di_Container_GraphResolver_Node>>}
          */
         this.resolve = async function (depId) {
-            /** @type {Map<string, TeqFw_Di_Container_Resolve_GraphResolver_Node>} */
+            /** @type {Map<string, TeqFw_Di_Container_GraphResolver_Node>} */
             const out = new Map();
             /** @type {Set<string>} */
             const stack = new Set();

package/src/Container/Instantiate.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @namespace TeqFw_Di_Container_Instantiate_Instantiator
+ * @namespace TeqFw_Di_Container_Instantiate
  * @description Instantiates selected exports using composition rules.
  */
 
@@ -25,7 +25,7 @@ import TeqFw_Di_Enum_Composition from '../Enum/Composition.mjs';
 /**
  * @typedef {CallableFactory | ConstructableFactory} Factory
  */
-export default class TeqFw_Di_Container_Instantiate_Instantiator {
+export default class TeqFw_Di_Container_Instantiate {
 
     /**
      * Creates instantiator instance.

package/src/Container/Lifecycle.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @namespace TeqFw_Di_Container_Lifecycle_Registry
+ * @namespace TeqFw_Di_Container_Lifecycle
  * @description Lifecycle policy cache for produced values.
  */
 
@@ -17,7 +17,7 @@ import {buildDependencyKey} from '../Internal/DependencyKey.mjs';
  * - transient values are never cached;
  * - as-is composition is returned as produced without lifecycle caching.
  */
-export default class TeqFw_Di_Container_Lifecycle_Registry {
+export default class TeqFw_Di_Container_Lifecycle {
 
     /**
      * Creates lifecycle registry instance.

package/src/Container/Pipeline.mjs

@@ -6,35 +6,32 @@
  */
 
 import {buildDependencyKey} from '../Internal/DependencyKey.mjs';
-import {readDepsDecl} from '../Internal/DepsDecl.mjs';
 import {makePromiseSafe} from '../Internal/PromiseSafe.mjs';
 
 /**
  * @typedef {object} TeqFw_Di_Container_Pipeline_Context
- * @property {TeqFw_Di_Parser} parser
  * @property {TeqFw_Di_Resolver|undefined} resolver
- * @property {TeqFw_Di_Container_Resolve_GraphResolver|undefined} graphResolver
- * @property {TeqFw_Di_Container_Lifecycle_Registry|undefined} lifecycle
- * @property {TeqFw_Di_Container_Instantiate_Instantiator} instantiator
- * @property {TeqFw_Di_Container_Wrapper_Executor} wrapperExecutor
+ * @property {TeqFw_Di_Container_GraphResolver|undefined} graphResolver
+ * @property {TeqFw_Di_Container_Lifecycle|undefined} lifecycle
+ * @property {TeqFw_Di_Container_Instantiate} instantiator
+ * @property {TeqFw_Di_Container_Executor} wrapperExecutor
  * @property {{log(message: string): void, error(message: string, error?: unknown): void}} logger
  * @property {boolean} testMode
  * @property {Map<string, unknown>} mockRegistry
  * @property {(value: unknown) => unknown} freeze
- * @property {(depId: TeqFw_Di_DepId__DTO) => TeqFw_Di_DepId__DTO} applyPreprocess
- * @property {(value: unknown) => unknown} applyPostprocess
+ * @property {(specifier: string) => TeqFw_Di_DepId__DTO} canonicalize
+ * @property {(value: unknown, depId: TeqFw_Di_DepId__DTO) => unknown} applyPostprocess
  */
 
 /**
- * Executes full container get pipeline for a CDC.
+ * Executes the full container pipeline for a Dependency Specifier.
  *
  * @param {TeqFw_Di_Container_Pipeline_Context} ctx
- * @param {string} cdc
+ * @param {string} specifier
  * @returns {Promise<any>}
  */
-export async function executeContainerPipeline(ctx, cdc) {
+export async function executeContainerPipeline(ctx, specifier) {
     const {
-        parser,
         resolver,
         graphResolver,
         lifecycle,
@@ -44,7 +41,7 @@ export async function executeContainerPipeline(ctx, cdc) {
         testMode,
         mockRegistry,
         freeze,
-        applyPreprocess,
+        canonicalize,
         applyPostprocess,
     } = ctx;
 
@@ -58,14 +55,14 @@ export async function executeContainerPipeline(ctx, cdc) {
     /** @type {string} */
     let stage = 'start';
     try {
-        logger.log(`Container.get: cdc='${cdc}'.`);
+        logger.log(`Container.get: specifier='${specifier}'.`);
         stage = 'parse';
         logger.log('Container.pipeline: parse:entry.');
-        const parsed = parser.parse(cdc);
+        const root = canonicalize(specifier);
+        const parsed = root;
         logger.log(`Container.pipeline: parse:exit '${parsed.platform}::${parsed.moduleName}'.`);
         stage = 'preprocess';
         logger.log('Container.pipeline: preprocess:entry.');
-        const root = applyPreprocess(parsed);
         logger.log(`Container.pipeline: preprocess:exit '${root.platform}::${root.moduleName}'.`);
         if (testMode === true) {
             stage = 'mock';
@@ -95,6 +92,10 @@ export async function executeContainerPipeline(ctx, cdc) {
             if (built.has(key)) return built.get(key);
             if (!graph.has(key)) throw new Error(`Resolved graph node is missing for '${key}'.`);
             const node = graph.get(key);
+            if (node.mock?.found) {
+                stage = 'freeze';
+                return freeze(node.mock.value);
+            }
             stage = 'lifecycle';
             logger.log(`Container.pipeline: lifecycle:entry '${node.depId.platform}::${node.depId.moduleName}'.`);
             const value = lifecycle.apply(node.depId, function () {
@@ -102,17 +103,14 @@ export async function executeContainerPipeline(ctx, cdc) {
                 logger.log(`Container.pipeline: instantiate:entry '${node.depId.platform}::${node.depId.moduleName}'.`);
                 /** @type {Record<string, unknown>} */
                 const deps = {};
-                /** @type {Record<string, unknown>} */
-                const depsDecl = readDepsDecl(node.namespace, node.depId);
-                for (const [name, cdcValue] of Object.entries(depsDecl)) {
-                    const childDepId = parser.parse(/** @type {string} */ (cdcValue));
-                    deps[name] = build(getKey(childDepId));
+                for (const [name, childKey] of (node.dependencies ?? [])) {
+                    deps[name] = build(childKey);
                 }
                 const instantiated = instantiator.instantiate(node.depId, node.namespace, deps);
                 logger.log(`Container.pipeline: instantiate:exit '${node.depId.platform}::${node.depId.moduleName}'.`);
                 stage = 'postprocess';
                 logger.log(`Container.pipeline: postprocess:entry '${node.depId.platform}::${node.depId.moduleName}'.`);
-                const postprocessed = applyPostprocess(instantiated);
+                const postprocessed = applyPostprocess(instantiated, node.depId);
                 logger.log(`Container.pipeline: postprocess:exit '${node.depId.platform}::${node.depId.moduleName}'.`);
                 const wrapped = wrapperExecutor.execute(node.depId, postprocessed, node.namespace);
                 stage = 'freeze';