@tsed/common 7.0.0-beta.10 → 7.0.0-beta.11

package/lib/types/config/services/PlatformConfiguration.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
 import { Env, getHostInfoFromPort } from "@tsed/core";
-import { DIConfiguration } from "@tsed/di";
+import { DIConfiguration, TokenProvider } from "@tsed/di";
 import Https from "https";
 import { ConverterSettings } from "../interfaces/ConverterSettings";
-import { EndpointDirectoriesSettings } from "../interfaces/EndpointDirectoriesSettings";
 import { PlatformLoggerSettings } from "../interfaces/PlatformLoggerSettings";
 /**
  * `PlatformConfiguration` contains all information about your Server configuration.
@@ -24,12 +23,18 @@ export declare class PlatformConfiguration extends DIConfiguration {
     set httpsPort(value: string | number | false);
     get env(): Env;
     set env(value: Env);
-    get mount(): EndpointDirectoriesSettings;
-    set mount(value: EndpointDirectoriesSettings);
+    get mount(): Record<string, TokenProvider[]>;
+    set mount(value: Record<string, TokenProvider[]>);
+    /**
+     * @deprecated
+     */
     get componentsScan(): string[];
+    /**
+     * @deprecated
+     */
     set componentsScan(value: string[]);
-    get statics(): EndpointDirectoriesSettings;
-    set statics(value: EndpointDirectoriesSettings);
+    get statics(): Record<string, (any | string)[]>;
+    set statics(value: Record<string, (any | string)[]>);
     get acceptMimes(): string[];
     set acceptMimes(value: string[]);
     get debug(): boolean;

package/lib/types/index.d.ts

@@ -5,7 +5,6 @@ export * from "./exports";
 export * from "./builder/PlatformBuilder";
 export * from "./builder/PlatformControllerBuilder";
 export * from "./config/interfaces/ConverterSettings";
-export * from "./config/interfaces/EndpointDirectoriesSettings";
 export * from "./config/interfaces/PlatformLoggerSettings";
 export * from "./config/interfaces/PlatformMulterSettings";
 export * from "./config/interfaces/PlatformStaticsSettings";
@@ -58,7 +57,6 @@ export * from "./utils/createHttpServer";
 export * from "./utils/createHttpsServer";
 export * from "./utils/createInjector";
 export * from "./utils/getStaticsOptions";
-export * from "./utils/importProviders";
 export * from "./utils/listenServer";
 export * from "./utils/mapReturnedResponse";
 export * from "./utils/printRoutes";

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

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

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

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

