assemblerjs 1.1.17 → 1.1.19

package/dist/index.d.ts

@@ -1248,6 +1248,7 @@ export declare class TransversalManager {
     private static instances;
     private static transversalInstances;
     private static transversalMetadata;
+    private static abstractToConcreteMap;
     private constructor();
     /**
      * Gets or creates an TransversalManager instance for a given context.

package/dist/index13.js

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const pointcutMatcher = require('./index33.js');
+const pointcutMatcher = require('./index32.js');
 const affect = require('./index12.js');
 const schema = require('./index30.js');
 
 class TransversalManager {
     static getInstance(e) {
-        let t = this.instances.get(e);
-        if (!t) {
-            t = new TransversalManager(e);
-            this.instances.set(e, t);
+        let a = this.instances.get(e);
+        if (!a) {
+            a = new TransversalManager(e);
+            this.instances.set(e, a);
         }
-        return t;
+        return a;
     }
     getTransversalInstance(e) {
         return TransversalManager.transversalInstances.get(e);
@@ -22,88 +22,92 @@ class TransversalManager {
     static resetGlobalState() {
         TransversalManager.transversalInstances.clear();
         TransversalManager.transversalMetadata.clear();
+        TransversalManager.abstractToConcreteMap.clear();
         TransversalManager.instances = new WeakMap();
     }
-    registerTransversal(t, n) {
+    registerTransversal(a, r) {
         let s;
-        let r;
+        let n;
         let o;
-        if (t.length === 1) {
-            s = t[0];
-            r = t[0];
+        if (a.length === 1) {
+            s = a[0];
+            n = a[0];
             o = undefined;
-        } else if (t.length === 2) {
-            const a = t[1];
-            if (core.isClass(a)) {
-                s = t[0];
-                r = a;
+        } else if (a.length === 2) {
+            const t = a[1];
+            if (core.isClass(t)) {
+                s = a[0];
+                n = t;
                 o = undefined;
             } else {
-                s = t[0];
-                r = t[0];
-                o = a;
+                s = a[0];
+                n = a[0];
+                o = t;
             }
         } else {
-            s = t[0];
-            r = t[1];
-            o = t[2];
+            s = a[0];
+            n = a[1];
+            o = a[2];
+        }
+        const c = n.name;
+        if (s !== n) {
+            TransversalManager.abstractToConcreteMap.set(s.name, c);
         }
-        const c = r.name;
         if (!TransversalManager.transversalInstances.has(c)) {
-            const e = n || this.context;
-            const t = e.require(s, o);
-            const i = schema.getDefinition(r);
+            const e = r || this.context;
+            const a = e.require(s, o);
+            const i = schema.getDefinition(n);
             if (!i) {
                 throw new Error(`Transversal ${c} must be decorated with @Transversal`);
             }
-            TransversalManager.transversalInstances.set(c, t);
+            TransversalManager.transversalInstances.set(c, a);
             const l = {
                 definition: i,
-                advices: this.extractAdvices(r, t),
-                instance: t
+                advices: this.extractAdvices(n, a),
+                instance: a
             };
             TransversalManager.transversalMetadata.set(c, l);
         }
     }
-    extractAdvices(e, t) {
-        const n = schema.getDefinition(e);
+    extractAdvices(e, a) {
+        const r = schema.getDefinition(e);
         const s = [];
-        const r = n?.metadata?.advices || [];
-        for (const a of r){
-            const n = t[a.methodName];
-            if (typeof n !== 'function') {
-                throw new Error(`Advice method ${a.methodName} not found in ${e.name}`);
+        const n = r?.metadata?.advices || [];
+        for (const t of n){
+            const r = a[t.methodName];
+            if (typeof r !== 'function') {
+                throw new Error(`Advice method ${t.methodName} not found in ${e.name}`);
             }
-            const r = a.pointcut.startsWith('execution(') ? undefined : a.pointcut;
+            const n = t.pointcut.startsWith('execution(') ? undefined : t.pointcut;
             s.push({
-                type: a.type,
-                pointcut: a.pointcut,
-                method: n,
-                transversalInstance: t,
-                priority: a.priority || 0,
-                enabled: a.enabled ?? true,
-                role: r
+                type: t.type,
+                pointcut: t.pointcut,
+                method: r,
+                transversalInstance: a,
+                priority: t.priority || 0,
+                enabled: t.enabled ?? true,
+                role: n
             });
         }
         return s;
     }
     getAspectsForTarget(e) {
-        const t = [];
-        for (const a of TransversalManager.transversalMetadata.values()){
-            if (this.hasMatchingAdviceForClass(a, e)) {
-                t.push(a);
+        const a = [];
+        for (const t of TransversalManager.transversalMetadata.values()){
+            if (this.hasMatchingAdviceForClass(t, e)) {
+                a.push(t);
             }
         }
-        return t;
+        return a;
     }
-    hasMatchingAdviceForClass(e, t) {
+    hasMatchingAdviceForClass(e, a) {
         return e.advices.some((e)=>{
             if (!e.enabled) return false;
-            const a = e.pointcut.match(/execution\(([^.]+)\.[^)]+\)/);
-            if (a) {
-                const e = a[1];
-                const n = this.patternToRegex(e);
-                return n.test(t.name);
+            const t = e.pointcut.match(/execution\(([^.]+)\.[^)]+\)/);
+            if (t) {
+                const e = t[1];
+                const r = this.patternToRegex(e);
+                return r.test(a.name);
             }
             return false;
         });
@@ -112,51 +116,61 @@ class TransversalManager {
         if (e === '*') {
             return /.*/;
         }
