lakutata 2.0.81 → 2.0.82

package/src/lib/ioc/LoadModules.cjs

@@ -8,11 +8,11 @@ const e = require("url");
 
 const r = require("./Lifetime.cjs");
 
-const t = require("./Resolvers.cjs");
+const s = require("./Resolvers.cjs");
 
-const s = require("./Utils.cjs");
+const t = require("./Utils.cjs");
 
-const n = require("../base/internal/CamelCase.cjs");
+const o = require("../base/internal/CamelCase.cjs");
 
 const i = require("../helpers/As.cjs");
 
@@ -80,54 +80,54 @@ require("./ParamParser.cjs");
 
 require("./FunctionTokenizer.cjs");
 
-const o = {
-    camelCase: e => n.CamelCase(e)
+const n = {
+    camelCase: e => o.CamelCase(e)
 };
 
-function c(e, r, t) {
-    t ??= {};
-    const s = e.container;
-    t = p(t);
-    const n = e.listModules(r, t);
-    if (t.esModules) {
-        return a(e, s, n, t);
+function loadModules(e, r, s) {
+    s ??= {};
+    const t = e.container;
+    s = optsWithDefaults(s);
+    const o = e.listModules(r, s);
+    if (s.esModules) {
+        return loadEsModules(e, t, o, s);
     } else {
-        const r = n.map((r => {
-            const t = e.require(r.path);
-            return u(t, r);
+        const r = o.map((r => {
+            const s = e.require(r.path);
+            return parseLoadedModule(s, r);
         }));
-        return l(r, s, n, t);
+        return registerModules(r, t, o, s);
     }
 }
 
-async function a(r, t, s, n) {
-    const o = [];
-    for (const t of s) {
-        const s = e.pathToFileURL(t.path).toString();
-        o.push(i.As(r.require(s)));
+async function loadEsModules(r, s, t, o) {
+    const n = [];
+    for (const s of t) {
+        const t = e.pathToFileURL(s.path).toString();
+        n.push(i.As(r.require(t)));
     }
-    const c = await Promise.all(o);
-    const a = [];
-    for (let e = 0; e < s.length; e++) {
-        a.push(i.As(u(c[e], s[e])));
+    const a = await Promise.all(n);
+    const c = [];
+    for (let e = 0; e < t.length; e++) {
+        c.push(i.As(parseLoadedModule(a[e], t[e])));
     }
-    return l(a, t, s, n);
+    return registerModules(c, s, t, o);
 }
 
-function u(e, r) {
-    const n = [];
-    if (!e) return n;
-    if (s.isFunction(e)) {
-        n.push({
+function parseLoadedModule(e, r) {
+    const o = [];
+    if (!e) return o;
+    if (t.isFunction(e)) {
+        o.push({
             name: r.name,
             path: r.path,
             value: e,
             opts: r.opts
         });
-        return n;
+        return o;
     }
-    if (e.default && s.isFunction(e.default)) {
-        n.push({
+    if (e.default && t.isFunction(e.default)) {
+        o.push({
             name: r.name,
             path: r.path,
             value: e.default,
@@ -136,8 +136,8 @@ function u(e, r) {
     }
     for (const i of Object.keys(e)) {
         if (i === "default") continue;
-        if (s.isFunction(e[i]) && t.RESOLVER in e[i]) {
-            n.push({
+        if (t.isFunction(e[i]) && s.RESOLVER in e[i]) {
+            o.push({
                 name: i,
                 path: r.path,
                 value: e[i],
@@ -145,17 +145,17 @@ function u(e, r) {
             });
         }
     }
-    return n;
+    return o;
 }
 
-function l(e, r, t, s) {
-    e.reduce(((e, r) => e.concat(r)), []).filter((e => e)).forEach(j.bind(null, r, s));
+function registerModules(e, r, s, t) {
+    e.reduce(((e, r) => e.concat(r)), []).filter((e => e)).forEach(registerDescriptor.bind(null, r, t));
     return {
-        loadedModules: t
+        loadedModules: s
     };
 }
 
-function p(e) {
+function optsWithDefaults(e) {
     return {
         resolverOptions: {
             lifetime: r.Lifetime.TRANSIENT,
@@ -165,34 +165,34 @@ function p(e) {
     };
 }
 
-function j(e, r, n) {
-    const i = n.value[t.RESOLVER];
-    let c = i && i.name;
-    if (!c) {
-        c = n.name;
+function registerDescriptor(e, r, o) {
+    const i = o.value[s.RESOLVER];
+    let a = i && i.name;
+    if (!a) {
+        a = o.name;
         let e = r.formatName;
         if (e) {
             if (typeof e === "string") {
-                e = o[e];
+                e = n[e];
             }
             if (e) {
-                c = e(c, n);
+                a = e(a, o);
             }
         }
     }
-    let a = n.opts;
-    if (typeof a === "string") {
-        a = {
-            lifetime: a
+    let c = o.opts;
+    if (typeof c === "string") {
+        c = {
+            lifetime: c
         };
     }
     const u = {
         ...r.resolverOptions,
-        ...a,
+        ...c,
         ...i
     };
-    const l = u.register ? u.register : s.isClass(n.value) ? t.asClass : t.asFunction;
-    e.register(c, l(n.value, u));
+    const l = u.register ? u.register : t.isClass(o.value) ? s.asClass : s.asFunction;
+    e.register(a, l(o.value, u));
 }
 
-exports.loadModules = c;
+exports.loadModules = loadModules;

package/src/lib/ioc/LoadModules.mjs

@@ -1,14 +1,14 @@
-import { pathToFileURL as t } from "url";
+import { pathToFileURL as e } from "url";
 
-import { Lifetime as e } from "./Lifetime.mjs";
+import { Lifetime as t } from "./Lifetime.mjs";
 
 import { RESOLVER as o, asClass as r, asFunction as s } from "./Resolvers.mjs";
 
-import { isFunction as n, isClass as i } from "./Utils.mjs";
+import { isFunction as i, isClass as n } from "./Utils.mjs";
 
-import { CamelCase as m } from "../base/internal/CamelCase.mjs";
+import { CamelCase as a } from "../base/internal/CamelCase.mjs";
 
-import { As as a } from "../helpers/As.mjs";
+import { As as m } from "../helpers/As.mjs";
 
 import "./Errors.mjs";
 
@@ -83,118 +83,118 @@ const __filename = cjsUrl.fileURLToPath(import.meta.url);
 const __dirname = cjsPath.dirname(__filename);
 const require = cjsModule.createRequire(import.meta.url);
 const p = {
-    camelCase: t => m(t)
+    camelCase: e => a(e)
 };
 
-function c(t, e, o) {
+function loadModules(e, t, o) {
     o ??= {};
-    const r = t.container;
-    o = j(o);
-    const s = t.listModules(e, o);
+    const r = e.container;
+    o = optsWithDefaults(o);
+    const s = e.listModules(t, o);
     if (o.esModules) {
-        return l(t, r, s, o);
+        return loadEsModules(e, r, s, o);
     } else {
-        const e = s.map((e => {
-            const o = t.require(e.path);
-            return u(o, e);
+        const t = s.map((t => {
+            const o = e.require(t.path);
+            return parseLoadedModule(o, t);
         }));
-        return f(e, r, s, o);
+        return registerModules(t, r, s, o);
     }
 }
 
-async function l(e, o, r, s) {
-    const n = [];
+async function loadEsModules(t, o, r, s) {
+    const i = [];
     for (const o of r) {
-        const r = t(o.path).toString();
-        n.push(a(e.require(r)));
+        const r = e(o.path).toString();
+        i.push(m(t.require(r)));
     }
-    const i = await Promise.all(n);
-    const m = [];
-    for (let t = 0; t < r.length; t++) {
-        m.push(a(u(i[t], r[t])));
+    const n = await Promise.all(i);
+    const a = [];
+    for (let e = 0; e < r.length; e++) {
+        a.push(m(parseLoadedModule(n[e], r[e])));
     }
-    return f(m, o, r, s);
+    return registerModules(a, o, r, s);
 }
 
-function u(t, e) {
+function parseLoadedModule(e, t) {
     const r = [];
-    if (!t) return r;
-    if (n(t)) {
+    if (!e) return r;
+    if (i(e)) {
         r.push({
-            name: e.name,
-            path: e.path,
-            value: t,
-            opts: e.opts
+            name: t.name,
+            path: t.path,
+            value: e,
+            opts: t.opts
         });
         return r;
     }
-    if (t.default && n(t.default)) {
+    if (e.default && i(e.default)) {
         r.push({
-            name: e.name,
-            path: e.path,
-            value: t.default,
-            opts: e.opts
+            name: t.name,
+            path: t.path,
+            value: e.default,
+            opts: t.opts
         });
     }
-    for (const s of Object.keys(t)) {
+    for (const s of Object.keys(e)) {
         if (s === "default") continue;
-        if (n(t[s]) && o in t[s]) {
+        if (i(e[s]) && o in e[s]) {
             r.push({
                 name: s,
-                path: e.path,
-                value: t[s],
-                opts: e.opts
+                path: t.path,
+                value: e[s],
+                opts: t.opts
             });
         }
     }
     return r;
 }
 
-function f(t, e, o, r) {
-    t.reduce(((t, e) => t.concat(e)), []).filter((t => t)).forEach(d.bind(null, e, r));
+function registerModules(e, t, o, r) {
+    e.reduce(((e, t) => e.concat(t)), []).filter((e => e)).forEach(registerDescriptor.bind(null, t, r));
     return {
         loadedModules: o
     };
 }
 
-function j(t) {
+function optsWithDefaults(e) {
     return {
         resolverOptions: {
-            lifetime: e.TRANSIENT,
-            ...t && t.resolverOptions
+            lifetime: t.TRANSIENT,
+            ...e && e.resolverOptions
         },
-        ...t
+        ...e
     };
 }
 
-function d(t, e, n) {
-    const m = n.value[o];
-    let a = m && m.name;
-    if (!a) {
-        a = n.name;
-        let t = e.formatName;
-        if (t) {
-            if (typeof t === "string") {
-                t = p[t];
+function registerDescriptor(e, t, i) {
+    const a = i.value[o];
+    let m = a && a.name;
+    if (!m) {
+        m = i.name;
+        let e = t.formatName;
+        if (e) {
+            if (typeof e === "string") {
+                e = p[e];
             }
-            if (t) {
-                a = t(a, n);
+            if (e) {
+                m = e(m, i);
             }
         }
     }
-    let c = n.opts;
-    if (typeof c === "string") {
-        c = {
-            lifetime: c
+    let l = i.opts;
+    if (typeof l === "string") {
+        l = {
+            lifetime: l
         };
     }
-    const l = {
-        ...e.resolverOptions,
-        ...c,
-        ...m
+    const c = {
+        ...t.resolverOptions,
+        ...l,
+        ...a
     };
-    const u = l.register ? l.register : i(n.value) ? r : s;
-    t.register(a, u(n.value, l));
+    const u = c.register ? c.register : n(i.value) ? r : s;
+    e.register(m, u(i.value, c));
 }
 
-export { c as loadModules };
+export { loadModules };

package/src/lib/ioc/ParamParser.cjs

@@ -6,36 +6,36 @@ Object.defineProperty(exports, Symbol.toStringTag, {
 
 const e = require("./FunctionTokenizer.cjs");
 
-function t(t) {
-    const {next: n, done: a} = e.createTokenizer(t);
-    const r = [];
+function parseParameterList(t) {
+    const {next: n, done: r} = e.createTokenizer(t);
+    const a = [];
     let o = null;
-    c();
-    while (!a()) {
+    nextToken();
+    while (!r()) {
         switch (o.type) {
           case "class":
-            s();
-            if (!u()) {
+            skipUntilConstructor();
+            if (!isConstructorToken()) {
                 return null;
             }
-            c();
+            nextToken();
             break;
 
           case "function":
             {
-                const e = c();
+                const e = nextToken();
                 if (e.type === "ident" || e.type === "*") {
-                    c();
+                    nextToken();
                 }
                 break;
             }
 
           case "(":
-            i();
+            parseParams();
             break;
 
           case ")":
-            return r;
+            return a;
 
           case "ident":
             {
@@ -44,27 +44,27 @@ function t(t) {
                     optional: false
                 };
                 if (o.value === "async") {
-                    const e = c();
+                    const e = nextToken();
                     if (e && e.type !== "=") {
                         break;
                     }
                 }
-                r.push(e);
-                return r;
+                a.push(e);
+                return a;
             }
 
           default:
-            throw l();
+            throw unexpected();
         }
     }
-    return r;
-    function i() {
+    return a;
+    function parseParams() {
         let e = {
             name: "",
             optional: false
         };
-        while (!a()) {
-            c();
+        while (!r()) {
+            nextToken();
             switch (o.type) {
               case "ident":
                 e.name = o.value;
@@ -75,7 +75,7 @@ function t(t) {
                 break;
 
               case ",":
-                r.push(e);
+                a.push(e);
                 e = {
                     name: "",
                     optional: false
@@ -84,30 +84,30 @@ function t(t) {
 
               case ")":
                 if (e.name) {
-                    r.push(e);
+                    a.push(e);
                 }
                 return;
 
               default:
-                throw l();
+                throw unexpected();
             }
         }
     }
-    function s() {
-        while (!u() && !a()) {
-            c(e.TokenizerFlags.Dumb);
+    function skipUntilConstructor() {
+        while (!isConstructorToken() && !r()) {
+            nextToken(e.TokenizerFlags.Dumb);
         }
     }
-    function u() {
+    function isConstructorToken() {
         return o.type === "ident" && o.value === "constructor";
     }
-    function c(t = e.TokenizerFlags.None) {
+    function nextToken(t = e.TokenizerFlags.None) {
         o = n(t);
         return o;
     }
-    function l() {
+    function unexpected() {
         return new SyntaxError(`Parsing parameter list, did not expect ${o.type} token${o.value ? ` (${o.value})` : ""}`);
     }
 }
 
-exports.parseParameterList = t;
+exports.parseParameterList = parseParameterList;

package/src/lib/ioc/ParamParser.mjs

@@ -1,67 +1,67 @@
-import { createTokenizer as e, TokenizerFlags as t } from "./FunctionTokenizer.mjs";
+import { createTokenizer as e, TokenizerFlags as n } from "./FunctionTokenizer.mjs";
 
-function n(n) {
-    const {next: a, done: r} = e(n);
-    const o = [];
-    let u = null;
-    l();
-    while (!r()) {
-        switch (u.type) {
+function parseParameterList(t) {
+    const {next: r, done: o} = e(t);
+    const a = [];
+    let s = null;
+    nextToken();
+    while (!o()) {
+        switch (s.type) {
           case "class":
-            c();
-            if (!s()) {
+            skipUntilConstructor();
+            if (!isConstructorToken()) {
                 return null;
             }
-            l();
+            nextToken();
             break;
 
           case "function":
             {
-                const e = l();
+                const e = nextToken();
                 if (e.type === "ident" || e.type === "*") {
-                    l();
+                    nextToken();
                 }
                 break;
             }
 
           case "(":
-            i();
+            parseParams();
             break;
 
           case ")":
-            return o;
+            return a;
 
           case "ident":
             {
                 const e = {
-                    name: u.value,
+                    name: s.value,
                     optional: false
                 };
-                if (u.value === "async") {
-                    const e = l();
+                if (s.value === "async") {
+                    const e = nextToken();
                     if (e && e.type !== "=") {
                         break;
                     }
                 }
-                o.push(e);
-                return o;
+                a.push(e);
+                return a;
             }
 
           default:
-            throw f();
+            throw unexpected();
         }
     }
-    return o;
-    function i() {
+    return a;
+    function parseParams() {
         let e = {
             name: "",
             optional: false
         };
-        while (!r()) {
-            l();
-            switch (u.type) {
+        while (!o()) {
+            nextToken();
+            switch (s.type) {
               case "ident":
-                e.name = u.value;
+                e.name = s.value;
                 break;
 
               case "=":
@@ -69,7 +69,7 @@ function n(n) {
                 break;
 
               case ",":
-                o.push(e);
+                a.push(e);
                 e = {
                     name: "",
                     optional: false
@@ -78,30 +78,30 @@ function n(n) {
 
               case ")":
                 if (e.name) {
-                    o.push(e);
+                    a.push(e);
                 }
                 return;
 
               default:
-                throw f();
+                throw unexpected();
             }
         }
     }
-    function c() {
-        while (!s() && !r()) {
-            l(t.Dumb);
+    function skipUntilConstructor() {
+        while (!isConstructorToken() && !o()) {
+            nextToken(n.Dumb);
         }
     }
-    function s() {
-        return u.type === "ident" && u.value === "constructor";
+    function isConstructorToken() {
+        return s.type === "ident" && s.value === "constructor";
     }
-    function l(e = t.None) {
-        u = a(e);
-        return u;
+    function nextToken(e = n.None) {
+        s = r(e);
+        return s;
     }
-    function f() {
-        return new SyntaxError(`Parsing parameter list, did not expect ${u.type} token${u.value ? ` (${u.value})` : ""}`);
+    function unexpected() {
+        return new SyntaxError(`Parsing parameter list, did not expect ${s.type} token${s.value ? ` (${s.value})` : ""}`);
     }
 }
 
-export { n as parseParameterList };
+export { parseParameterList };