@tsed/components-scan 7.0.0-alpha.2 → 7.0.0-beta.11

package/lib/esm/__mock__/module2/Module2.js

@@ -0,0 +1,15 @@
+import { __decorate } from "tslib";
+import { Module } from "@tsed/di";
+import { M2Ctrl } from "./controllers/M2Ctrl.js";
+let Module2 = class Module2 {
+};
+Module2 = __decorate([
+    Module({
+        mount: {
+            "/mod2": [M2Ctrl]
+        },
+        imports: []
+    })
+], Module2);
+export { Module2 };
+//# sourceMappingURL=Module2.js.map

package/lib/esm/__mock__/module2/Module2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Module2.js","sourceRoot":"","sources":["../../../../src/__mock__/module2/Module2.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAQ5C,IAAa,OAAO,GAApB,MAAa,OAAO;CAAG,CAAA;AAAV,OAAO;IANnB,MAAM,CAAC;QACN,KAAK,EAAE;YACL,OAAO,EAAE,CAAC,MAAM,CAAC;SAClB;QACD,OAAO,EAAE,EAAE;KACZ,CAAC;GACW,OAAO,CAAG;SAAV,OAAO","sourcesContent":["import {Module} from \"@tsed/di\";\nimport {M2Ctrl} from \"./controllers/M2Ctrl\";\n\n@Module({\n  mount: {\n    \"/mod2\": [M2Ctrl]\n  },\n  imports: []\n})\nexport class Module2 {}\n"]}

package/lib/esm/__mock__/module2/controllers/M2Ctrl.js

@@ -0,0 +1,9 @@
+import { __decorate } from "tslib";
+import { Controller } from "@tsed/di";
+let M2Ctrl = class M2Ctrl {
+};
+M2Ctrl = __decorate([
+    Controller("/m2")
+], M2Ctrl);
+export { M2Ctrl };
+//# sourceMappingURL=M2Ctrl.js.map

package/lib/esm/__mock__/module2/controllers/M2Ctrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"M2Ctrl.js","sourceRoot":"","sources":["../../../../../src/__mock__/module2/controllers/M2Ctrl.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAGpC,IAAa,MAAM,GAAnB,MAAa,MAAM;CAAG,CAAA;AAAT,MAAM;IADlB,UAAU,CAAC,KAAK,CAAC;GACL,MAAM,CAAG;SAAT,MAAM","sourcesContent":["import {Controller} from \"@tsed/di\";\n\n@Controller(\"/m2\")\nexport class M2Ctrl {}\n"]}

package/lib/esm/cleanGlobPatterns.js

@@ -0,0 +1,21 @@
+import { resolve } from "path";
+import { isTsEnv } from "./isTsEnv.js";
+import { normalizePath } from "./normalizePath.js";
+function mapExcludes(excludes) {
+    return excludes.map((s) => `!${s.replace(/!/gi, "")}`);
+}
+function mapExtensions(file) {
+    if (!isTsEnv()) {
+        file = file.replace(/\.ts$/i, ".js").replace(/{\.ts,\.js}$/i, ".js");
+    }
+    return file;
+}
+export function cleanGlobPatterns(files, excludes) {
+    return []
+        .concat(files)
+        .map((s) => resolve(s))
+        .concat(mapExcludes(excludes))
+        .map(mapExtensions)
+        .map((s) => normalizePath(s));
+}
+//# sourceMappingURL=cleanGlobPatterns.js.map

package/lib/esm/cleanGlobPatterns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanGlobPatterns.js","sourceRoot":"","sources":["../../src/cleanGlobPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,SAAS,WAAW,CAAC,QAAkB;IACrC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,IAAI,CAAC,OAAO,EAAE,EAAE;QACd,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;KACtE;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAwB,EAAE,QAAkB;IAC5E,OAAO,EAAE;SACN,MAAM,CAAC,KAAc,CAAC;SACtB,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC9B,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAU,CAAC;SACtC,GAAG,CAAC,aAAa,CAAC;SAClB,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["import {resolve} from \"path\";\nimport {isTsEnv} from \"./isTsEnv\";\nimport {normalizePath} from \"./normalizePath\";\n\nfunction mapExcludes(excludes: string[]) {\n  return excludes.map((s: string) => `!${s.replace(/!/gi, \"\")}`);\n}\n\nfunction mapExtensions(file: string): string {\n  if (!isTsEnv()) {\n    file = file.replace(/\\.ts$/i, \".js\").replace(/{\\.ts,\\.js}$/i, \".js\");\n  }\n\n  return file;\n}\n\nexport function cleanGlobPatterns(files: string | string[], excludes: string[]): string[] {\n  return []\n    .concat(files as never)\n    .map((s: string) => resolve(s))\n    .concat(mapExcludes(excludes) as never)\n    .map(mapExtensions)\n    .map((s: string) => normalizePath(s));\n}\n"]}

