assemblerjs 1.1.20 → 1.1.21

package/dist/index34.js

@@ -2,60 +2,84 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-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');
+const core = require('@assemblerjs/core');
+const debugLogger = require('./index37.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
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
         });
-        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.initCache;
+    }
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
-        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.');
+    }
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        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;
+    clearCache() {
+        this.initCache.length = 0;
+    }
+    getCache() {
+        return this.initCache;
+    }
+    constructor(){
+        this.initCache = [];
     }
 }
+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();
+    }
+};
 
-exports.AssemblerBuilder = AssemblerBuilder;
+exports.HookManager = HookManager;

package/dist/index34.mjs

@@ -1,57 +1,81 @@
-import { HookManager } from './index33.mjs';
-import { DebugLogger } from './index36.mjs';
-import { CycleDetector } from './index37.mjs';
-import { formatIdentifier } from './index31.mjs';
-import { setDefinitionValue } from './index30.mjs';
+import { isAsync } from '@assemblerjs/core';
+import { DebugLogger } from './index37.mjs';
 
-class AssemblerBuilder {
-    build(n, r) {
-        const i = DebugLogger.getInstance();
-        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
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
         });
-        const h = CycleDetector.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>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.initCache;
+    }
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
-        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.');
+    }
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        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.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInit');
-        i.logPhaseStart('hooks:onInited');
-        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
-        HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInited');
-        this.assembler.hookManager.clearCache();
-        return g;
     }
-    constructor(e){
-        this.assembler = e;
+    clearCache() {
+        this.initCache.length = 0;
+    }
+    getCache() {
+        return this.initCache;
+    }
+    constructor(){
+        this.initCache = [];
     }
 }
+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();
+    }
+};
 
-export { AssemblerBuilder };
+export { HookManager };

package/dist/index35.js

@@ -2,36 +2,60 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class ContextProvider {
-    createPublicContext() {
-        return {
-            has: this.assembler.has.bind(this.assembler),
-            require: this.assembler.require.bind(this.assembler),
-            concrete: this.assembler.concrete.bind(this.assembler),
-            tagged: this.assembler.tagged.bind(this.assembler),
-            dispose: this.assembler.dispose.bind(this.assembler),
-            global: this.assembler.global.bind(this.assembler),
-            on: this.assembler.on.bind(this.assembler),
-            once: this.assembler.once.bind(this.assembler),
-            off: this.assembler.off.bind(this.assembler),
-            events: this.assembler.channels
-        };
-    }
-    createPrivateContext(s) {
-        return {
-            ...s,
-            register: this.assembler.register.bind(this.assembler),
-            use: this.assembler.use.bind(this.assembler),
-            addGlobal: this.assembler.addGlobal.bind(this.assembler),
-            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
-            emit: this.assembler.emit.bind(this.assembler),
-            addChannels: this.assembler.addChannels.bind(this.assembler),
-            removeChannels: this.assembler.removeChannels.bind(this.assembler)
-        };
+const hookManager = require('./index34.js');
+const debugLogger = require('./index37.js');
+const cycleDetector = require('./index38.js');
+const injectableManager = require('./index32.js');
+const schema = require('./index30.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
+                });
+            }
+        }
+        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(s){
-        this.assembler = s;
+    constructor(e){
+        this.assembler = e;
     }
 }
 
-exports.ContextProvider = ContextProvider;
+exports.AssemblerBuilder = AssemblerBuilder;

package/dist/index35.mjs

