Skip to content

Commit 8e38bfa

Browse files
RomakitaRomakita
committed
Merge fix-modules-resolutions
2 parents ea9fd6e + 2294579 commit 8e38bfa

47 files changed

Lines changed: 937 additions & 927 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"test:coverage": "cross-env NODE_ENV=test nyc mocha",
1313
"test:lint": "eslint packages --ext .js",
1414
"test:lint:fix": "eslint packages --ext .js --fix",
15+
"prettier": "prettier '{packages,test}/**/*.ts' --write",
1516
"build": "monorepo build",
1617
"sync:packages": "monorepo sync packages",
1718
"release": "semantic-release",

‎packages/ts-doc/src/models/DocFile.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const {context} = require("../context");
22
const path = require("path");
33
const fs = require("fs");
44
const normalizePath = require("normalize-path");
5+
const readPkgUp = require("read-pkg-up");
56
const mapExported = new Map();
67

78
class DocFile {
@@ -34,20 +35,18 @@ class DocFile {
3435
}
3536

3637
get module() {
37-
const [pkgName, subPkgName] = this.relativePackagePath.replace(/^\//, "").split("/");
38-
const pkgSettings = context.modules[pkgName];
39-
let moduleName = pkgName;
38+
const [packagePath] = this.relativePackagePath.split("/src");
39+
const packageDir = context.rootDir + "/" + context.packagesDir + "/" + packagePath;
4040

41-
if (typeof pkgSettings === "object" && context.modules[pkgName][subPkgName]) {
42-
moduleName = pkgName + "/" + subPkgName;
43-
}
41+
const {
42+
packageJson: {name}
43+
} = readPkgUp.sync({cwd: packageDir});
4444

4545
return {
46-
modulePath: path.join(context.rootDir, context.packagesDir, pkgName),
47-
moduleName: `${context.scope}/${moduleName}`,
48-
importFrom: `${context.scope}/${pkgName}`,
49-
pkgName,
50-
subPkgName
46+
modulePath: packageDir,
47+
moduleName: name,
48+
importFrom: name,
49+
pkgName: name.replace(context.scope, "")
5150
};
5251
}
5352

‎packages/ts-doc/src/scan/scan.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const globby = require("globby");
44
const path = require("path");
55
const chalk = require("chalk");
6-
const logger = require("fancy-log");
76
const {render} = require("../render/render");
87
const {context} = require("../context");
98
const {trim} = require("../utils/trim");

‎packages/ts-doc/test/data/packages/common/lib/platform/domain/ControllerProvider.d.ts‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
import { Type } from "@tsed/core";
2-
import { Provider } from "@tsed/di";
3-
import { JsonEntityStore } from "@tsed/schema";
4-
import { ControllerMiddlewares, EndpointMetadata } from "../../mvc";
5-
import { PlatformRouterMethods } from "../interfaces/PlatformRouterMethods";
1+
import {Type} from "@tsed/core";
2+
import {Provider} from "@tsed/di";
3+
import {JsonEntityStore} from "@tsed/schema";
4+
import {ControllerMiddlewares, EndpointMetadata} from "../../mvc";
5+
import {PlatformRouterMethods} from "../interfaces/PlatformRouterMethods";
66
export interface IChildrenController extends Type<any> {
7-
$parentCtrl?: ControllerProvider;
7+
$parentCtrl?: ControllerProvider;
88
}
99
export declare class ControllerProvider<T = any> extends Provider<T> {
10-
readonly entity: JsonEntityStore;
11-
private router;
12-
/**
13-
* Controllers that depend to this controller.
14-
* @type {Array}
15-
* @private
16-
*/
17-
private _children;
18-
constructor(provide: any);
19-
get path(): string;
20-
set path(path: string);
21-
/**
22-
*
23-
* @returns {Endpoint[]}
24-
*/
25-
get endpoints(): EndpointMetadata[];
26-
/**
27-
*
28-
* @returns {Type<any>[]}
29-
*/
30-
get children(): IChildrenController[];
31-
/**
32-
*
33-
* @param children
34-
*/
35-
set children(children: IChildrenController[]);
36-
/**
37-
*
38-
*/
39-
get routerOptions(): any;
40-
/**
41-
*
42-
* @param value
43-
*/
44-
set routerOptions(value: any);
45-
/**
46-
*
47-
* @returns {ControllerProvider}
48-
*/
49-
get parent(): any;
50-
/**
51-
*
52-
* @returns {any[]}
53-
*/
54-
get middlewares(): ControllerMiddlewares;
55-
/**
56-
*
57-
* @param middlewares
58-
*/
59-
set middlewares(middlewares: ControllerMiddlewares);
60-
/**
61-
* Resolve final endpoint url.
62-
*/
63-
getEndpointUrl(routerPath?: string): string;
64-
/**
65-
*
66-
*/
67-
hasEndpointUrl(): boolean;
68-
/**
69-
*
70-
* @returns {boolean}
71-
*/
72-
hasChildren(): boolean;
73-
/**
74-
*
75-
* @returns {boolean}
76-
*/
77-
hasParent(): boolean;
78-
getRouter<T extends PlatformRouterMethods = any>(): T;
79-
setRouter(router: PlatformRouterMethods): this;
10+
readonly entity: JsonEntityStore;
11+
private router;
12+
/**
13+
* Controllers that depend to this controller.
14+
* @type {Array}
15+
* @private
16+
*/
17+
private _children;
18+
constructor(provide: any);
19+
get path(): string;
20+
set path(path: string);
21+
/**
22+
*
23+
* @returns {Endpoint[]}
24+
*/
25+
get endpoints(): EndpointMetadata[];
26+
/**
27+
*
28+
* @returns {Type<any>[]}
29+
*/
30+
get children(): IChildrenController[];
31+
/**
32+
*
33+
* @param children
34+
*/
35+
set children(children: IChildrenController[]);
36+
/**
37+
*
38+
*/
39+
get routerOptions(): any;
40+
/**
41+
*
42+
* @param value
43+
*/
44+
set routerOptions(value: any);
45+
/**
46+
*
47+
* @returns {ControllerProvider}
48+
*/
49+
get parent(): any;
50+
/**
51+
*
52+
* @returns {any[]}
53+
*/
54+
get middlewares(): ControllerMiddlewares;
55+
/**
56+
*
57+
* @param middlewares
58+
*/
59+
set middlewares(middlewares: ControllerMiddlewares);
60+
/**
61+
* Resolve final endpoint url.
62+
*/
63+
getEndpointUrl(routerPath?: string): string;
64+
/**
65+
*
66+
*/
67+
hasEndpointUrl(): boolean;
68+
/**
69+
*
70+
* @returns {boolean}
71+
*/
72+
hasChildren(): boolean;
73+
/**
74+
*
75+
* @returns {boolean}
76+
*/
77+
hasParent(): boolean;
78+
getRouter<T extends PlatformRouterMethods = any>(): T;
79+
setRouter(router: PlatformRouterMethods): this;
8080
}

‎packages/ts-doc/test/data/packages/common/lib/platform/domain/RequestContext.d.ts‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
import { InjectorService, LocalsContainer } from "@tsed/di";
2-
import { EndpointMetadata } from "../../mvc/models/EndpointMetadata";
3-
import { PlatformRequest } from "../services/PlatformRequest";
4-
import { PlatformResponse } from "../services/PlatformResponse";
5-
import { RequestLogger } from "./RequestLogger";
1+
import {InjectorService, LocalsContainer} from "@tsed/di";
2+
import {EndpointMetadata} from "../../mvc/models/EndpointMetadata";
3+
import {PlatformRequest} from "../services/PlatformRequest";
4+
import {PlatformResponse} from "../services/PlatformResponse";
5+
import {RequestLogger} from "./RequestLogger";
66

77
export interface RequestContextOptions {
8-
id: string;
9-
logger: any;
10-
url: string;
11-
ignoreUrlPatterns?: any[];
12-
level?: "debug" | "info" | "warn" | "error" | "off";
13-
maxStackSize?: number;
14-
injector?: InjectorService;
15-
response?: PlatformResponse;
16-
request?: PlatformRequest;
17-
endpoint?: EndpointMetadata;
8+
id: string;
9+
logger: any;
10+
url: string;
11+
ignoreUrlPatterns?: any[];
12+
level?: "debug" | "info" | "warn" | "error" | "off";
13+
maxStackSize?: number;
14+
injector?: InjectorService;
15+
response?: PlatformResponse;
16+
request?: PlatformRequest;
17+
endpoint?: EndpointMetadata;
1818
}
1919
export declare class RequestContext extends Map<any, any> {
20-
/**
21-
* Request id generated by @@contextMiddleware@@.
22-
*
23-
* ::: tip
24-
* By default Ts.ED generate uuid like that `uuidv4().replace(/-/gi, ""))`.
25-
* Dash are removed to simplify tracking logs in Kibana
26-
* :::
27-
*
28-
* ::: tip
29-
* Request id can by customized by changing the server configuration.
30-
*
31-
* ```typescript
32-
* @ServerSettings({
33-
* logger: {
34-
* reqIdBuilder: createUniqId // give your own id generator function
35-
* }
36-
* })
37-
* class Server {
38-
*
39-
* }
40-
* ```
41-
* :::
42-
*
43-
*/
44-
readonly id: string;
45-
/**
46-
* Date when request have been handled by the server. @@RequestLogger@@ use this date to log request duration.
47-
*/
48-
readonly dateStart: Date;
49-
/**
50-
* The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
51-
*/
52-
container: LocalsContainer<any>;
53-
/**
54-
* The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
55-
*/
56-
endpoint: EndpointMetadata;
57-
/**
58-
* The data return by the previous endpoint if you use multiple handler on the same route. By default data is empty.
59-
*/
60-
data: any;
61-
/**
62-
* Logger attached to the context request.
63-
*/
64-
logger: RequestLogger;
65-
/**
66-
* The current @@PlatformResponse@@.
67-
*/
68-
response: PlatformResponse;
69-
/**
70-
* The current @@PlatformRequest@@.
71-
*/
72-
request: PlatformRequest;
73-
/**
74-
*
75-
*/
76-
injector: InjectorService;
77-
constructor({ id, injector, logger, response, request, endpoint, ...options }: RequestContextOptions);
78-
destroy(): Promise<void>;
79-
emit(eventName: string, ...args: any[]): Promise<void>;
20+
/**
21+
* Request id generated by @@contextMiddleware@@.
22+
*
23+
* ::: tip
24+
* By default Ts.ED generate uuid like that `uuidv4().replace(/-/gi, ""))`.
25+
* Dash are removed to simplify tracking logs in Kibana
26+
* :::
27+
*
28+
* ::: tip
29+
* Request id can by customized by changing the server configuration.
30+
*
31+
* ```typescript
32+
* @ServerSettings({
33+
* logger: {
34+
* reqIdBuilder: createUniqId // give your own id generator function
35+
* }
36+
* })
37+
* class Server {
38+
*
39+
* }
40+
* ```
41+
* :::
42+
*
43+
*/
44+
readonly id: string;
45+
/**
46+
* Date when request have been handled by the server. @@RequestLogger@@ use this date to log request duration.
47+
*/
48+
readonly dateStart: Date;
49+
/**
50+
* The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
51+
*/
52+
container: LocalsContainer<any>;
53+
/**
54+
* The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
55+
*/
56+
endpoint: EndpointMetadata;
57+
/**
58+
* The data return by the previous endpoint if you use multiple handler on the same route. By default data is empty.
59+
*/
60+
data: any;
61+
/**
62+
* Logger attached to the context request.
63+
*/
64+
logger: RequestLogger;
65+
/**
66+
* The current @@PlatformResponse@@.
67+
*/
68+
response: PlatformResponse;
69+
/**
70+
* The current @@PlatformRequest@@.
71+
*/
72+
request: PlatformRequest;
73+
/**
74+
*
75+
*/
76+
injector: InjectorService;
77+
constructor({id, injector, logger, response, request, endpoint, ...options}: RequestContextOptions);
78+
destroy(): Promise<void>;
79+
emit(eventName: string, ...args: any[]): Promise<void>;
8080
}

‎packages/ts-doc/test/data/packages/schema/lib/constants/httpStatusMessages.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export declare const HTTP_STATUS_MESSAGES: {
2-
[key: string]: string;
2+
[key: string]: string;
33
};

0 commit comments

Comments
 (0)