package/lib/esm/importComponents.js

@@ -0,0 +1,54 @@
+import { isArray, isClass } from "@tsed/core";
+import { importFiles } from "./importFiles.js";
+/**
+ * @deprecated
+ */
+async function resolveSymbols(item, excludes, disableComponentsScan = false) {
+    if (isClass(item)) {
+        return [item];
+    }
+    /* istanbul ignore else */
+    if (!disableComponentsScan) {
+        return importFiles(item, excludes);
+    }
+    /* istanbul ignore next */
+    return [];
+}
+/**
+ * @deprecated
+ */
+export function mapConfiguration(config) {
+    if (isArray(config)) {
+        return config.map((value) => {
+            return {
+                values: [].concat(value)
+            };
+        });
+    }
+    return Object.keys(config).reduce((list, key) => {
+        list.push({
+            endpoint: key,
+            values: [].concat(config[key])
+        });
+        return list;
+    }, []);
+}
+/**
+ * @deprecated
+ */
+export async function importComponents(config, excludes, disableComponentsScan = false) {
+    if (!config) {
+        return [];
+    }
+    config = mapConfiguration(config);
+    const promises = [];
+    for (const option of config) {
+        promises.push(...option.values.map(async (value) => {
+            const symbols = await resolveSymbols(value, excludes, disableComponentsScan);
+            return symbols.filter(isClass).map((symbol) => ({ token: symbol, route: option.endpoint }));
+        }));
+    }
+    const result = await Promise.all(promises);
+    return result.flat();
+}
+//# sourceMappingURL=importComponents.js.map

package/lib/esm/importComponents.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importComponents.js","sourceRoot":"","sources":["../../src/importComponents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C;;GAEG;AACH,KAAK,UAAU,cAAc,CAAC,IAAS,EAAE,QAAkB,EAAE,qBAAqB,GAAG,KAAK;IACxF,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IACD,0BAA0B;IAC1B,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KACpC;IAED,0BAA0B;IAC1B,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAW;IAC1C,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;YAC/B,OAAO;gBACL,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;aACzB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAW,EAAE,GAAW,EAAE,EAAE;QAC7D,IAAI,CAAC,IAAI,CAAC;YACR,QAAQ,EAAE,GAAG;YACb,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAW,EACX,QAAkB,EAClB,qBAAqB,GAAG,KAAK;IAE7B,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IAED,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAQ,EAAE,CAAC;IAEzB,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE;QAC3B,QAAQ,CAAC,IAAI,CACX,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAU,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YAE7E,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QAC5F,CAAC,CAAC,CACH,CAAC;KACH;IAED,MAAM,MAAM,GAAwC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEhF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC","sourcesContent":["import {isArray, isClass} from \"@tsed/core\";\nimport {importFiles} from \"./importFiles\";\n\n/**\n * @deprecated\n */\nasync function resolveSymbols(item: any, excludes: string[], disableComponentsScan = false) {\n  if (isClass(item)) {\n    return [item];\n  }\n  /* istanbul ignore else */\n  if (!disableComponentsScan) {\n    return importFiles(item, excludes);\n  }\n\n  /* istanbul ignore next */\n  return [];\n}\n\n/**\n * @deprecated\n */\nexport function mapConfiguration(config: any): {endpoint?: string; values: any[]}[] {\n  if (isArray(config)) {\n    return config.map((value: any) => {\n      return {\n        values: [].concat(value)\n      };\n    });\n  }\n\n  return Object.keys(config).reduce((list: any[], key: string) => {\n    list.push({\n      endpoint: key,\n      values: [].concat(config[key])\n    });\n\n    return list;\n  }, []);\n}\n\n/**\n * @deprecated\n */\nexport async function importComponents(\n  config: any,\n  excludes: string[],\n  disableComponentsScan = false\n): Promise<{token: string; route?: string}[]> {\n  if (!config) {\n    return [];\n  }\n\n  config = mapConfiguration(config);\n\n  const promises: any = [];\n\n  for (const option of config) {\n    promises.push(\n      ...option.values.map(async (value: any) => {\n        const symbols = await resolveSymbols(value, excludes, disableComponentsScan);\n\n        return symbols.filter(isClass).map((symbol) => ({token: symbol, route: option.endpoint}));\n      })\n    );\n  }\n\n  const result: {token: string; route?: string}[][] = await Promise.all(promises);\n\n  return result.flat();\n}\n"]}