@@ -1,33 +1,57 @@
-class ContextProvider {
-    createPublicContext() {
-        return {
-            has: this.assembler.has.bind(this.assembler),
-            require: this.assembler.require.bind(this.assembler),
-            concrete: this.assembler.concrete.bind(this.assembler),
-            tagged: this.assembler.tagged.bind(this.assembler),
-            dispose: this.assembler.dispose.bind(this.assembler),
-            global: this.assembler.global.bind(this.assembler),
-            on: this.assembler.on.bind(this.assembler),
-            once: this.assembler.once.bind(this.assembler),
-            off: this.assembler.off.bind(this.assembler),
-            events: this.assembler.channels
-        };
-    }
-    createPrivateContext(s) {
-        return {
-            ...s,
-            register: this.assembler.register.bind(this.assembler),
-            use: this.assembler.use.bind(this.assembler),
-            addGlobal: this.assembler.addGlobal.bind(this.assembler),
-            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
-            emit: this.assembler.emit.bind(this.assembler),
-            addChannels: this.assembler.addChannels.bind(this.assembler),
-            removeChannels: this.assembler.removeChannels.bind(this.assembler)
-        };
+import { HookManager } from './index34.mjs';
+import { DebugLogger } from './index37.mjs';
+import { CycleDetector } from './index38.mjs';
+import { formatIdentifier } from './index32.mjs';
+import { setDefinitionValue } from './index30.mjs';
+
+class AssemblerBuilder {
+    build(n, r) {
+        const i = DebugLogger.getInstance();
+        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.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>formatIdentifier(e));
+        if (h.length > 0) {
+            for (const e of h){
+                i.log('error', 'Circular dependency detected', {
+                    cycle: e.cycle,
+                    path: e.path
+                });
+            }
+        }
+        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.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInit');
+        i.logPhaseStart('hooks:onInited');
+        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
+        HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInited');
+        this.assembler.hookManager.clearCache();
+        return g;
     }
-    constructor(s){
-        this.assembler = s;
+    constructor(e){
+        this.assembler = e;
     }
 }
 
-export { ContextProvider };
+export { AssemblerBuilder };

package/dist/index36.js

@@ -2,171 +2,36 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-function o(o) {
-    if (o === undefined) return 'undefined';
-    if (o === null) return 'null';
-    if (typeof o === 'function') {
-        if (o.name) return o.name;
-        if (o.constructor?.name && o.constructor.name !== 'Function') {
-            return o.constructor.name;
-        }
-        return 'AnonymousFunction';
-    }
-    if (typeof o === 'object') {
-        const e = o.constructor?.name;
-        if (e && e !== 'Object') {
-            return e;
-        }
-        if (o.name && typeof o.name === 'string') {
-            return o.name;
-        }
-        return '[Object]';
-    }
-    return String(o);
-}
-let NoOpDebugLogger = class NoOpDebugLogger {
-    configure(o) {}
-    log(o, e, t) {}
-    logBuildStart(o) {}
-    logBuildEnd(o, e) {}
-    logRegistration(o) {}
-    logHook(o, e, t) {}
-    logPhaseStart(o, e) {}
-    logPhaseEnd(o, e, t) {}
-    logResolution(o, e, t) {}
-    logConstruction(o) {}
-};
-let ActiveDebugLogger = class ActiveDebugLogger {
-    configure(o) {
-        this.options = {
-            ...this.options,
-            ...o,
-            logPhases: {
-                ...this.options.logPhases,
-                ...o.logPhases || {}
-            }
-        };
-    }
-    logBuildStart(o) {
-        this.log('info', 'Build started', {
-            entry: o.name
-        });
-    }
-    logBuildEnd(o, e) {
-        const t = {
-            entry: o.name
-        };
-        if (e !== undefined) t.duration = `${e.toFixed(2)}ms`;
-        this.log('info', 'Build completed', t);
-    }
-    logRegistration(e) {
-        if (!this.shouldLog('registration')) return;
-        this.log('info', 'Registration', {
-            identifier: o(e.identifier),
-            isSingleton: e.isSingleton,
-            dependencies: e.dependencies.map((e)=>o(e)),
-            tags: e.tags
-        });
-    }
-    logHook(e, t, n) {
-        if (!this.shouldLog('hooks')) return;
-        const s = this.options.logTimings ? performance.now() : 0;
-        this.log('info', `Hook: ${e}`, {
-            target: o(t),
-            config: n
-        });
-        if (this.options.logTimings) {
-            return ()=>{
-                const o = performance.now() - s;
-                this.log('info', `Hook: ${e} completed`, {
-                    duration: `${o.toFixed(2)}ms`
-                });
-            };
-        }
-    }
-    logPhaseStart(o, e) {
-        this.log('info', `Phase: ${o} started`, e);
-    }
-    logPhaseEnd(o, e, t) {
-        const n = e !== undefined ? {
-            duration: `${e.toFixed(2)}ms`
-        } : {};
-        if (t) {
-            Object.assign(n, t);
-        }
-        this.log('info', `Phase: ${o} ended`, Object.keys(n).length > 0 ? n : undefined);
-    }
-    logResolution(o, e, t) {
-        if (!this.shouldLog('resolution')) return;
-        this.log('info', `Resolving: ${o}`, {
-            strategy: `${e} strategy`,
-            cache: t ? 'hit' : 'miss'
-        });
-    }
-    logConstruction(o) {
-        if (!this.shouldLog('construction')) return;
-        this.log('info', `Constructing: ${o}`);
-    }
-    shouldLog(o) {
-        return !this.options.logPhases || this.options.logPhases[o] !== false;
-    }
-    log(o, e, t) {
-        if (this.options.logger) {
-            this.options.logger(o, e, t);
-        } else {
-            const n = `[Assembler:${o}]`;
-            const s = this.options.useColors !== false ? this.colorize(o, n) : n;
-            if (t) {
-                console.log(`${s} ${e}`, t);
-            } else {
-                console.log(`${s} ${e}`);
-            }
-        }
-    }
-    colorize(o, e) {
-        const t = {
-            info: '\x1b[36m',
-            warn: '\x1b[33m',
-            error: '\x1b[31m',
-            reset: '\x1b[0m'
+class ContextProvider {
+    createPublicContext() {
+        return {
+            has: this.assembler.has.bind(this.assembler),
+            require: this.assembler.require.bind(this.assembler),
+            concrete: this.assembler.concrete.bind(this.assembler),
+            tagged: this.assembler.tagged.bind(this.assembler),
+            dispose: this.assembler.dispose.bind(this.assembler),
+            global: this.assembler.global.bind(this.assembler),
+            on: this.assembler.on.bind(this.assembler),
+            once: this.assembler.once.bind(this.assembler),
+            off: this.assembler.off.bind(this.assembler),
+            events: this.assembler.channels
         };
-        const n = t[o] || t.info;
-        return `${n}${e}${t.reset}`;
     }
-    constructor(){
-        this.options = {
-            enabled: true,
-            logPhases: {
-                registration: true,
-                resolution: true,
-                construction: true,
-                hooks: true,
-                cache: true
-            },
-            logTimings: false,
-            logDependencyTree: true,
-            useColors: true
+    createPrivateContext(s) {
+        return {
+            ...s,
+            register: this.assembler.register.bind(this.assembler),
+            use: this.assembler.use.bind(this.assembler),
+            addGlobal: this.assembler.addGlobal.bind(this.assembler),
+            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
+            emit: this.assembler.emit.bind(this.assembler),
+            addChannels: this.assembler.addChannels.bind(this.assembler),
+            removeChannels: this.assembler.removeChannels.bind(this.assembler)
         };
     }
-};
-class DebugLogger {
-    static getInstance() {
-        return DebugLogger.instance;
-    }
-    static enable(o) {
-        if (o?.enabled === false) {
-            DebugLogger.instance = new NoOpDebugLogger();
-            return;
-        }
-        DebugLogger.instance = new ActiveDebugLogger();
-        if (o) {
-            DebugLogger.instance.configure(o);
-        }
-    }
-    static disable() {
-        DebugLogger.instance = new NoOpDebugLogger();
+    constructor(s){
+        this.assembler = s;
     }
 }
-DebugLogger.instance = new NoOpDebugLogger();
 
-exports.DebugLogger = DebugLogger;
+exports.ContextProvider = ContextProvider;