@tsed/components-scan 8.11.1 → 8.11.2-rc.1

package/lib/esm/cleanGlobPatterns.js

@@ -19,4 +19,3 @@ export function cleanGlobPatterns(files, excludes) {
         .map(mapExtensions)
         .map((s) => normalizePath(s));
 }
-//# sourceMappingURL=cleanGlobPatterns.js.map

package/lib/esm/importFiles.js

@@ -12,4 +12,3 @@ export async function importFiles(patterns, exclude) {
     }
     return symbols;
 }
-//# sourceMappingURL=importFiles.js.map

package/lib/esm/importProviders.js

@@ -43,4 +43,3 @@ export async function importProviders(settings) {
     settings.disableComponentsScan = true;
     return settings;
 }
-//# sourceMappingURL=importProviders.js.map

package/lib/esm/index.js

@@ -5,4 +5,3 @@ export * from "./cleanGlobPatterns.js";
 export * from "./importFiles.js";
 export * from "./importProviders.js";
 export * from "./isTsEnv.js";
-//# sourceMappingURL=index.js.map

package/lib/esm/isTsEnv.js

@@ -5,4 +5,3 @@ export function isTsEnv() {
         process.env.JEST_WORKER_ID !== undefined ||
         process.env.NODE_ENV === "test");
 }
-//# sourceMappingURL=isTsEnv.js.map

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/components-scan",
   "description": "Components scan utilities for Ts.ED Framework",
   "type": "module",
-  "version": "8.11.1",
+  "version": "8.11.2-rc.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -23,15 +23,15 @@
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "dependencies": {
-    "@tsed/normalize-path": "8.11.1",
+    "@tsed/normalize-path": "8.11.2-rc.1",
     "globby": "^14.0.2",
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.11.1",
-    "@tsed/core": "8.11.1",
-    "@tsed/di": "8.11.1",
-    "@tsed/typescript": "8.11.1",
+    "@tsed/barrels": "8.11.2-rc.1",
+    "@tsed/core": "8.11.2-rc.1",
+    "@tsed/di": "8.11.2-rc.1",
+    "@tsed/typescript": "8.11.2-rc.1",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
     "vitest": "3.1.4"
@@ -50,5 +50,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/production/packages/third-parties/components-scan",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "rc"
+  }
 }

package/lib/esm/cleanGlobPatterns.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cleanGlobPatterns.js","sourceRoot":"","sources":["../../src/cleanGlobPatterns.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,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,CAAC;QACf,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;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"}

package/lib/esm/importFiles.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importFiles.js","sourceRoot":"","sources":["../../src/importFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAA2B,EAAE,OAAiB;IAC9E,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAExC,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,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,wEAAwE;YACxE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACnC,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;QACpE,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/lib/esm/importProviders.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importProviders.js","sourceRoot":"","sources":["../../src/importProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,eAAe,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAEvD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,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,CAAC;QAC1B,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3B,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/C,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,QAAQ,EAAE,IAAI,KAAK,YAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACrE,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;QACzE,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,QAA6B;IACjE,MAAM,EAAC,OAAO,GAAG,EAAE,EAAE,OAAO,EAAC,GAAG,QAAQ,CAAC;IAEzC,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBACjC,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;YAC9B,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAEtC,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/lib/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC"}

package/lib/esm/isTsEnv.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isTsEnv.js","sourceRoot":"","sources":["../../src/isTsEnv.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO;IACrB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC;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"}

package/src/cleanGlobPatterns.spec.ts

@@ -1,32 +0,0 @@
-import {cleanGlobPatterns} from "./cleanGlobPatterns.js";
-import {isTsEnv} from "./isTsEnv.js";
-
-vi.mock("./isTsEnv");
-
-describe("cleanGlobPatterns()", () => {
-  describe("when haven't typescript compiler", () => {
-    beforeAll(() => {
-      (isTsEnv as any).mockReturnValue(false);
-    });
-
-    it("should return file.js", () => {
-      expect(cleanGlobPatterns("file.ts", ["!**.spec.ts"])[0]).toContain("file.js");
-    });
-
-    it("should return file.ts,js", () => {
-      expect(cleanGlobPatterns("file{.ts,.js}", ["!**.spec.ts"])[0]).toContain("file.js");
-    });
-
-    it("should return file.ts.js and manipulate only the file extension", () => {
-      expect(cleanGlobPatterns("file.ts.ts", ["!**.spec.ts"])[0]).toContain("file.ts.js");
-    });
-  });
-  describe("when have typescript compiler", () => {
-    beforeAll(() => {
-      (isTsEnv as any).mockReturnValue(true);
-    });
-    it("should return file.ts", () => {
-      expect(cleanGlobPatterns("file.ts", ["!**.spec.ts"])[0]).toContain("file.ts");
-    });
-  });
-});

package/src/cleanGlobPatterns.ts