package/lib/esm/importFiles.js

@@ -0,0 +1,24 @@
+import { importPackage } from "@tsed/core";
+import { cleanGlobPatterns } from "./cleanGlobPatterns.js";
+export async function importFiles(patterns, exclude) {
+    const { default: globby } = await import("globby");
+    const files = await globby(cleanGlobPatterns(patterns, exclude));
+    const symbols = [];
+    for (const file of files.sort((a, b) => (a < b ? -1 : 1))) {
+        if (!file.endsWith(".d.ts")) {
+            // prevent .d.ts import if the global pattern isn't correctly configured
+            try {
+                const exports = await importPackage(file);
+                Object.keys(exports).forEach((key) => symbols.push(exports[key]));
+            }
+            catch (er) {
+                // istanbul ignore next
+                console.error(er);
+                // istanbul ignore next
+                process.exit(1);
+            }
+        }
+    }
+    return symbols;
+}
+//# sourceMappingURL=importFiles.js.map

package/lib/esm/importFiles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importFiles.js","sourceRoot":"","sources":["../../src/importFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAA2B,EAAE,OAAiB;IAC9E,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAU,EAAE,CAAC;IAE1B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QACzD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC3B,wEAAwE;YACxE,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACnE;YAAC,OAAO,EAAE,EAAE;gBACX,uBAAuB;gBACvB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAClB,uBAAuB;gBACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import {importPackage} from \"@tsed/core\";\nimport {cleanGlobPatterns} from \"./cleanGlobPatterns\";\n\nexport async function importFiles(patterns: string | string[], exclude: string[]): Promise<any[]> {\n  const {default: globby} = await import(\"globby\");\n\n  const files = await globby(cleanGlobPatterns(patterns, exclude));\n  const symbols: any[] = [];\n\n  for (const file of files.sort((a, b) => (a < b ? -1 : 1))) {\n    if (!file.endsWith(\".d.ts\")) {\n      // prevent .d.ts import if the global pattern isn't correctly configured\n      try {\n        const exports = await importPackage(file);\n        Object.keys(exports).forEach((key) => symbols.push(exports[key]));\n      } catch (er) {\n        // istanbul ignore next\n        console.error(er);\n        // istanbul ignore next\n        process.exit(1);\n      }\n    }\n  }\n\n  return symbols;\n}\n"]}

package/lib/esm/importProviders.js

@@ -0,0 +1,46 @@
+import { GlobalProviders, ProviderType } from "@tsed/di";
+import { isArray, isClass, isString } from "@tsed/core";
+import { importFiles } from "./importFiles.js";
+const lookup = ["imports", "componentsScan", "mount"];
+async function resolveRecursively(items, exclude, rootDir) {
+    for (const index in items) {
+        if (isString(items[index])) {
+            items[index] = await importFiles(items[index].replace("${rootDir}", rootDir), exclude);
+        }
+    }
+    const providers = items.flat().filter(isClass);
+    for (const token of providers) {
+        const provider = GlobalProviders.get(token);
+        if ((provider === null || provider === void 0 ? void 0 : provider.type) === ProviderType.MODULE && provider.configuration) {
+            provider.configuration.exclude = exclude;
+            provider.configuration.rootDir = provider.configuration.rootDir || rootDir;
+            provider.configuration = await importProviders(provider.configuration);
+        }
+    }
+    return providers;
+}
+/**
+ * Lookup settings and replace glob pattern by the resolved providers
+ *
+ * @param settings
+ */
+export async function importProviders(settings) {
+    const { exclude = [], rootDir } = settings;
+    for (const property of lookup) {
+        if (settings[property]) {
+            if (!isArray(settings[property])) {
+                const current = settings[property];
+                const promises = Object.entries(current).map(async ([key, items]) => {
+                    current[key] = await resolveRecursively([].concat(items), exclude, rootDir);
+                });
+                await Promise.all(promises);
+            }
+            else {
+                settings[property] = await resolveRecursively(settings[property], exclude, rootDir);
+            }
+        }
+    }
+    settings.disableComponentsScan = true;
+    return settings;
+}
+//# sourceMappingURL=importProviders.js.map

