assemblerjs 1.1.18 → 1.1.19

package/dist/index31.mjs

@@ -1,52 +1,107 @@
-import { DebugLogger } from './index35.mjs';
+import { TransversalManager } from './index13.mjs';
+import { getAffectedMethods } from './index12.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);
+class TransversalWeaver {
+    static weave(n, r, o) {
+        const c = TransversalManager.getInstance(o);
+        const s = c.getAspectsForTarget(r);
+        const a = Object.getPrototypeOf(n);
+        const f = Object.getOwnPropertyNames(a).some((t)=>{
+            if (t === 'constructor') return false;
+            const n = Object.getOwnPropertyDescriptor(a, t);
+            if (!n) return false;
+            const r = n.value && typeof n.value === 'function';
+            const o = n.get && typeof n.get === 'function';
+            if (!r && !o) return false;
+            const c = getAffectedMethods(a, t);
+            return c.length > 0;
+        });
+        if (s.length === 0 && !f) {
+            return n;
         }
-        this.objects.set(r, o);
-        return o;
-    }
-    has(e) {
-        return this.objects.has(e);
+        return new Proxy(n, {
+            get (t, e, n) {
+                const r = Reflect.get(t, e, n);
+                if (typeof r !== 'function') {
+                    return r;
+                }
+                return function(...n) {
+                    const o = String(e);
+                    const a = {
+                        target: t,
+                        methodName: o,
+                        args: n
+                    };
+                    const f = c.getAdvicesForJoinPoint(a, s, t, e);
+                    return TransversalWeaver.executeAdviceChain(f, r, t, n, a);
+                };
+            }
+        });
     }
-    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);
+    static executeAdviceChain(t, e, n, r, o) {
+        const c = t.filter((t)=>t.type === 'before');
+        const s = t.filter((t)=>t.type === 'around');
+        const a = t.filter((t)=>t.type === 'after');
+        try {
+            for (const t of c){
+                const e = {
+                    ...o,
+                    config: t.config
+                };
+                t.method.call(t.transversalInstance, e);
+            }
+            let t;
+            if (s.length > 0) {
+                t = this.buildAroundChain(s, e, n, r, o);
+            } else {
+                t = e.apply(n, r);
+            }
+            if (t instanceof Promise) {
+                return t.then((t)=>{
+                    for (const e of a){
+                        const n = {
+                            ...o,
+                            result: t
+                        };
+                        e.method.call(e.transversalInstance, n);
+                    }
+                    return t;
+                }).catch((t)=>{
+                    o.error = t;
+                    throw t;
+                });
+            }
+            for (const e of a){
+                const n = {
+                    ...o,
+                    result: t,
+                    config: e.config
+                };
+                e.method.call(e.transversalInstance, n);
+            }
+            return t;
+        } catch (t) {
+            o.error = t;
+            throw t;
         }
-        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);
-    }
-    global(e) {
-        return this.globals.get(e);
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    static buildAroundChain(t, e, n, r, o) {
+        let c = 0;
+        const s = ()=>{
+            if (c < t.length) {
+                const e = t[c++];
+                const n = {
+                    ...o,
+                    proceed: s,
+                    config: e.config
+                };
+                return e.method.call(e.transversalInstance, n);
+            } else {
+                return e.apply(n, r);
+            }
+        };
+        return s();
     }
 }
 
-export { ObjectManager };
+export { TransversalWeaver };

package/dist/index32.js

@@ -2,84 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const core = require('@assemblerjs/core');
-const debugLogger = require('./index35.js');
-
-class HookManager {
-    prepareInitHook(o, t) {
-        this.initCache.push({
-            instance: o,
-            configuration: t
-        });
-        return this.initCache;
-    }
-    callInitHooks(o) {
-        for (const t of this.initCache){
-            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
-        }
-    }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-    }
-    clearCache() {
-        this.initCache.length = 0;
-    }
-    getCache() {
-        return this.initCache;
-    }
-    constructor(){
-        this.initCache = [];
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
 }
-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();
-        }
-    });
-};
-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;
+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);
+    }
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
+    }
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
 };
 
-exports.HookManager = HookManager;
+exports.PointcutMatcher = PointcutMatcher;

package/dist/index32.mjs

@@ -1,81 +1,30 @@
-import { isAsync } from '@assemblerjs/core';
-import { DebugLogger } from './index35.mjs';
-
-class HookManager {
-    prepareInitHook(o, t) {
-        this.initCache.push({
-            instance: o,
-            configuration: t
-        });
-        return this.initCache;
-    }
-    callInitHooks(o) {
-        for (const t of this.initCache){
-            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
-        }
-    }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-    }
-    clearCache() {
-        this.initCache.length = 0;
-    }
-    getCache() {
-        return this.initCache;
-    }
-    constructor(){
-        this.initCache = [];
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
 }
-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();
-        }
-    });
-};
-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;
+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);
+    }
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
+    }
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
 };
 
-export { HookManager };
+export { PointcutMatcher };

package/dist/index33.js

@@ -2,60 +2,163 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index32.js');
-const debugLogger = require('./index35.js');
-const cycleDetector = require('./index36.js');
-const injectableManager = require('./index30.js');
-const schema = require('./index38.js');
+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');
 
-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
-                });
+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.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(e){
-        this.assembler = e;
+    }
+    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);
+        }
+        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.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 resolutionStrategies.SingletonStrategy();
+        this.transientStrategy = new resolutionStrategies.TransientStrategy();
     }
 }
 
-exports.AssemblerBuilder = AssemblerBuilder;
+exports.InjectableManager = InjectableManager;
+exports.formatIdentifier = formatIdentifier;