assemblerjs 1.1.19 → 1.1.20

package/dist/index32.mjs

@@ -1,30 +1,52 @@
-class PointcutMatcher {
-    static parse(t) {
-        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
-        if (!e) {
-            throw new Error(`Invalid pointcut expression: ${t}`);
+import { DebugLogger } from './index36.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);
         }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
+        this.objects.set(r, o);
+        return o;
     }
-}
-let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
-    matches(t) {
-        const e = t.target.constructor.name;
-        const c = t.methodName;
-        return this.classRegex.test(e) && this.methodRegex.test(c);
+    has(e) {
+        return this.objects.has(e);
     }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
+    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);
         }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
+        return this.objects.get(r);
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    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);
     }
-};
+    global(e) {
+        return this.globals.get(e);
+    }
+    constructor(){
+        this.objects = new Map();
+        this.globals = new Map();
+    }
+}
 
-export { PointcutMatcher };
+export { ObjectManager };

package/dist/index33.js

@@ -2,163 +2,84 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index35.js');
-const resolutionStrategies = require('./index44.js');
-const debugLogger = require('./index38.js');
 const core = require('@assemblerjs/core');
-const use = require('./index43.js');
-const inject = require('./index42.js');
-const injectable = require('./index45.js');
+const debugLogger = require('./index36.js');
 
-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';
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
+        });
+        return this.initCache;
     }
-    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]';
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
     }
-    return String(e);
-}
-function c(e) {
-    if (core.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.DebugLogger.getInstance();
-        const c = o === true ? use.resolveInstanceInjectionTuple(i) : inject.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.Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(f);
-        this.injectables.set(f.identifier, f);
-        if (f.concrete) {
-            hookManager.HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        return f;
     }
-    has(e) {
-        return this.injectables.has(e);
+    clearCache() {
+        this.initCache.length = 0;
     }
-    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.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);
-        }
+    getCache() {
+        return this.initCache;
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
+    constructor(){
+        this.initCache = [];
     }
-    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());
+}
+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();
         }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
+    });
+};
+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;
         }
-        this.resolvingStack.clear();
+        s.bind(e)(n, a);
+        if (r) r();
+    } else {
+        if (r) r();
     }
-    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 resolutionStrategies.SingletonStrategy();
-        this.transientStrategy = new resolutionStrategies.TransientStrategy();
-    }
-}
+};
 
-exports.InjectableManager = InjectableManager;
-exports.formatIdentifier = formatIdentifier;
+exports.HookManager = HookManager;

package/dist/index33.mjs

@@ -1,159 +1,81 @@
-import { HookManager } from './index35.mjs';
-import { SingletonStrategy, TransientStrategy } from './index44.mjs';
-import { DebugLogger } from './index38.mjs';
-import { isClass } from '@assemblerjs/core';
-import { resolveInstanceInjectionTuple } from './index43.mjs';
-import { resolveInjectionTuple } from './index42.mjs';
-import { Injectable } from './index45.mjs';
+import { isAsync } from '@assemblerjs/core';
+import { DebugLogger } from './index36.mjs';
 
-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';
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
+        });
+        return this.initCache;
     }
-    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]';
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
     }
-    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);
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        return f;
     }
-    has(e) {
-        return this.injectables.has(e);
+    clearCache() {
+        this.initCache.length = 0;
     }
-    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);
-        }
+    getCache() {
+        return this.initCache;
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
+    constructor(){
+        this.initCache = [];
     }
-    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());
+}
+HookManager.callHook = (e, i, n, a)=>{
+    const c = DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    return new Promise((t, c)=>{
+        const s = e[i];
+        if (s) {
+            if (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();
         }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
+    });
+};
+HookManager.callHookImmediate = (e, i, n, a)=>{
+    const c = DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    const s = e[i];
+    if (s) {
+        if (isAsync(s)) {
+            s.bind(e)(n, a).catch(()=>{});
+            if (r) r();
+            return;
         }
-        this.resolvingStack.clear();
+        s.bind(e)(n, a);
+        if (r) r();
+    } else {
+        if (r) r();
     }
-    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 { InjectableManager, formatIdentifier };
+export { HookManager };

package/dist/index34.js

@@ -2,55 +2,60 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const debugLogger = require('./index38.js');
+const hookManager = require('./index33.js');
+const debugLogger = require('./index36.js');
+const cycleDetector = require('./index37.js');
+const injectableManager = require('./index31.js');
+const schema = require('./index30.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);
+class AssemblerBuilder {
+    build(n, r) {
+        const i = debugLogger.DebugLogger.getInstance();
+        schema.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.CycleDetector.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>injectableManager.formatIdentifier(e));
+        if (h.length > 0) {
+            for (const e of h){
+                i.log('error', 'Circular dependency detected', {
+                    cycle: e.cycle,
+                    path: e.path
+                });
+            }
         }
-        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.`);
+        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.');
         }
-        this.globals.set(e, t);
-    }
-    global(e) {
-        return this.globals.get(e);
+        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.HookManager.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInit');
+        i.logPhaseStart('hooks:onInited');
+        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
+        hookManager.HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInited');
+        this.assembler.hookManager.clearCache();
+        return g;
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    constructor(e){
+        this.assembler = e;
     }
 }
 
-exports.ObjectManager = ObjectManager;
+exports.AssemblerBuilder = AssemblerBuilder;