package/lib/esm/importProviders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importProviders.js","sourceRoot":"","sources":["../../src/importProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACvD,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;AAEtD,KAAK,UAAU,kBAAkB,CAAC,KAAY,EAAE,OAAiB,EAAE,OAAe;IAChF,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE;QACzB,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;YAC1B,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;SACxF;KACF;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/C,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;QAC7B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,YAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE;YACpE,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG,OAAO,CAAC;YACzC,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,IAAI,OAAO,CAAC;YAE3E,QAAQ,CAAC,aAAa,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;SACxE;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,QAAqC;IACzE,MAAM,EAAC,OAAO,GAAG,EAAE,EAAE,OAAO,EAAC,GAAG,QAAQ,CAAC;IAEzC,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE;QAC7B,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAgB,EAAE,EAAE;oBACjF,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC9E,CAAC,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC7B;iBAAM;gBACL,QAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aACrF;SACF;KACF;IAED,QAAQ,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAEtC,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {GlobalProviders, ProviderType} from \"@tsed/di\";\nimport {isArray, isClass, isString} from \"@tsed/core\";\nimport {importFiles} from \"./importFiles\";\n\nconst lookup = [\"imports\", \"componentsScan\", \"mount\"];\n\nasync function resolveRecursively(items: any[], exclude: string[], rootDir: string) {\n  for (const index in items) {\n    if (isString(items[index])) {\n      items[index] = await importFiles(items[index].replace(\"${rootDir}\", rootDir), exclude);\n    }\n  }\n\n  const providers = items.flat().filter(isClass);\n\n  for (const token of providers) {\n    const provider = GlobalProviders.get(token);\n\n    if (provider?.type === ProviderType.MODULE && provider.configuration) {\n      provider.configuration.exclude = exclude;\n      provider.configuration.rootDir = provider.configuration.rootDir || rootDir;\n\n      provider.configuration = await importProviders(provider.configuration);\n    }\n  }\n\n  return providers;\n}\n\n/**\n * Lookup settings and replace glob pattern by the resolved providers\n *\n * @param settings\n */\nexport async function importProviders(settings: Partial<TsED.Configuration>): Promise<Partial<TsED.Configuration>> {\n  const {exclude = [], rootDir} = settings;\n\n  for (const property of lookup) {\n    if (settings[property]) {\n      if (!isArray(settings[property])) {\n        const current = settings[property];\n        const promises = Object.entries(current).map(async ([key, items]: [string, any]) => {\n          current[key] = await resolveRecursively([].concat(items), exclude, rootDir);\n        });\n\n        await Promise.all(promises);\n      } else {\n        settings[property] = await resolveRecursively(settings[property], exclude, rootDir);\n      }\n    }\n  }\n\n  settings.disableComponentsScan = true;\n\n  return settings;\n}\n"]}

package/lib/esm/index.js

@@ -0,0 +1,10 @@
+/**
+ * @file Automatically generated by barrelsby.
+ */
+export * from "./cleanGlobPatterns.js";
+export * from "./importComponents.js";
+export * from "./importFiles.js";
+export * from "./importProviders.js";
+export * from "./isTsEnv.js";
+export * from "./normalizePath.js";
+//# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./cleanGlobPatterns\";\nexport * from \"./importComponents\";\nexport * from \"./importFiles\";\nexport * from \"./importProviders\";\nexport * from \"./isTsEnv\";\nexport * from \"./normalizePath\";\n"]}

package/lib/esm/isTsEnv.js

