assemblerjs 1.1.24 → 1.1.26

package/dist/index32.mjs

@@ -1,57 +1,159 @@
-import { HookManager } from './index31.mjs';
-import { DebugLogger } from './index34.mjs';
-import { CycleDetector } from './index35.mjs';
-import { formatIdentifier } from './index29.mjs';
-import { setDefinitionValue } from './index38.mjs';
+import { HookManager } from './index34.mjs';
+import { SingletonStrategy, TransientStrategy } from './index44.mjs';
+import { DebugLogger } from './index37.mjs';
+import { isClass } from '@assemblerjs/core';
+import { resolveInstanceInjectionTuple } from './index43.mjs';
+import { resolveInjectionTuple } from './index42.mjs';
+import { Injectable } from './index45.mjs';
 
-class AssemblerBuilder {
-    build(n, r) {
-        const i = DebugLogger.getInstance();
-        setDefinitionValue('singleton', true, n);
-        i.logPhaseStart('registration');
-        const l = this.assembler.register([
-            n
-        ]);
-        const c = this.assembler.injectableManager.getRegisteredIdentifiers();
-        i.logPhaseEnd('registration', undefined, {
-            registered: c
-        });
-        const h = CycleDetector.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>formatIdentifier(e));
-        if (h.length > 0) {
-            for (const e of h){
-                i.log('error', 'Circular dependency detected', {
-                    cycle: e.cycle,
-                    path: e.path
-                });
+function formatIdentifier(e) {
+    if (e === undefined) return 'undefined';
+    if (e === null) return 'null';
+    if (typeof e === 'function') {
+        if (e.name) return e.name;
+        if (e.constructor?.name && e.constructor.name !== 'Function') {
+            return e.constructor.name;
+        }
+        return 'AnonymousFunction';
+    }
+    if (typeof e === 'string') return e;
+    if (typeof e === 'symbol') return e.toString();
+    if (typeof e === 'number') return String(e);
+    if (typeof e === 'boolean') return String(e);
+    if (typeof e === 'object') {
+        if (e.name && typeof e.name === 'string') {
+            return e.name;
+        }
+        const t = e.constructor?.name;
+        if (t && t !== 'Object') {
+            return t;
+        }
+        try {
+            const t = JSON.stringify(e);
+            if (t.length > 100) {
+                return t.substring(0, 100) + '...';
             }
+            return t;
+        } catch  {
+            return '[UnknownObject]';
         }
-        i.logPhaseStart('resolution');
-        const g = this.assembler.require(l.identifier, r);
-        i.logPhaseEnd('resolution');
-        const m = this.assembler.hookManager.getCache().find((e)=>e.instance === g);
-        if (!m) {
-            throw new Error('Root instance not found in assemblages cache.');
-        }
-        const b = this.assembler.hookManager.getCache().indexOf(m);
-        this.assembler.hookManager.getCache().splice(b, 1);
-        i.logPhaseStart('hooks:onInit');
-        this.assembler.hookManager.callInitHooks(this.assembler.publicContext);
-        const d = r ? {
-            ...l.configuration,
-            ...r
-        } : l.configuration;
-        HookManager.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInit');
-        i.logPhaseStart('hooks:onInited');
-        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
-        HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInited');
-        this.assembler.hookManager.clearCache();
-        return g;
-    }
-    constructor(e){
-        this.assembler = e;
+    }
+    return String(e);
+}
+function c(e) {
+    if (isClass(e)) {
+        const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
+        return t ? 'class' : 'class';
+    }
+    if (typeof e === 'function') return 'function';
+    if (typeof e === 'string') return 'string';
+    if (typeof e === 'symbol') return 'symbol';
+    if (typeof e === 'object' && e !== null) return 'object';
+    return 'unknown';
+}
+class InjectableManager {
+    setContexts(e, t) {
+        this.privateContext = e;
+        this.publicContext = t;
+    }
+    register(i, o = false) {
+        const a = DebugLogger.getInstance();
+        const c = o === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
+        if (this.has(c.identifier)) {
+            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
+            a.log('error', 'Duplicate registration', {
+                identifier: c.identifier.name,
+                error: e
+            });
+            throw new Error(e);
+        }
+        const f = Injectable.of(c, this.privateContext, this.publicContext);
+        a.logRegistration(f);
+        this.injectables.set(f.identifier, f);
+        if (f.concrete) {
+            HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
+        }
+        return f;
+    }
+    has(e) {
+        return this.injectables.has(e);
+    }
+    require(e, t, n) {
+        if (!this.injectables.has(e)) {
+            const r = this.resolvingStack.has(e);
+            const i = r ? 'Circular dependency detected' : 'Dependency not registered';
+            const o = formatIdentifier(e);
+            const a = c(e);
+            const f = t?.__paramIndex;
+            const u = t?.__paramCount;
+            const l = t?.__expectedType;
+            const g = r ? `Circular dependency detected: '${o}' is already being resolved.` : `Dependency '${o}' has not been registered (Class/Service not found in current assemblages).`;
+            const d = {
+                identifier: o,
+                caller: n ? formatIdentifier(n) : 'unknown',
+                type: a,
+                error: g
+            };
+            if (f !== undefined) {
+                d.paramIndex = f;
+            }
+            if (u !== undefined) {
+                d.paramCount = u;
+            }
+            if (l !== undefined) {
+                const e = l?.name || formatIdentifier(l);
+                d.expectedType = e;
+            }
+            DebugLogger.getInstance().log('error', i, d);
+            throw new Error(g);
+        }
+        const r = this.injectables.get(e);
+        this.resolvingStack.add(r.identifier);
+        try {
+            if (r.isSingleton) {
+                return this.singletonStrategy.resolve(r, t);
+            } else {
+                return this.transientStrategy.resolve(r, t);
+            }
+        } finally{
+            this.resolvingStack.delete(r.identifier);
+        }
+    }
+    concrete(e) {
+        const t = this.injectables.get(e);
+        if (t) return t.concrete;
+        return;
+    }
+    tagged(...e) {
+        const t = [];
+        for (const n of e){
+            for (const [e, r] of this.injectables){
+                if (r.tags.includes(n)) t.push(r.build());
+            }
+        }
+        return t;
+    }
+    dispose() {
+        for (const [e, t] of this.injectables){
+            t.dispose();
+        }
+        this.resolvingStack.clear();
+    }
+    get size() {
+        return this.injectables.size;
+    }
+    getRegisteredIdentifiers() {
+        return Array.from(this.injectables.keys()).map((e)=>e?.name || String(e));
+    }
+    getInjectables() {
+        return this.injectables;
+    }
+    constructor(){
+        this.injectables = new Map();
+        this.resolvingStack = new Set();
+        this.singletonStrategy = new SingletonStrategy();
+        this.transientStrategy = new TransientStrategy();
     }
 }
 
-export { AssemblerBuilder };
+export { InjectableManager, formatIdentifier };

package/dist/index33.js

@@ -2,36 +2,55 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class ContextProvider {
-    createPublicContext() {
-        return {
-            has: this.assembler.has.bind(this.assembler),
-            require: this.assembler.require.bind(this.assembler),
-            concrete: this.assembler.concrete.bind(this.assembler),
-            tagged: this.assembler.tagged.bind(this.assembler),
-            dispose: this.assembler.dispose.bind(this.assembler),
-            global: this.assembler.global.bind(this.assembler),
-            on: this.assembler.on.bind(this.assembler),
-            once: this.assembler.once.bind(this.assembler),
-            off: this.assembler.off.bind(this.assembler),
-            events: this.assembler.channels
-        };
+const debugLogger = require('./index37.js');
+
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
+class ObjectManager {
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
+            });
+            throw new Error(s);
+        }
+        this.objects.set(r, o);
+        return o;
+    }
+    has(e) {
+        return this.objects.has(e);
+    }
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
+            });
+            throw new Error(s);
+        }
+        return this.objects.get(r);
+    }
+    addGlobal(e, t) {
+        if (this.globals.has(e)) {
+            throw new Error(`Global value with key '${e}' has already been registered.`);
+        }
+        this.globals.set(e, t);
     }
-    createPrivateContext(s) {
-        return {
-            ...s,
-            register: this.assembler.register.bind(this.assembler),
-            use: this.assembler.use.bind(this.assembler),
-            addGlobal: this.assembler.addGlobal.bind(this.assembler),
-            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
-            emit: this.assembler.emit.bind(this.assembler),
-            addChannels: this.assembler.addChannels.bind(this.assembler),
-            removeChannels: this.assembler.removeChannels.bind(this.assembler)
-        };
+    global(e) {
+        return this.globals.get(e);
     }
-    constructor(s){
-        this.assembler = s;
+    constructor(){
+        this.objects = new Map();
+        this.globals = new Map();
     }
 }
 
-exports.ContextProvider = ContextProvider;
+exports.ObjectManager = ObjectManager;

package/dist/index33.mjs

@@ -1,33 +1,52 @@
-class ContextProvider {
-    createPublicContext() {
-        return {
-            has: this.assembler.has.bind(this.assembler),
-            require: this.assembler.require.bind(this.assembler),
-            concrete: this.assembler.concrete.bind(this.assembler),
-            tagged: this.assembler.tagged.bind(this.assembler),
-            dispose: this.assembler.dispose.bind(this.assembler),
-            global: this.assembler.global.bind(this.assembler),
-            on: this.assembler.on.bind(this.assembler),
-            once: this.assembler.once.bind(this.assembler),
-            off: this.assembler.off.bind(this.assembler),
-            events: this.assembler.channels
-        };
+import { DebugLogger } from './index37.mjs';
+
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
+class ObjectManager {
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
+            });
+            throw new Error(s);
+        }
+        this.objects.set(r, o);
+        return o;
+    }
+    has(e) {
+        return this.objects.has(e);
+    }
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
+            });
+            throw new Error(s);
+        }
+        return this.objects.get(r);
+    }
+    addGlobal(e, t) {
+        if (this.globals.has(e)) {
+            throw new Error(`Global value with key '${e}' has already been registered.`);
+        }
+        this.globals.set(e, t);
     }
-    createPrivateContext(s) {
-        return {
-            ...s,
-            register: this.assembler.register.bind(this.assembler),
-            use: this.assembler.use.bind(this.assembler),
-            addGlobal: this.assembler.addGlobal.bind(this.assembler),
-            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
-            emit: this.assembler.emit.bind(this.assembler),
-            addChannels: this.assembler.addChannels.bind(this.assembler),
-            removeChannels: this.assembler.removeChannels.bind(this.assembler)
-        };
+    global(e) {
+        return this.globals.get(e);
     }
-    constructor(s){
-        this.assembler = s;
+    constructor(){
+        this.objects = new Map();
+        this.globals = new Map();
     }
 }
 
-export { ContextProvider };
+export { ObjectManager };

package/dist/index34.js

@@ -2,180 +2,84 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-function e(e) {
-    if (e === undefined) return 'undefined';
-    if (e === null) return 'null';
-    if (typeof e === 'function') {
-        if (e.name) return e.name;
-        if (e.constructor?.name && e.constructor.name !== 'Function') {
-            return e.constructor.name;
-        }
-        return 'AnonymousFunction';
-    }
-    if (typeof e === 'object') {
-        const o = e.constructor?.name;
-        if (o && o !== 'Object') {
-            return o;
-        }
-        if (e.name && typeof e.name === 'string') {
-            return e.name;
-        }
-        return '[Object]';
-    }
-    return String(e);
-}
-let NoOpDebugLogger = class NoOpDebugLogger {
-    configure(e) {}
-    log(e, o, t) {}
-    logBuildStart(e) {}
-    logBuildEnd(e, o) {}
-    logRegistration(e) {}
-    logHook(e, o, t) {}
-    logPhaseStart(e, o) {}
-    logPhaseEnd(e, o, t) {}
-    logResolution(e, o, t) {}
-    logConstruction(e) {}
-    logInjection(e, o) {}
-};
-let ActiveDebugLogger = class ActiveDebugLogger {
-    configure(e) {
-        this.options = {
-            ...this.options,
-            ...e,
-            logPhases: {
-                ...this.options.logPhases,
-                ...e.logPhases || {}
-            }
-        };
-    }
-    logBuildStart(e) {
-        this.log('info', 'Build started', {
-            entry: e.name
-        });
-    }
-    logBuildEnd(e, o) {
-        const t = {
-            entry: e.name
-        };
-        if (o !== undefined) t.duration = `${o.toFixed(2)}ms`;
-        this.log('info', 'Build completed', t);
-    }
-    logRegistration(o) {
-        if (!this.shouldLog('registration')) return;
-        this.log('info', 'Registration', {
-            identifier: e(o.identifier),
-            isSingleton: o.isSingleton,
-            dependencies: o.dependencies.map((o)=>e(o)),
-            tags: o.tags
+const core = require('@assemblerjs/core');
+const debugLogger = require('./index37.js');
+
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
         });
+        return this.initCache;
     }
-    logHook(o, t, n) {
-        if (!this.shouldLog('hooks')) return;
-        const i = this.options.logTimings ? performance.now() : 0;
-        this.log('info', `Hook: ${o}`, {
-            target: e(t),
-            config: n
-        });
-        if (this.options.logTimings) {
-            return ()=>{
-                const e = performance.now() - i;
-                this.log('info', `Hook: ${o} completed`, {
-                    duration: `${e.toFixed(2)}ms`
-                });
-            };
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
     }
-    logPhaseStart(e, o) {
-        this.log('info', `Phase: ${e} started`, o);
-    }
-    logPhaseEnd(e, o, t) {
-        const n = o !== undefined ? {
-            duration: `${o.toFixed(2)}ms`
-        } : {};
-        if (t) {
-            Object.assign(n, t);
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        this.log('info', `Phase: ${e} ended`, Object.keys(n).length > 0 ? n : undefined);
     }
-    logResolution(e, o, t) {
-        if (!this.shouldLog('resolution')) return;
-        this.log('info', `Resolving: ${e}`, {
-            strategy: `${o} strategy`,
-            cache: t ? 'hit' : 'miss'
-        });
+    clearCache() {
+        this.initCache.length = 0;
     }
-    logConstruction(e) {
-        if (!this.shouldLog('construction')) return;
-        this.log('info', `Constructing: ${e}`);
+    getCache() {
+        return this.initCache;
     }
-    logInjection(e, o) {
-        if (!this.shouldLog(e === 'use' ? 'injectionUse' : 'injectionGlobal')) return;
-        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, o);
-    }
-    shouldLog(e) {
-        return !this.options.logPhases || this.options.logPhases[e] !== false;
+    constructor(){
+        this.initCache = [];
     }
-    log(e, o, t) {
-        if (this.options.logger) {
-            this.options.logger(e, o, t);
-        } else {
-            const n = `[Assembler:${e}]`;
-            const i = this.options.useColors !== false ? this.colorize(e, n) : n;
-            if (t) {
-                console.log(`${i} ${o}`, t);
-            } else {
-                console.log(`${i} ${o}`);
+}
+HookManager.callHook = (e, i, n, a)=>{
+    const c = debugLogger.DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    return new Promise((t, c)=>{
+        const s = e[i];
+        if (s) {
+            if (core.isAsync(s)) {
+                s.bind(e)(n, a).then(()=>{
+                    if (r) r();
+                    t();
+                }).catch((o)=>{
+                    if (r) r();
+                    c(o);
+                });
+                return;
+            }
+            try {
+                s.bind(e)(n, a);
+                if (r) r();
+                t();
+            } catch (o) {
+                if (r) r();
+                c(o);
             }
+        } else {
+            if (r) r();
+            t();
         }
-    }
-    colorize(e, o) {
-        const t = {
-            info: '\x1b[36m',
-            warn: '\x1b[33m',
-            error: '\x1b[31m',
-            reset: '\x1b[0m'
-        };
-        const n = t[e] || t.info;
-        return `${n}${o}${t.reset}`;
-    }
-    constructor(){
-        this.options = {
-            enabled: true,
-            logPhases: {
-                registration: true,
-                registrationUse: true,
-                registrationGlobals: true,
-                resolution: true,
-                construction: true,
-                hooks: true,
-                cache: true,
-                injectionUse: true,
-                injectionGlobal: true
-            },
-            logTimings: false,
-            logDependencyTree: true,
-            useColors: true
-        };
-    }
+    });
 };
-class DebugLogger {
-    static getInstance() {
-        return DebugLogger.instance;
-    }
-    static enable(e) {
-        if (e?.enabled === false) {
-            DebugLogger.instance = new NoOpDebugLogger();
+HookManager.callHookImmediate = (e, i, n, a)=>{
+    const c = debugLogger.DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    const s = e[i];
+    if (s) {
+        if (core.isAsync(s)) {
+            s.bind(e)(n, a).catch(()=>{});
+            if (r) r();
             return;
         }
-        DebugLogger.instance = new ActiveDebugLogger();
-        if (e) {
-            DebugLogger.instance.configure(e);
-        }
-    }
-    static disable() {
-        DebugLogger.instance = new NoOpDebugLogger();
+        s.bind(e)(n, a);
+        if (r) r();
+    } else {
+        if (r) r();
     }
-}
-DebugLogger.instance = new NoOpDebugLogger();
+};
 
-exports.DebugLogger = DebugLogger;
+exports.HookManager = HookManager;