package/lib/types/utils/__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/utils/__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/utils/__mock__/module1/submodule/SubModule.d.ts

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

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/common",
-  "version": "7.0.0-beta.10",
+  "version": "7.0.0-beta.11",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
@@ -61,22 +61,22 @@
     }
   ],
   "dependencies": {
-    "@tsed/components-scan": "7.0.0-beta.10",
-    "@tsed/core": "7.0.0-beta.10",
-    "@tsed/di": "7.0.0-beta.10",
-    "@tsed/exceptions": "7.0.0-beta.10",
-    "@tsed/json-mapper": "7.0.0-beta.10",
+    "@tsed/components-scan": "7.0.0-beta.11",
+    "@tsed/core": "7.0.0-beta.11",
+    "@tsed/di": "7.0.0-beta.11",
+    "@tsed/exceptions": "7.0.0-beta.11",
+    "@tsed/json-mapper": "7.0.0-beta.11",
     "@tsed/logger": ">=6.1.1",
     "@tsed/logger-file": ">=6.1.0",
-    "@tsed/perf": "7.0.0-beta.10",
-    "@tsed/platform-cache": "7.0.0-beta.10",
-    "@tsed/platform-exceptions": "7.0.0-beta.10",
-    "@tsed/platform-log-middleware": "7.0.0-beta.10",
-    "@tsed/platform-middlewares": "7.0.0-beta.10",
-    "@tsed/platform-params": "7.0.0-beta.10",
-    "@tsed/platform-response-filter": "7.0.0-beta.10",
-    "@tsed/platform-views": "7.0.0-beta.10",
-    "@tsed/schema": "7.0.0-beta.10",
+    "@tsed/perf": "7.0.0-beta.11",
+    "@tsed/platform-cache": "7.0.0-beta.11",
+    "@tsed/platform-exceptions": "7.0.0-beta.11",
+    "@tsed/platform-log-middleware": "7.0.0-beta.11",
+    "@tsed/platform-middlewares": "7.0.0-beta.11",
+    "@tsed/platform-params": "7.0.0-beta.11",
+    "@tsed/platform-response-filter": "7.0.0-beta.11",
+    "@tsed/platform-views": "7.0.0-beta.11",
+    "@tsed/schema": "7.0.0-beta.11",
     "@types/json-schema": "7.0.11",
     "@types/on-finished": "2.3.1",
     "on-finished": "2.4.1",

package/lib/cjs/config/interfaces/EndpointDirectoriesSettings.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=EndpointDirectoriesSettings.js.map

package/lib/cjs/config/interfaces/EndpointDirectoriesSettings.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EndpointDirectoriesSettings.js","sourceRoot":"","sources":["../../../../src/config/interfaces/EndpointDirectoriesSettings.ts"],"names":[],"mappings":"","sourcesContent":["export interface EndpointDirectoriesSettings {\n  [endpoint: string]: any | string | (any | string)[];\n}\n"]}

package/lib/cjs/utils/importProviders.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.importProviders = void 0;
-const di_1 = require("@tsed/di");
-const components_scan_1 = require("@tsed/components-scan");
-async function recursiveImports(providers, settings, properties) {
-    const { exclude = [] } = settings;
-    const promises = providers
-        .map(({ token }) => di_1.GlobalProviders.get(token))
-        .filter((provider) => (provider === null || provider === void 0 ? void 0 : provider.type) === di_1.ProviderType.MODULE && provider.configuration)
-        .map((provider) => importProviders({ exclude, ...provider.configuration }, properties));
-    return (await Promise.all(promises)).flat();
-}
-/**
- * Import providers from given patterns.
- *
- * @param settings
- * @param properties
- */
-async function importProviders(settings, properties = ["imports"]) {
-    const { exclude = [] } = settings;
-    const disableComponentsScan = settings.disableComponentsScan || !!process.env.WEBPACK;
-    const promises = properties.map((key) => (0, components_scan_1.importComponents)(settings[key], exclude, disableComponentsScan));
-    const providers = (await Promise.all(promises)).flat();
-    const children = await recursiveImports(providers, settings, properties);
-    return [...children, ...providers];
-}
-exports.importProviders = importProviders;
-//# sourceMappingURL=importProviders.js.map

package/lib/cjs/utils/importProviders.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importProviders.js","sourceRoot":"","sources":["../../../src/utils/importProviders.ts"],"names":[],"mappings":";;;AAAA,iCAAiE;AACjE,2DAAuD;AAEvD,KAAK,UAAU,gBAAgB,CAAC,SAA4C,EAAE,QAAqC,EAAE,UAAoB;IACvI,MAAM,EAAC,OAAO,GAAG,EAAE,EAAC,GAAG,QAAQ,CAAC;IAEhC,MAAM,QAAQ,GAAG,SAAS;SACvB,GAAG,CAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,oBAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC5C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,iBAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,CAAC;SACtF,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,eAAe,CAAC,EAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,aAAa,EAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IAElG,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,QAAqC,EACrC,aAAuB,CAAC,SAAS,CAAC;IAElC,MAAM,EAAC,OAAO,GAAG,EAAE,EAAC,GAAG,QAAQ,CAAC;IAChC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAEtF,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kCAAgB,EAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEzE,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,CAAC;AACrC,CAAC;AAZD,0CAYC","sourcesContent":["import {GlobalProviders, Provider, ProviderType} from \"@tsed/di\";\nimport {importComponents} from \"@tsed/components-scan\";\n\nasync function recursiveImports(providers: {token: string; route?: string}[], settings: Partial<TsED.Configuration>, properties: string[]) {\n  const {exclude = []} = settings;\n\n  const promises = providers\n    .map(({token}) => GlobalProviders.get(token))\n    .filter((provider) => provider?.type === ProviderType.MODULE && provider.configuration)\n    .map((provider: Provider) => importProviders({exclude, ...provider.configuration}, properties));\n\n  return (await Promise.all(promises)).flat();\n}\n\n/**\n * Import providers from given patterns.\n *\n * @param settings\n * @param properties\n */\nexport async function importProviders(\n  settings: Partial<TsED.Configuration>,\n  properties: string[] = [\"imports\"]\n): Promise<{token: string; route?: string}[]> {\n  const {exclude = []} = settings;\n  const disableComponentsScan = settings.disableComponentsScan || !!process.env.WEBPACK;\n\n  const promises = properties.map((key) => importComponents(settings[key], exclude, disableComponentsScan));\n  const providers = (await Promise.all(promises)).flat();\n  const children = await recursiveImports(providers, settings, properties);\n\n  return [...children, ...providers];\n}\n"]}