-        const t = e.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
-        const a = t.replace(/\*/g, '.*');
-        return new RegExp(`^${a}$`);
+        const a = e.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+        const t = a.replace(/\*/g, '.*');
+        return new RegExp(`^${t}$`);
     }
-    getAdvicesForJoinPoint(e, a, s, r) {
+    getAdvicesForJoinPoint(e, t, s, n) {
         const o = [];
-        for (const n of a){
-            for (const a of n.advices){
-                if (!a.enabled) continue;
-                const n = pointcutMatcher.PointcutMatcher.parse(a.pointcut);
-                if (n.matches(e)) {
-                    o.push(a);
+        for (const r of t){
+            for (const t of r.advices){
+                if (!t.enabled) continue;
+                const r = pointcutMatcher.PointcutMatcher.parse(t.pointcut);
+                if (r.matches(e)) {
+                    o.push(t);
                 }
             }
         }
-        if (s && r) {
+        if (s && n) {
             const e = s.constructor.prototype;
-            const t = affect.getAffectedMethods(e, r);
-            for (const e of t){
-                const t = e.transversal;
-                const a = typeof t === 'function' ? t.name : String(t);
-                let n = TransversalManager.transversalMetadata.get(a);
-                if (!n && typeof t === 'function') {
-                    const e = Object.getPrototypeOf(t);
-                    if (e && e.name) {
-                        n = TransversalManager.transversalMetadata.get(e.name);
+            const a = affect.getAffectedMethods(e, n);
+            for (const e of a){
+                const a = e.transversal;
+                const t = typeof a === 'function' ? a.name : String(a);
+                let r = t;
+                if (TransversalManager.abstractToConcreteMap.has(t)) {
+                    r = TransversalManager.abstractToConcreteMap.get(t);
+                }
+                let s = TransversalManager.transversalMetadata.get(r);
+                if (!s) {
+                    try {
+                        if (typeof a === 'function') {
+                            this.registerTransversal([
+                                a
+                            ]);
+                            s = TransversalManager.transversalMetadata.get(r);
+                        }
+                    } catch (e) {
+                        console.warn(`Failed to lazy-register transversal ${t}:`, e);
                     }
                 }
-                if (!n) {
-                    console.warn(`@Affect: Transversal ${a} not found. Make sure it's registered in transversals[].`);
+                if (!s) {
+                    console.warn(`@Affect: Transversal ${t} not found. Make sure it's registered in transversals[].`);
                     continue;
                 }
-                for (const t of n.advices){
-                    if (!t.enabled) continue;
-                    if (e.role && t.role !== e.role) {
+                for (const a of s.advices){
+                    if (!a.enabled) continue;
+                    if (e.role && a.role !== e.role) {
                         continue;
                     }
                     o.push({
-                        ...t,
+                        ...a,
                         config: e.config
                     });
                 }
             }
         }
-        return o.sort((e, t)=>t.priority - e.priority);
+        return o.sort((e, a)=>a.priority - e.priority);
     }
     constructor(e){
         this.context = e;
@@ -165,5 +179,6 @@ class TransversalManager {
 TransversalManager.instances = new WeakMap();
 TransversalManager.transversalInstances = new Map();
 TransversalManager.transversalMetadata = new Map();
+TransversalManager.abstractToConcreteMap = new Map();
 
 exports.TransversalManager = TransversalManager;

package/dist/index13.mjs

@@ -1,16 +1,16 @@
 import { isClass } from '@assemblerjs/core';
-import { PointcutMatcher } from './index33.mjs';
+import { PointcutMatcher } from './index32.mjs';
 import { getAffectedMethods } from './index12.mjs';
 import { getDefinition } from './index30.mjs';
 
 class TransversalManager {
     static getInstance(e) {
-        let t = this.instances.get(e);
-        if (!t) {
-            t = new TransversalManager(e);
-            this.instances.set(e, t);
+        let a = this.instances.get(e);
+        if (!a) {
+            a = new TransversalManager(e);
+            this.instances.set(e, a);
         }
-        return t;
+        return a;
     }
     getTransversalInstance(e) {
         return TransversalManager.transversalInstances.get(e);
@@ -18,88 +18,92 @@ class TransversalManager {
     static resetGlobalState() {
         TransversalManager.transversalInstances.clear();
         TransversalManager.transversalMetadata.clear();
+        TransversalManager.abstractToConcreteMap.clear();
         TransversalManager.instances = new WeakMap();
     }
-    registerTransversal(t, n) {
+    registerTransversal(a, r) {
         let s;
-        let r;
+        let n;
         let o;
-        if (t.length === 1) {
-            s = t[0];
-            r = t[0];
+        if (a.length === 1) {
+            s = a[0];
+            n = a[0];
             o = undefined;
-        } else if (t.length === 2) {
-            const a = t[1];
-            if (isClass(a)) {
-                s = t[0];
-                r = a;
+        } else if (a.length === 2) {
+            const t = a[1];
+            if (isClass(t)) {
+                s = a[0];
+                n = t;
                 o = undefined;
             } else {
-                s = t[0];
-                r = t[0];
-                o = a;
+                s = a[0];
+                n = a[0];
+                o = t;
             }
         } else {
-            s = t[0];
-            r = t[1];
-            o = t[2];
+            s = a[0];
+            n = a[1];
+            o = a[2];
+        }
+        const c = n.name;
+        if (s !== n) {
+            TransversalManager.abstractToConcreteMap.set(s.name, c);
         }
-        const c = r.name;
         if (!TransversalManager.transversalInstances.has(c)) {
-            const e = n || this.context;
-            const t = e.require(s, o);
-            const i = getDefinition(r);
+            const e = r || this.context;
+            const a = e.require(s, o);
+            const i = getDefinition(n);
             if (!i) {
                 throw new Error(`Transversal ${c} must be decorated with @Transversal`);
             }
-            TransversalManager.transversalInstances.set(c, t);
+            TransversalManager.transversalInstances.set(c, a);
             const l = {
                 definition: i,
-                advices: this.extractAdvices(r, t),
-                instance: t
+                advices: this.extractAdvices(n, a),
+                instance: a
             };
             TransversalManager.transversalMetadata.set(c, l);
         }
     }
-    extractAdvices(e, t) {
-        const n = getDefinition(e);
+    extractAdvices(e, a) {
+        const r = getDefinition(e);
         const s = [];
-        const r = n?.metadata?.advices || [];
-        for (const a of r){
-            const n = t[a.methodName];
-            if (typeof n !== 'function') {
-                throw new Error(`Advice method ${a.methodName} not found in ${e.name}`);
+        const n = r?.metadata?.advices || [];
+        for (const t of n){
+            const r = a[t.methodName];
+            if (typeof r !== 'function') {
+                throw new Error(`Advice method ${t.methodName} not found in ${e.name}`);
             }
-            const r = a.pointcut.startsWith('execution(') ? undefined : a.pointcut;
+            const n = t.pointcut.startsWith('execution(') ? undefined : t.pointcut;
             s.push({
-                type: a.type,
-                pointcut: a.pointcut,
-                method: n,
-                transversalInstance: t,
-                priority: a.priority || 0,
-                enabled: a.enabled ?? true,
-                role: r
+                type: t.type,
+                pointcut: t.pointcut,
+                method: r,
+                transversalInstance: a,
+                priority: t.priority || 0,
+                enabled: t.enabled ?? true,
+                role: n
             });
         }
         return s;
     }
     getAspectsForTarget(e) {
-        const t = [];
-        for (const a of TransversalManager.transversalMetadata.values()){
-            if (this.hasMatchingAdviceForClass(a, e)) {
-                t.push(a);
+        const a = [];
+        for (const t of TransversalManager.transversalMetadata.values()){
+            if (this.hasMatchingAdviceForClass(t, e)) {
+                a.push(t);
             }
         }
-        return t;
+        return a;
     }
-    hasMatchingAdviceForClass(e, t) {
+    hasMatchingAdviceForClass(e, a) {
         return e.advices.some((e)=>{
             if (!e.enabled) return false;
-            const a = e.pointcut.match(/execution\(([^.]+)\.[^)]+\)/);
-            if (a) {
-                const e = a[1];
-                const n = this.patternToRegex(e);
-                return n.test(t.name);
+            const t = e.pointcut.match(/execution\(([^.]+)\.[^)]+\)/);
+            if (t) {
+                const e = t[1];
+                const r = this.patternToRegex(e);
+                return r.test(a.name);
             }
             return false;
         });
@@ -108,51 +112,61 @@ class TransversalManager {
         if (e === '*') {
             return /.*/;
         }
-        const t = e.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
-        const a = t.replace(/\*/g, '.*');
-        return new RegExp(`^${a}$`);
+        const a = e.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+        const t = a.replace(/\*/g, '.*');
+        return new RegExp(`^${t}$`);
     }
-    getAdvicesForJoinPoint(e, a, s, r) {
+    getAdvicesForJoinPoint(e, t, s, n) {
         const o = [];
-        for (const n of a){
-            for (const a of n.advices){
-                if (!a.enabled) continue;
-                const n = PointcutMatcher.parse(a.pointcut);
-                if (n.matches(e)) {
-                    o.push(a);
+        for (const r of t){
+            for (const t of r.advices){
+                if (!t.enabled) continue;
+                const r = PointcutMatcher.parse(t.pointcut);
+                if (r.matches(e)) {
+                    o.push(t);
                 }
             }
         }
-        if (s && r) {
+        if (s && n) {
             const e = s.constructor.prototype;
-            const t = getAffectedMethods(e, r);
-            for (const e of t){
-                const t = e.transversal;
-                const a = typeof t === 'function' ? t.name : String(t);
-                let n = TransversalManager.transversalMetadata.get(a);
-                if (!n && typeof t === 'function') {
-                    const e = Object.getPrototypeOf(t);
-                    if (e && e.name) {
-                        n = TransversalManager.transversalMetadata.get(e.name);
+            const a = getAffectedMethods(e, n);
+            for (const e of a){
+                const a = e.transversal;
+                const t = typeof a === 'function' ? a.name : String(a);
+                let r = t;
+                if (TransversalManager.abstractToConcreteMap.has(t)) {
+                    r = TransversalManager.abstractToConcreteMap.get(t);
+                }
+                let s = TransversalManager.transversalMetadata.get(r);
+                if (!s) {
+                    try {
+                        if (typeof a === 'function') {
+                            this.registerTransversal([
+                                a
+                            ]);
+                            s = TransversalManager.transversalMetadata.get(r);
+                        }
+                    } catch (e) {
+                        console.warn(`Failed to lazy-register transversal ${t}:`, e);
                     }
                 }
-                if (!n) {
-                    console.warn(`@Affect: Transversal ${a} not found. Make sure it's registered in transversals[].`);
+                if (!s) {
+                    console.warn(`@Affect: Transversal ${t} not found. Make sure it's registered in transversals[].`);
                     continue;
                 }
-                for (const t of n.advices){
-                    if (!t.enabled) continue;
-                    if (e.role && t.role !== e.role) {
+                for (const a of s.advices){
+                    if (!a.enabled) continue;
+                    if (e.role && a.role !== e.role) {
                         continue;
                     }
                     o.push({
-                        ...t,
+                        ...a,
                         config: e.config
                     });
                 }
             }
         }
-        return o.sort((e, t)=>t.priority - e.priority);
+        return o.sort((e, a)=>a.priority - e.priority);
     }
     constructor(e){
         this.context = e;
@@ -161,5 +175,6 @@ class TransversalManager {
 TransversalManager.instances = new WeakMap();
 TransversalManager.transversalInstances = new Map();
 TransversalManager.transversalMetadata = new Map();
+TransversalManager.abstractToConcreteMap = new Map();
 
 export { TransversalManager };

package/dist/index18.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index18.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index19.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index19.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index20.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index20.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index21.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index21.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index22.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index22.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index23.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index23.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index34.mjs';
+import { ResolverStore } from './index41.mjs';
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index24.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index34.js');
+const resolverStore = require('./index41.js');
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {