assemblerjs 1.1.20 → 1.1.22

package/dist/index.d.ts

@@ -387,10 +387,14 @@ export declare interface AssemblerDebugOptions {
     logger?: (level: 'info' | 'warn' | 'error', message: string, data?: any) => void;
     logPhases?: {
         registration?: boolean;
+        registrationUse?: boolean;
+        registrationGlobals?: boolean;
         resolution?: boolean;
         construction?: boolean;
         hooks?: boolean;
         cache?: boolean;
+        injectionUse?: boolean;
+        injectionGlobal?: boolean;
     };
     logTimings?: boolean;
     logDependencyTree?: boolean;

package/dist/index11.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 const decorator = require('./index2.js');
-const schema = require('./index30.js');
+const schema = require('./index37.js');
 
 function isTransversal(e) {
     try {

package/dist/index11.mjs

@@ -1,7 +1,7 @@
 import { ReflectValue } from './index28.mjs';
-import { getCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { getCustomMetadata, defineCustomMetadata } from './index36.mjs';
 import { Assemblage } from './index2.mjs';
-import { getDefinition } from './index30.mjs';
+import { getDefinition } from './index37.mjs';
 
 function isTransversal(e) {
     try {

package/dist/index13.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const pointcutMatcher = require('./index40.js');
+const pointcutMatcher = require('./index41.js');
 const affect = require('./index12.js');
-const schema = require('./index30.js');
+const schema = require('./index37.js');
 
 class TransversalManager {
     static getInstance(e) {

package/dist/index13.mjs

@@ -1,7 +1,7 @@
 import { isClass } from '@assemblerjs/core';
-import { PointcutMatcher } from './index40.mjs';
+import { PointcutMatcher } from './index41.mjs';
 import { getAffectedMethods } from './index12.mjs';
-import { getDefinition } from './index30.mjs';
+import { getDefinition } from './index37.mjs';
 
 class TransversalManager {
     static getInstance(e) {

package/dist/index16.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 
 const t = (t)=>()=>{
         return (e, c, n)=>{

package/dist/index16.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index36.mjs';
 
 const t = (t)=>()=>{
         return (e, c, n)=>{

package/dist/index17.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 
 class ParameterDecoratorFactory {
     static create(e) {

package/dist/index17.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index36.mjs';
 
 class ParameterDecoratorFactory {
     static create(e) {

package/dist/index18.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index41.js');
+const resolverStore = require('./index38.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 './index41.mjs';
+import { ResolverStore } from './index38.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('./index41.js');
+const resolverStore = require('./index38.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 './index41.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index2.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
-const schema = require('./index30.js');
+const reflection = require('./index36.js');
+const schema = require('./index37.js');
 
 const Assemblage = (e)=>{
     return (r)=>{

package/dist/index2.mjs

@@ -1,6 +1,6 @@
 import { ReflectFlags, ReflectValue } from './index28.mjs';
-import { defineCustomMetadata } from './index29.mjs';
-import { validateDefinition } from './index30.mjs';
+import { defineCustomMetadata } from './index36.mjs';
+import { validateDefinition } from './index37.mjs';
 
 const Assemblage = (e)=>{
     return (r)=>{

package/dist/index20.js

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

package/dist/index20.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index41.mjs';
+import { ResolverStore } from './index38.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('./index41.js');
+const resolverStore = require('./index38.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 './index41.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index22.js

@@ -2,16 +2,22 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
+const debugLogger = require('./index34.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index41.js');
+const resolverStore = require('./index38.js');
 
 let UseResolver = class UseResolver {
-    resolve(r, o, t) {
-        const a = reflection.getOwnCustomMetadata(helpers.getParamValueKey('Use'), t);
-        const m = a[r];
-        return o.privateContext.require(m);
+    resolve(o, t, a) {
+        const n = reflection.getOwnCustomMetadata(helpers.getParamValueKey('Use'), a);
+        const m = n[o];
+        debugLogger.DebugLogger.getInstance().logInjection('use', {
+            target: a?.name,
+            index: o,
+            identifier: typeof m === 'symbol' ? m.toString() : m
+        });
+        return t.privateContext.require(m);
     }
 };
 const decorateUse = (e, r, o)=>{

package/dist/index22.mjs

@@ -1,13 +1,19 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index36.mjs';
+import { DebugLogger } from './index34.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index41.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let UseResolver = class UseResolver {
-    resolve(r, o, t) {
-        const a = getOwnCustomMetadata(getParamValueKey('Use'), t);
-        const m = a[r];
-        return o.privateContext.require(m);
+    resolve(o, t, a) {
+        const n = getOwnCustomMetadata(getParamValueKey('Use'), a);
+        const m = n[o];
+        DebugLogger.getInstance().logInjection('use', {
+            target: a?.name,
+            index: o,
+            identifier: typeof m === 'symbol' ? m.toString() : m
+        });
+        return t.privateContext.require(m);
     }
 };
 const decorateUse = (e, r, o)=>{

package/dist/index23.js

@@ -2,20 +2,26 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
+const debugLogger = require('./index34.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index41.js');
+const resolverStore = require('./index38.js');
 
 let GlobalResolver = class GlobalResolver {
-    resolve(e, r, a) {
-        const t = reflection.getOwnCustomMetadata(helpers.getParamValueKey('Global'), a);
-        const s = t[e];
-        return r.privateContext.global(s);
+    resolve(r, l, a) {
+        const s = reflection.getOwnCustomMetadata(helpers.getParamValueKey('Global'), a);
+        const n = s[r];
+        debugLogger.DebugLogger.getInstance().logInjection('global', {
+            target: a?.name,
+            index: r,
+            identifier: typeof n === 'symbol' ? n.toString() : n
+        });
+        return l.privateContext.global(n);
     }
 };
-const decorateGlobal = (o, e, r)=>{
-    Global(o)(e, undefined, r);
+const decorateGlobal = (e, o, r)=>{
+    Global(e)(o, undefined, r);
 };
 const Global = (()=>{
     resolverStore.ResolverStore.register('Global', GlobalResolver);

package/dist/index23.mjs

@@ -1,17 +1,23 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index36.mjs';
+import { DebugLogger } from './index34.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index41.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let GlobalResolver = class GlobalResolver {
-    resolve(e, r, a) {
-        const t = getOwnCustomMetadata(getParamValueKey('Global'), a);
-        const s = t[e];
-        return r.privateContext.global(s);
+    resolve(r, l, a) {
+        const s = getOwnCustomMetadata(getParamValueKey('Global'), a);
+        const n = s[r];
+        DebugLogger.getInstance().logInjection('global', {
+            target: a?.name,
+            index: r,
+            identifier: typeof n === 'symbol' ? n.toString() : n
+        });
+        return l.privateContext.global(n);
     }
 };
-const decorateGlobal = (o, e, r)=>{
-    Global(o)(e, undefined, r);
+const decorateGlobal = (e, o, r)=>{
+    Global(e)(o, undefined, r);
 };
 const Global = (()=>{
     ResolverStore.register('Global', GlobalResolver);

package/dist/index24.js

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

package/dist/index24.mjs

@@ -1,7 +1,7 @@
-import { getParamTypes, getOwnCustomMetadata } from './index29.mjs';
+import { getParamTypes, getOwnCustomMetadata } from './index36.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index41.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index25.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 const parameterDecoratorFactory = require('./index17.js');
 
 const getParamIndexKey = (e)=>{

package/dist/index25.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index36.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 
 const getParamIndexKey = (e)=>{

package/dist/index26.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 const helpers = require('./index25.js');
 const parameterDecoratorFactory = require('./index17.js');
 const decorator = require('./index2.js');

package/dist/index26.mjs

@@ -1,5 +1,5 @@
 import { ReflectParamTypes, ReflectValue } from './index28.mjs';
-import { getOwnCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index36.mjs';
 import { getDecoratedParametersIndexes, getParamValueKey, getParamIndexKey } from './index25.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { decorateAssemblage } from './index2.mjs';

package/dist/index29.js

@@ -2,22 +2,163 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const constants = require('./index28.js');
+const hookManager = require('./index31.js');
+const resolutionStrategies = require('./index42.js');
+const debugLogger = require('./index34.js');
+const core = require('@assemblerjs/core');
+const use = require('./index43.js');
+const inject = require('./index44.js');
+const injectable = require('./index45.js');
 
-const defineCustomMetadata = (t, o, n)=>{
-    Reflect.defineMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o, n);
-};
-const getCustomMetadata = (t, o)=>{
-    return Reflect.getMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o);
-};
-const getOwnCustomMetadata = (t, o)=>{
-    return Reflect.getOwnMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o);
-};
-const getParamTypes = (e)=>{
-    return Reflect.getMetadata(constants.ReflectParamTypes, e) || [];
-};
+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]';
+        }
+    }
+    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.defineCustomMetadata = defineCustomMetadata;
-exports.getCustomMetadata = getCustomMetadata;
-exports.getOwnCustomMetadata = getOwnCustomMetadata;
-exports.getParamTypes = getParamTypes;
+exports.InjectableManager = InjectableManager;
+exports.formatIdentifier = formatIdentifier;