@@ -1,27 +0,0 @@
-// @ts-ignore
-import {resolve} from "node:path";
-
-import {normalizePath} from "@tsed/normalize-path";
-
-import {isTsEnv} from "./isTsEnv.js";
-
-function mapExcludes(excludes: string[]) {
-  return excludes.map((s: string) => `!${s.replace(/!/gi, "")}`);
-}
-
-function mapExtensions(file: string): string {
-  if (!isTsEnv()) {
-    file = file.replace(/\.ts$/i, ".js").replace(/{\.ts,\.js}$/i, ".js");
-  }
-
-  return file;
-}
-
-export function cleanGlobPatterns(files: string | string[], excludes: string[]): string[] {
-  return []
-    .concat(files as never)
-    .map((s: string) => resolve(s))
-    .concat(mapExcludes(excludes) as never)
-    .map(mapExtensions)
-    .map((s: string) => normalizePath(s));
-}

package/src/importFiles.spec.ts

@@ -1,21 +0,0 @@
-import {join} from "node:path";
-
-import {Test1} from "./__mock__/Test1.js";
-import {Test2} from "./__mock__/Test2.js";
-import {importFiles} from "./importFiles.js";
-
-const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build
-
-describe("importFiles", () => {
-  it("should import symbols", async () => {
-    const symbols = await importFiles([join(rootDir, "__mock__/*.ts")], []);
-
-    expect(symbols.sort()).toEqual(["value", Test1, "value", Test2].sort());
-  });
-
-  it("should import symbols without excluded files", async () => {
-    const symbols = await importFiles([join(rootDir, "__mock__/*.ts")], [join(rootDir, "__mock__/Test2.ts")]);
-
-    expect(symbols.sort()).toEqual(["value", Test1].sort());
-  });
-});

package/src/importFiles.ts

@@ -1,18 +0,0 @@
-import {cleanGlobPatterns} from "./cleanGlobPatterns.js";
-
-export async function importFiles(patterns: string | string[], exclude: string[]): Promise<any[]> {
-  const {globby} = await import("globby");
-
-  const files = await globby(cleanGlobPatterns(patterns, exclude));
-  const symbols: any[] = [];
-
-  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
-      const exports = await import(file);
-      Object.keys(exports).forEach((key) => symbols.push(exports[key]));
-    }
-  }
-
-  return symbols;
-}

package/src/importProviders.spec.ts

@@ -1,41 +0,0 @@
-import {nameOf} from "@tsed/core";
-import {resolveControllers} from "@tsed/platform-http";
-
-import {importProviders} from "./importProviders.js";
-
-const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build
-
-describe("importProviders", () => {
-  it("should load providers and merge configuration", async () => {
-    const configuration = {
-      mount: {
-        "/rest": [`${rootDir}/__mock__/controllers/**/*.ts`]
-      },
-      imports: [`${rootDir}/__mock__/**/Module*.ts`]
-    };
-
-    const result = await importProviders(configuration);
-
-    expect(result.imports?.map(nameOf)).toEqual(["Module1", "Module2"]);
-    expect(result.mount!["/rest"].map(nameOf)).toEqual(["TestCtrl"]);
-
-    const result2 = resolveControllers(result);
-
-    const routes = result2.map((item) => ({...item, token: nameOf(item.token)}));
-
-    expect(routes).toEqual([
-      {
-        route: "/m1",
-        token: "M1Ctrl1"
-      },
-      {
-        route: "/mod2",
-        token: "M2Ctrl"
-      },
-      {
-        route: "/rest",
-        token: "TestCtrl"
-      }
-    ]);
-  });
-});

package/src/importProviders.ts

@@ -1,57 +0,0 @@
-import {isArray, isClass, isString} from "@tsed/core";
-import {GlobalProviders, ProviderType} from "@tsed/di";
-
-import {importFiles} from "./importFiles.js";
-
-const lookup = ["imports", "componentsScan", "mount"];
-
-async function resolveRecursively(items: any[], exclude: string[], rootDir: string) {
-  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?.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: Record<string, any>): Promise<Partial<TsED.Configuration>> {
-  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]: [string, any]) => {
-          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;
-}

package/src/index.ts

@@ -1,7 +0,0 @@
-/**
- * @file Automatically generated by @tsed/barrels.
- */
-export * from "./cleanGlobPatterns.js";
-export * from "./importFiles.js";
-export * from "./importProviders.js";
-export * from "./isTsEnv.js";

package/src/isTsEnv.ts

@@ -1,9 +0,0 @@
-export function isTsEnv() {
-  return (
-    process.env["TS_NODE_DEV"] ||
-    process.env["_"]?.includes("ts-node") ||
-    process.env["TS_TEST"] ||
-    process.env.JEST_WORKER_ID !== undefined ||
-    process.env.NODE_ENV === "test"
-  );
-}

package/vitest.config.mts

@@ -1,26 +0,0 @@
-// @ts-ignore
-import {presets} from "@tsed/vitest/presets";
-import {defineConfig} from "vitest/config";
-
-export default defineConfig(
-  {
-    ...presets,
-    test: {
-      ...presets.test,
-      coverage: {
-        ...presets.test.coverage,
-        exclude: [
-          ...presets.test.coverage.exclude,
-          "**/isTsEnv.ts"
-        ],
-        thresholds: {
-          statements: 0,
-          branches: 0,
-          functions: 0,
-          lines: 0,
-
-        }
-      }
-    }
-  }
-);