@@ -0,0 +1,15 @@
+export function isTsEnv() {
+    var _a;
+    try {
+        if (require && require.extensions && require.extensions[".ts"]) {
+            return true;
+        }
+    }
+    catch (er) { }
+    return (process.env["TS_NODE_DEV"] ||
+        ((_a = process.env["_"]) === null || _a === void 0 ? void 0 : _a.includes("ts-node")) ||
+        process.env["TS_TEST"] ||
+        process.env.JEST_WORKER_ID !== undefined ||
+        process.env.NODE_ENV === "test");
+}
+//# sourceMappingURL=isTsEnv.js.map

package/lib/esm/isTsEnv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isTsEnv.js","sourceRoot":"","sources":["../../src/isTsEnv.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO;;IACrB,IAAI;QACF,IAAI,OAAO,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9D,OAAO,IAAI,CAAC;SACb;KACF;IAAC,OAAO,EAAE,EAAE,GAAE;IACf,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;SAC1B,MAAA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;QACrC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS;QACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAChC,CAAC;AACJ,CAAC","sourcesContent":["export function isTsEnv() {\n  try {\n    if (require && require.extensions && require.extensions[\".ts\"]) {\n      return true;\n    }\n  } catch (er) {}\n  return (\n    process.env[\"TS_NODE_DEV\"] ||\n    process.env[\"_\"]?.includes(\"ts-node\") ||\n    process.env[\"TS_TEST\"] ||\n    process.env.JEST_WORKER_ID !== undefined ||\n    process.env.NODE_ENV === \"test\"\n  );\n}\n"]}

package/lib/esm/normalizePath.js

@@ -0,0 +1,14 @@
+import { isArray, isString } from "@tsed/core";
+import { join } from "path";
+import fixPath from "normalize-path";
+export function normalizePath(item, ...paths) {
+    if (isString(item)) {
+        const path = join(item, ...paths);
+        return fixPath(path);
+    }
+    if (isArray(item)) {
+        return item.map((item) => normalizePath(item));
+    }
+    return item;
+}
+//# sourceMappingURL=normalizePath.js.map

package/lib/esm/normalizePath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizePath.js","sourceRoot":"","sources":["../../src/normalizePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAIrC,MAAM,UAAU,aAAa,CAAC,IAAS,EAAE,GAAG,KAAe;IACzD,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;KACtB;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;KACrD;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import {isArray, isString} from \"@tsed/core\";\nimport {join} from \"path\";\nimport fixPath from \"normalize-path\";\n\nexport function normalizePath(item: string, ...paths: string[]): string;\nexport function normalizePath(item: (string | any)[]): (string | any)[];\nexport function normalizePath(item: any, ...paths: string[]) {\n  if (isString(item)) {\n    const path = join(item, ...paths);\n    return fixPath(path);\n  }\n\n  if (isArray(item)) {\n    return item.map((item: any) => normalizePath(item));\n  }\n\n  return item;\n}\n"]}

package/lib/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/lib/types/__mock__/Test1.d.ts

@@ -0,0 +1,3 @@
+export declare const value1 = "value";
+export declare class Test1 {
+}

package/lib/types/__mock__/Test2.d.ts

@@ -0,0 +1,3 @@
+export declare const value2 = "value";
+export declare class Test2 {
+}

package/lib/types/__mock__/controllers/rest/TestCtrl.d.ts

@@ -0,0 +1,2 @@
+export declare class TestCtrl {
+}

package/lib/types/__mock__/module1/Module1.d.ts

@@ -0,0 +1,2 @@
+export declare class Module1 {
+}

package/lib/types/__mock__/module1/controllers/M1Ctrl1.d.ts

@@ -0,0 +1,5 @@
+import { M1Service } from "../services/M1Service";
+export declare class M1Ctrl1 {
+    service: M1Service;
+    constructor(service: M1Service);
+}

package/lib/types/__mock__/module1/services/M1Service.d.ts

@@ -0,0 +1,5 @@
+import { SubService } from "../submodule/SubService";
+export declare class M1Service {
+    subService: SubService;
+    constructor(subService: SubService);
+}

package/lib/types/__mock__/module1/submodule/SubModule.d.ts

@@ -0,0 +1,2 @@
+export declare class SubModule {
+}

package/lib/types/__mock__/module1/submodule/SubService.d.ts

@@ -0,0 +1,2 @@
+export declare class SubService {
+}

package/lib/types/__mock__/module2/Module2.d.ts