package/lib/esm/config/interfaces/EndpointDirectoriesSettings.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=EndpointDirectoriesSettings.js.map

package/lib/esm/config/interfaces/EndpointDirectoriesSettings.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EndpointDirectoriesSettings.js","sourceRoot":"","sources":["../../../../src/config/interfaces/EndpointDirectoriesSettings.ts"],"names":[],"mappings":"","sourcesContent":["export interface EndpointDirectoriesSettings {\n  [endpoint: string]: any | string | (any | string)[];\n}\n"]}

package/lib/esm/utils/importProviders.js

@@ -1,25 +0,0 @@
-import { GlobalProviders, ProviderType } from "@tsed/di";
-import { importComponents } from "@tsed/components-scan";
-async function recursiveImports(providers, settings, properties) {
-    const { exclude = [] } = settings;
-    const promises = providers
-        .map(({ token }) => GlobalProviders.get(token))
-        .filter((provider) => (provider === null || provider === void 0 ? void 0 : provider.type) === ProviderType.MODULE && provider.configuration)
-        .map((provider) => importProviders({ exclude, ...provider.configuration }, properties));
-    return (await Promise.all(promises)).flat();
-}
-/**
- * Import providers from given patterns.
- *
- * @param settings
- * @param properties
- */
-export async function importProviders(settings, properties = ["imports"]) {
-    const { exclude = [] } = settings;
-    const disableComponentsScan = settings.disableComponentsScan || !!process.env.WEBPACK;
-    const promises = properties.map((key) => importComponents(settings[key], exclude, disableComponentsScan));
-    const providers = (await Promise.all(promises)).flat();
-    const children = await recursiveImports(providers, settings, properties);
-    return [...children, ...providers];
-}
-//# sourceMappingURL=importProviders.js.map

package/lib/esm/utils/importProviders.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importProviders.js","sourceRoot":"","sources":["../../../src/utils/importProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAY,YAAY,EAAC,MAAM,UAAU,CAAC;AACjE,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEvD,KAAK,UAAU,gBAAgB,CAAC,SAA4C,EAAE,QAAqC,EAAE,UAAoB;IACvI,MAAM,EAAC,OAAO,GAAG,EAAE,EAAC,GAAG,QAAQ,CAAC;IAEhC,MAAM,QAAQ,GAAG,SAAS;SACvB,GAAG,CAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC5C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,YAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,CAAC;SACtF,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,eAAe,CAAC,EAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,aAAa,EAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IAElG,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAqC,EACrC,aAAuB,CAAC,SAAS,CAAC;IAElC,MAAM,EAAC,OAAO,GAAG,EAAE,EAAC,GAAG,QAAQ,CAAC;IAChC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAEtF,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEzE,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,CAAC;AACrC,CAAC","sourcesContent":["import {GlobalProviders, Provider, ProviderType} from \"@tsed/di\";\nimport {importComponents} from \"@tsed/components-scan\";\n\nasync function recursiveImports(providers: {token: string; route?: string}[], settings: Partial<TsED.Configuration>, properties: string[]) {\n  const {exclude = []} = settings;\n\n  const promises = providers\n    .map(({token}) => GlobalProviders.get(token))\n    .filter((provider) => provider?.type === ProviderType.MODULE && provider.configuration)\n    .map((provider: Provider) => importProviders({exclude, ...provider.configuration}, properties));\n\n  return (await Promise.all(promises)).flat();\n}\n\n/**\n * Import providers from given patterns.\n *\n * @param settings\n * @param properties\n */\nexport async function importProviders(\n  settings: Partial<TsED.Configuration>,\n  properties: string[] = [\"imports\"]\n): Promise<{token: string; route?: string}[]> {\n  const {exclude = []} = settings;\n  const disableComponentsScan = settings.disableComponentsScan || !!process.env.WEBPACK;\n\n  const promises = properties.map((key) => importComponents(settings[key], exclude, disableComponentsScan));\n  const providers = (await Promise.all(promises)).flat();\n  const children = await recursiveImports(providers, settings, properties);\n\n  return [...children, ...providers];\n}\n"]}

package/lib/types/config/interfaces/EndpointDirectoriesSettings.d.ts

@@ -1,3 +0,0 @@
-export interface EndpointDirectoriesSettings {
-    [endpoint: string]: any | string | (any | string)[];
-}

package/lib/types/utils/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;
-}[]>;