assemblerjs 1.1.15 → 1.1.17

package/dist/index32.mjs

@@ -1,156 +1,107 @@
-import { HookManager } from './index34.mjs';
-import { SingletonStrategy, TransientStrategy } from './index43.mjs';
-import { DebugLogger } from './index37.mjs';
-import { isClass } from '@assemblerjs/core';
-import { resolveInstanceInjectionTuple } from './index42.mjs';
-import { resolveInjectionTuple } from './index41.mjs';
-import { Injectable } from './index44.mjs';
+import { TransversalManager } from './index13.mjs';
+import { getAffectedMethods } from './index12.mjs';
 
-function a(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;
+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;
         }
-        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 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);
+                };
             }
-            return t;
-        } catch  {
-            return '[UnknownObject]';
-        }
-    }
-    return String(e);
-}
-function f(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, s = false) {
-        const c = DebugLogger.getInstance();
-        const a = s === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
-        if (this.has(a.identifier)) {
-            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
-            c.log('error', 'Duplicate registration', {
-                identifier: a.identifier.name,
-                error: e
-            });
-            throw new Error(e);
-        }
-        const f = Injectable.of(a, this.privateContext, this.publicContext);
-        c.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 s = a(e);
-            const c = f(e);
-            const u = t?.__paramIndex;
-            const l = t?.__paramCount;
-            const g = t?.__expectedType;
-            const d = r ? `Circular dependency detected: '${s}' is already being resolved.` : `Dependency '${s}' has not been registered (Class/Service not found in current assemblages).`;
-            const p = {
-                identifier: s,
-                caller: n ? a(n) : 'unknown',
-                type: c,
-                error: d
-            };
-            if (u !== undefined) {
-                p.paramIndex = u;
+    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);
             }
-            if (l !== undefined) {
-                p.paramCount = l;
+            let t;
+            if (s.length > 0) {
+                t = this.buildAroundChain(s, e, n, r, o);
+            } else {
+                t = e.apply(n, r);
             }
-            if (g !== undefined) {
-                const e = g?.name || a(g);
-                p.expectedType = e;
+            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;
+                });
             }
-            DebugLogger.getInstance().log('error', i, p);
-            throw new Error(d);
-        }
-        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);
+            for (const e of a){
+                const n = {
+                    ...o,
+                    result: t,
+                    config: e.config
+                };
+                e.method.call(e.transversalInstance, n);
             }
-        } finally{
-            this.resolvingStack.delete(r.identifier);
+            return t;
+        } catch (t) {
+            o.error = t;
+            throw t;
         }
     }
-    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());
+    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 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));
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.resolvingStack = new Set();
-        this.singletonStrategy = new SingletonStrategy();
-        this.transientStrategy = new TransientStrategy();
+        };
+        return s();
     }
 }
 
-export { InjectableManager };
+export { TransversalWeaver };

package/dist/index33.js

@@ -2,55 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-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);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-        this.objects.set(r, o);
-        return o;
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
-    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);
+}
+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);
     }
-    addGlobal(e, t) {
-        if (this.globals.has(e)) {
-            throw new Error(`Global value with key '${e}' has already been registered.`);
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
-        this.globals.set(e, t);
-    }
-    global(e) {
-        return this.globals.get(e);
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
-}
+};
 
-exports.ObjectManager = ObjectManager;
+exports.PointcutMatcher = PointcutMatcher;

package/dist/index33.mjs

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

package/dist/index34.js

@@ -2,84 +2,27 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-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;
-    }
-    callInitHooks(o) {
-        for (const t of this.initCache){
-            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
-        }
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
+        return new r();
     }
-    clearCache() {
-        this.initCache.length = 0;
+    static hasResolver(e) {
+        return this.resolvers.has(e);
     }
-    getCache() {
-        return this.initCache;
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    constructor(){
-        this.initCache = [];
+    static clear() {
+        this.resolvers.clear();
     }
 }
-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;
-        }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
-    }
-};
+ResolverStore.resolvers = new Map();
 
-exports.HookManager = HookManager;
+exports.ResolverStore = ResolverStore;

package/dist/index34.mjs

@@ -1,81 +1,24 @@
-import { isAsync } from '@assemblerjs/core';
-import { DebugLogger } from './index37.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);
-        }
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
+        return new r();
     }
-    clearCache() {
-        this.initCache.length = 0;
+    static hasResolver(e) {
+        return this.resolvers.has(e);
     }
-    getCache() {
-        return this.initCache;
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    constructor(){
-        this.initCache = [];
+    static clear() {
+        this.resolvers.clear();
     }
 }
-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;
-        }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
-    }
-};
+ResolverStore.resolvers = new Map();
 
-export { HookManager };
+export { ResolverStore };