@@ -0,0 +1,2 @@
+export declare class Module2 {
+}

package/lib/types/__mock__/module2/controllers/M2Ctrl.d.ts

@@ -0,0 +1,2 @@
+export declare class M2Ctrl {
+}

package/lib/{importComponents.d.ts → types/importComponents.d.ts}

@@ -1,8 +1,14 @@
+/**
+ * @deprecated
+ */
 export declare function mapConfiguration(config: any): {
     endpoint?: string;
     values: any[];
 }[];
-export declare function importComponents(config: any, excludes: string[]): Promise<{
+/**
+ * @deprecated
+ */
+export declare function importComponents(config: any, excludes: string[], disableComponentsScan?: boolean): Promise<{
     token: string;
     route?: string;
 }[]>;

package/lib/types/importProviders.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Lookup settings and replace glob pattern by the resolved providers
+ *
+ * @param settings
+ */
+export declare function importProviders(settings: Partial<TsED.Configuration>): Promise<Partial<TsED.Configuration>>;

package/lib/{index.d.ts → types/index.d.ts}

@@ -1,5 +1,9 @@
-export * from "./importFiles";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+export * from "./cleanGlobPatterns";
 export * from "./importComponents";
+export * from "./importFiles";
 export * from "./importProviders";
-export * from "./cleanGlobPatterns";
+export * from "./isTsEnv";
 export * from "./normalizePath";

package/lib/types/isTsEnv.d.ts

@@ -0,0 +1 @@
+export declare function isTsEnv(): string | boolean;

package/package.json

@@ -1,40 +1,41 @@
 {
   "name": "@tsed/components-scan",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-beta.11",
   "description": "Components scan utilities for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
+  "typings": "./lib/types/index.d.ts",
   "exports": {
-    "require": "./lib/index.js",
-    "default": "./lib/index.modern.js"
+    "types": "./lib/types/index.d.ts",
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js",
+    "default": "./lib/esm/index.js"
   },
   "scripts": {
-    "build": "microbundle --target node --no-compress --format modern,cjs --tsconfig ./tsconfig.compile.json",
+    "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
+    "build:cjs": "tsc --build tsconfig.compile.json",
+    "build:esm": "tsc --build tsconfig.compile.esm.json",
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
     "test": "cross-env NODE_ENV=test jest"
   },
   "dependencies": {
-    "@tsed/core": "7.0.0-alpha.2",
-    "@tsed/di": "7.0.0-alpha.2",
     "globby": "11.0.3",
     "normalize-path": "3.0.0",
-    "tslib": "2.2.0"
+    "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@tsed/logger": "^5.16.0"
-  },
-  "peerDependencies": {
-    "@tsed/logger": "^5.16.0"
+    "@tsed/core": "7.0.0-beta.11",
+    "@tsed/di": "7.0.0-beta.11",
+    "@types/normalize-path": "^3.0.0"
   },
+  "peerDependencies": {},
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/utils/components-scan",
+  "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/third-parties/components-scan",
   "author": "Romain Lenzotti",
-  "license": "MIT",
-  "publishConfig": {
-    "tag": "alpha"
-  }
+  "license": "MIT"
 }

package/readme.md

@@ -35,14 +35,12 @@ A package of Ts.ED framework. See website: https://tsed.io/
 npm install --save @tsed/components-scan
 ```
 
-
 ## Backers
 
 Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/tsed#backer)]
 
 <a href="https://opencollective.com/tsed#backers" target="_blank"><img src="https://opencollective.com/tsed/tiers/backer.svg?width=890"></a>
 
-
 ## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]

package/tsconfig.compile.esm.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.compile.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "module": "ES2020",
+    "rootDir": "src",
+    "outDir": "./lib/esm",
+    "declaration": true,
+    "declarationDir": "./lib/types"
+  },
+  "exclude": ["node_modules", "test", "lib", "benchmark", "coverage", "spec", "**/*.benchmark.ts", "**/*.spec.ts", "keys", "jest.config.js"]
+}

package/lib/importProviders.d.ts

@@ -1,10 +0,0 @@
-/**
- * Import providers from given patterns.
- *
- * @param settings
- * @param properties
- */
-export declare function importProviders(settings: Partial<TsED.Configuration>, properties?: string[]): Promise<{
-    token: string;
-    route?: string;
-}[]>;