@rxap/ts-morph 1.1.0-dev.15 → 1.1.0-dev.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/package.json +2 -2
- package/src/lib/data-property.d.ts +7 -2
- package/src/lib/data-property.js +7 -0
- package/src/lib/data-property.js.map +1 -1
- package/src/lib/type-import.d.ts +16 -2
- package/src/lib/type-import.js +11 -1
- package/src/lib/type-import.js.map +1 -1
- package/src/lib/upstream-options.d.ts +49 -7
- package/src/lib/upstream-options.js +69 -15
- package/src/lib/upstream-options.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.1.0-dev.17](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.16...@rxap/ts-morph@1.1.0-dev.17) (2024-03-09)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- support custom mappers ([3970d65](https://gitlab.com/rxap/packages/commit/3970d65e099d85b57a345017af625bbc2d3b3475))
|
|
11
|
+
- support to options mapper ([0672e06](https://gitlab.com/rxap/packages/commit/0672e06618f11e5af31daffc5ded8caac3ce7a16))
|
|
12
|
+
|
|
13
|
+
# [1.1.0-dev.16](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.15...@rxap/ts-morph@1.1.0-dev.16) (2024-03-09)
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
- support complex data properties ([2294a05](https://gitlab.com/rxap/packages/commit/2294a05260c5d876ebf5ff209fd450592c7ebe4b))
|
|
18
|
+
- support complex data properties ([39d8967](https://gitlab.com/rxap/packages/commit/39d8967c7e1ac111d15d4ac246f15494730b6b78))
|
|
19
|
+
|
|
6
20
|
# [1.1.0-dev.15](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.14...@rxap/ts-morph@1.1.0-dev.15) (2024-03-07)
|
|
7
21
|
|
|
8
22
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.1.0-dev.
|
|
2
|
+
"version": "1.1.0-dev.17",
|
|
3
3
|
"name": "@rxap/ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"directory": "packages/ts-morph"
|
|
45
45
|
},
|
|
46
46
|
"type": "commonjs",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "6509da30b5b69f86513087d24c999d910bc204d7",
|
|
48
48
|
"main": "./src/index.js",
|
|
49
49
|
"types": "./src/index.d.ts"
|
|
50
50
|
}
|
|
@@ -8,11 +8,16 @@ export interface DataProperty {
|
|
|
8
8
|
isArray?: boolean;
|
|
9
9
|
isOptional?: boolean;
|
|
10
10
|
source?: string | null;
|
|
11
|
+
/**
|
|
12
|
+
* If set the property is an object with the given members
|
|
13
|
+
*/
|
|
14
|
+
memberList?: Array<string | DataProperty>;
|
|
11
15
|
}
|
|
12
|
-
export interface NormalizedDataProperty extends Readonly<Normalized<DataProperty
|
|
16
|
+
export interface NormalizedDataProperty extends Readonly<Normalized<Omit<DataProperty, 'memberList'>>> {
|
|
13
17
|
type: NormalizedTypeImport;
|
|
14
18
|
source: string | null;
|
|
19
|
+
memberList: Array<NormalizedDataProperty>;
|
|
15
20
|
}
|
|
16
21
|
export declare function NormalizeDataProperty(property: TypeName | Readonly<DataProperty>, defaultType?: TypeImport | TypeName, isArray?: boolean): NormalizedDataProperty;
|
|
17
|
-
export declare function NormalizeDataPropertyList(propertyList?: Array<string | DataProperty>, defaultType?:
|
|
22
|
+
export declare function NormalizeDataPropertyList(propertyList?: Array<string | DataProperty>, defaultType?: TypeImport | TypeName): Array<NormalizedDataProperty>;
|
|
18
23
|
export declare function NormalizeDataPropertyToPropertySignatureStructure(property: DataProperty, sourceFile: SourceFile): OptionalKind<PropertySignatureStructure>;
|
package/src/lib/data-property.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NormalizeDataPropertyToPropertySignatureStructure = exports.NormalizeDataPropertyList = exports.NormalizeDataProperty = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
4
5
|
const utilities_1 = require("@rxap/utilities");
|
|
5
6
|
const type_import_1 = require("./type-import");
|
|
6
7
|
const write_type_1 = require("./write-type");
|
|
@@ -36,6 +37,7 @@ function NormalizeDataProperty(property, defaultType = 'unknown', isArray = fals
|
|
|
36
37
|
let type = 'unknown';
|
|
37
38
|
let isOptional = false;
|
|
38
39
|
let source = null;
|
|
40
|
+
let memberList = [];
|
|
39
41
|
if (typeof property === 'string') {
|
|
40
42
|
// name:type
|
|
41
43
|
// username:string
|
|
@@ -49,6 +51,7 @@ function NormalizeDataProperty(property, defaultType = 'unknown', isArray = fals
|
|
|
49
51
|
isArray = (_b = property.isArray) !== null && _b !== void 0 ? _b : isArray;
|
|
50
52
|
isOptional = (_c = property.isOptional) !== null && _c !== void 0 ? _c : isOptional;
|
|
51
53
|
source = (_d = property.source) !== null && _d !== void 0 ? _d : source;
|
|
54
|
+
memberList = NormalizeDataPropertyList(property.memberList, defaultType);
|
|
52
55
|
}
|
|
53
56
|
if (name.endsWith('[]')) {
|
|
54
57
|
isArray = true;
|
|
@@ -67,6 +70,9 @@ function NormalizeDataProperty(property, defaultType = 'unknown', isArray = fals
|
|
|
67
70
|
type = defaultType;
|
|
68
71
|
}
|
|
69
72
|
}
|
|
73
|
+
if (memberList.length) {
|
|
74
|
+
type = ts_morph_1.TypeNames.Deferred;
|
|
75
|
+
}
|
|
70
76
|
name = name.replace(/\.\?/g, '.').split('.').join('.?');
|
|
71
77
|
if (!isNaN(Number(name[0]))) {
|
|
72
78
|
name = `_${name}`;
|
|
@@ -83,6 +89,7 @@ function NormalizeDataProperty(property, defaultType = 'unknown', isArray = fals
|
|
|
83
89
|
isArray,
|
|
84
90
|
isOptional,
|
|
85
91
|
source,
|
|
92
|
+
memberList,
|
|
86
93
|
});
|
|
87
94
|
}
|
|
88
95
|
exports.NormalizeDataProperty = NormalizeDataProperty;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":"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"}
|
package/src/lib/type-import.d.ts
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { ImportDeclarationStructure, OptionalKind } from 'ts-morph';
|
|
2
|
-
export
|
|
2
|
+
export declare enum TypeNames {
|
|
3
|
+
String = "string",
|
|
4
|
+
Number = "number",
|
|
5
|
+
Boolean = "boolean",
|
|
6
|
+
Any = "any",
|
|
7
|
+
Unknown = "unknown",
|
|
8
|
+
Self = "<self>",
|
|
9
|
+
Deferred = "<deferred>"
|
|
10
|
+
}
|
|
11
|
+
export type TypeName = string | TypeNames;
|
|
3
12
|
export interface TypeImport {
|
|
4
13
|
name: TypeName;
|
|
5
14
|
moduleSpecifier?: string | null;
|
|
@@ -12,7 +21,12 @@ export declare function IsTypeImport(value: any): value is TypeImport;
|
|
|
12
21
|
export declare function RequiresTypeImport(typeImport: TypeImport): boolean;
|
|
13
22
|
export declare function TypeImportToImportStructure(typeImport: TypeImport): OptionalKind<ImportDeclarationStructure>;
|
|
14
23
|
export interface NormalizedTypeImport {
|
|
15
|
-
|
|
24
|
+
/**
|
|
25
|
+
* The name of the type
|
|
26
|
+
* <self> indicates a self reference of the next object in the chain
|
|
27
|
+
* <deferred> indicates that the type is only known at runtime
|
|
28
|
+
*/
|
|
29
|
+
name: TypeName;
|
|
16
30
|
moduleSpecifier: string | null;
|
|
17
31
|
namedImport: string | null;
|
|
18
32
|
namespaceImport: string | null;
|
package/src/lib/type-import.js
CHANGED
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NormalizeTypeImportList = exports.NormalizeTypeImport = exports.TypeImportToImportStructure = exports.RequiresTypeImport = exports.IsTypeImport = void 0;
|
|
3
|
+
exports.NormalizeTypeImportList = exports.NormalizeTypeImport = exports.TypeImportToImportStructure = exports.RequiresTypeImport = exports.IsTypeImport = exports.TypeNames = void 0;
|
|
4
|
+
var TypeNames;
|
|
5
|
+
(function (TypeNames) {
|
|
6
|
+
TypeNames["String"] = "string";
|
|
7
|
+
TypeNames["Number"] = "number";
|
|
8
|
+
TypeNames["Boolean"] = "boolean";
|
|
9
|
+
TypeNames["Any"] = "any";
|
|
10
|
+
TypeNames["Unknown"] = "unknown";
|
|
11
|
+
TypeNames["Self"] = "<self>";
|
|
12
|
+
TypeNames["Deferred"] = "<deferred>";
|
|
13
|
+
})(TypeNames || (exports.TypeNames = TypeNames = {}));
|
|
4
14
|
function IsTypeImport(value) {
|
|
5
15
|
return typeof value === 'object' && typeof value.name === 'string';
|
|
6
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-import.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/type-import.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"type-import.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/type-import.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,38 +6,80 @@ export type UpstreamOptions = OpenApiUpstreamOptions | BaseUpstreamOptions;
|
|
|
6
6
|
export type NormalizedUpstreamOptions = NormalizedOpenApiUpstreamOptions | NormalizedBaseUpstreamOptions;
|
|
7
7
|
export interface BaseUpstreamOptions {
|
|
8
8
|
kind: UpstreamOptionsKinds;
|
|
9
|
+
mapper?: RequestMapper;
|
|
9
10
|
}
|
|
10
|
-
export interface NormalizedBaseUpstreamOptions extends Readonly<Normalized<BaseUpstreamOptions>> {
|
|
11
|
+
export interface NormalizedBaseUpstreamOptions<Mapper extends NormalizedRequestMapper = NormalizedRequestMapper> extends Readonly<Normalized<BaseUpstreamOptions>> {
|
|
11
12
|
kind: UpstreamOptionsKinds;
|
|
13
|
+
mapper: Mapper | null;
|
|
12
14
|
}
|
|
13
15
|
export declare function NormalizeBaseUpstreamOptions(options: BaseUpstreamOptions): NormalizedBaseUpstreamOptions;
|
|
14
|
-
export
|
|
16
|
+
export type RequestMapper = PagedRequestMapper | BaseRequestMapper | OptionsRequestMapper | ResolveRequestMapper;
|
|
17
|
+
export type NormalizedRequestMapper = NormalizedPagedRequestMapper | NormalizedBaseRequestMapper | NormalizedOptionsRequestMapper | NormalizedResolveRequestMapper;
|
|
18
|
+
export declare function NormalizeRequestMapper(mapper?: RequestMapper | null): NormalizedRequestMapper | null;
|
|
19
|
+
export declare enum RequestMapperKinds {
|
|
20
|
+
DEFAULT = "default",
|
|
21
|
+
PAGED = "paged",
|
|
22
|
+
OPTIONS = "options",
|
|
23
|
+
Resolve = "resolve"
|
|
24
|
+
}
|
|
25
|
+
export interface BaseRequestMapper {
|
|
26
|
+
kind: RequestMapperKinds;
|
|
27
|
+
}
|
|
28
|
+
export interface NormalizedBaseRequestMapper extends Readonly<Normalized<BaseRequestMapper>> {
|
|
29
|
+
kind: RequestMapperKinds.DEFAULT;
|
|
30
|
+
}
|
|
31
|
+
export declare function NormalizeBaseRequestMapper(mapper: BaseRequestMapper): NormalizedBaseRequestMapper;
|
|
32
|
+
export declare function IsNormalizedBaseRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedBaseRequestMapper;
|
|
33
|
+
export interface PagedRequestMapper extends BaseRequestMapper {
|
|
15
34
|
pageIndex?: string;
|
|
16
35
|
pageSize?: string;
|
|
17
36
|
sortBy?: string;
|
|
18
37
|
sortDirection?: string;
|
|
19
38
|
list?: string;
|
|
20
39
|
total?: string;
|
|
21
|
-
value?: string;
|
|
22
40
|
filter?: {
|
|
23
41
|
eq: string;
|
|
24
42
|
join: string;
|
|
25
43
|
};
|
|
26
44
|
}
|
|
27
|
-
export interface
|
|
45
|
+
export interface NormalizedPagedRequestMapper extends Readonly<Normalized<PagedRequestMapper>> {
|
|
46
|
+
kind: RequestMapperKinds.PAGED;
|
|
28
47
|
filter: {
|
|
29
48
|
eq: string;
|
|
30
49
|
join: string;
|
|
31
50
|
} | null;
|
|
32
51
|
}
|
|
33
|
-
export declare function
|
|
52
|
+
export declare function NormalizePagedRequestMapper(mapper: PagedRequestMapper): NormalizedPagedRequestMapper;
|
|
53
|
+
export declare function IsNormalizedPagedRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedPagedRequestMapper;
|
|
54
|
+
export declare enum ToOptionsFunction {
|
|
55
|
+
TO_OPTIONS = "ToOptions",
|
|
56
|
+
TO_OPTIONS_FROM_OBJECT = "ToOptionsFromObject"
|
|
57
|
+
}
|
|
58
|
+
export interface OptionsRequestMapper extends BaseRequestMapper {
|
|
59
|
+
toFunction?: ToOptionsFunction;
|
|
60
|
+
toValue?: string;
|
|
61
|
+
toDisplay?: string;
|
|
62
|
+
}
|
|
63
|
+
export interface NormalizedOptionsRequestMapper extends Readonly<Normalized<OptionsRequestMapper>> {
|
|
64
|
+
kind: RequestMapperKinds.OPTIONS;
|
|
65
|
+
toFunction: ToOptionsFunction;
|
|
66
|
+
}
|
|
67
|
+
export declare function NormalizeOptionsRequestMapper(mapper: OptionsRequestMapper): NormalizedOptionsRequestMapper;
|
|
68
|
+
export declare function IsNormalizedOptionsRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedOptionsRequestMapper;
|
|
69
|
+
export interface ResolveRequestMapper extends BaseRequestMapper {
|
|
70
|
+
value?: string;
|
|
71
|
+
}
|
|
72
|
+
export interface NormalizedResolveRequestMapper extends Readonly<Normalized<ResolveRequestMapper>> {
|
|
73
|
+
kind: RequestMapperKinds.Resolve;
|
|
74
|
+
}
|
|
75
|
+
export declare function NormalizeResolveRequestMapper(mapper: ResolveRequestMapper): NormalizedResolveRequestMapper;
|
|
76
|
+
export declare function IsNormalizedResolveRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedResolveRequestMapper;
|
|
34
77
|
export interface OpenApiUpstreamOptions extends BaseUpstreamOptions {
|
|
35
78
|
operationId: string;
|
|
36
79
|
isService?: boolean;
|
|
37
80
|
scope?: string;
|
|
38
|
-
mapper?: CommandMapper;
|
|
39
81
|
}
|
|
40
|
-
export interface NormalizedOpenApiUpstreamOptions extends Readonly<Normalized<OpenApiUpstreamOptions
|
|
82
|
+
export interface NormalizedOpenApiUpstreamOptions extends Readonly<Normalized<Omit<OpenApiUpstreamOptions, keyof NormalizedBaseUpstreamOptions>>>, NormalizedBaseUpstreamOptions {
|
|
41
83
|
kind: UpstreamOptionsKinds.OPEN_API;
|
|
42
84
|
}
|
|
43
85
|
export declare function NormalizeOpenApiUpstreamOptions(options: OpenApiUpstreamOptions): NormalizedOpenApiUpstreamOptions;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NormalizeUpstreamOptions = exports.IsNormalizedOpenApiUpstreamOptions = exports.NormalizeOpenApiUpstreamOptions = exports.
|
|
3
|
+
exports.NormalizeUpstreamOptions = exports.IsNormalizedOpenApiUpstreamOptions = exports.NormalizeOpenApiUpstreamOptions = exports.IsNormalizedResolveRequestMapper = exports.NormalizeResolveRequestMapper = exports.IsNormalizedOptionsRequestMapper = exports.NormalizeOptionsRequestMapper = exports.ToOptionsFunction = exports.IsNormalizedPagedRequestMapper = exports.NormalizePagedRequestMapper = exports.IsNormalizedBaseRequestMapper = exports.NormalizeBaseRequestMapper = exports.RequestMapperKinds = exports.NormalizeRequestMapper = exports.NormalizeBaseUpstreamOptions = exports.UpstreamOptionsKinds = void 0;
|
|
4
4
|
var UpstreamOptionsKinds;
|
|
5
5
|
(function (UpstreamOptionsKinds) {
|
|
6
6
|
UpstreamOptionsKinds["OPEN_API"] = "open-api";
|
|
@@ -8,32 +8,86 @@ var UpstreamOptionsKinds;
|
|
|
8
8
|
function NormalizeBaseUpstreamOptions(options) {
|
|
9
9
|
return Object.freeze({
|
|
10
10
|
kind: options.kind,
|
|
11
|
+
mapper: NormalizeRequestMapper(options.mapper),
|
|
11
12
|
});
|
|
12
13
|
}
|
|
13
14
|
exports.NormalizeBaseUpstreamOptions = NormalizeBaseUpstreamOptions;
|
|
14
|
-
function
|
|
15
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
15
|
+
function NormalizeRequestMapper(mapper) {
|
|
16
16
|
if (!mapper || Object.keys(mapper).length === 0) {
|
|
17
17
|
return null;
|
|
18
18
|
}
|
|
19
|
+
switch (mapper.kind) {
|
|
20
|
+
default:
|
|
21
|
+
case RequestMapperKinds.DEFAULT:
|
|
22
|
+
return NormalizeBaseRequestMapper(mapper);
|
|
23
|
+
case RequestMapperKinds.PAGED:
|
|
24
|
+
return NormalizePagedRequestMapper(mapper);
|
|
25
|
+
case RequestMapperKinds.OPTIONS:
|
|
26
|
+
return NormalizeOptionsRequestMapper(mapper);
|
|
27
|
+
case RequestMapperKinds.Resolve:
|
|
28
|
+
return NormalizeResolveRequestMapper(mapper);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.NormalizeRequestMapper = NormalizeRequestMapper;
|
|
32
|
+
// endregion
|
|
33
|
+
// region BaseRequestMapper
|
|
34
|
+
var RequestMapperKinds;
|
|
35
|
+
(function (RequestMapperKinds) {
|
|
36
|
+
RequestMapperKinds["DEFAULT"] = "default";
|
|
37
|
+
RequestMapperKinds["PAGED"] = "paged";
|
|
38
|
+
RequestMapperKinds["OPTIONS"] = "options";
|
|
39
|
+
RequestMapperKinds["Resolve"] = "resolve";
|
|
40
|
+
})(RequestMapperKinds || (exports.RequestMapperKinds = RequestMapperKinds = {}));
|
|
41
|
+
function NormalizeBaseRequestMapper(mapper) {
|
|
19
42
|
return Object.freeze({
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
43
|
+
kind: RequestMapperKinds.DEFAULT,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
exports.NormalizeBaseRequestMapper = NormalizeBaseRequestMapper;
|
|
47
|
+
function IsNormalizedBaseRequestMapper(mapper) {
|
|
48
|
+
return mapper.kind === RequestMapperKinds.DEFAULT;
|
|
49
|
+
}
|
|
50
|
+
exports.IsNormalizedBaseRequestMapper = IsNormalizedBaseRequestMapper;
|
|
51
|
+
function NormalizePagedRequestMapper(mapper) {
|
|
52
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
53
|
+
return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.PAGED, pageIndex: (_a = mapper.pageIndex) !== null && _a !== void 0 ? _a : null, pageSize: (_b = mapper.pageSize) !== null && _b !== void 0 ? _b : null, sortBy: (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : null, list: (_d = mapper.list) !== null && _d !== void 0 ? _d : null, total: (_e = mapper.total) !== null && _e !== void 0 ? _e : null, sortDirection: (_f = mapper.sortDirection) !== null && _f !== void 0 ? _f : null, filter: mapper.filter && Object.keys((_g = mapper.filter) !== null && _g !== void 0 ? _g : {}).length ? {
|
|
28
54
|
eq: mapper.filter.eq,
|
|
29
55
|
join: mapper.filter.join,
|
|
30
|
-
} : null
|
|
31
|
-
|
|
56
|
+
} : null }));
|
|
57
|
+
}
|
|
58
|
+
exports.NormalizePagedRequestMapper = NormalizePagedRequestMapper;
|
|
59
|
+
function IsNormalizedPagedRequestMapper(mapper) {
|
|
60
|
+
return mapper.kind === RequestMapperKinds.PAGED;
|
|
61
|
+
}
|
|
62
|
+
exports.IsNormalizedPagedRequestMapper = IsNormalizedPagedRequestMapper;
|
|
63
|
+
// endregion
|
|
64
|
+
// region OptionsRequestMapper
|
|
65
|
+
var ToOptionsFunction;
|
|
66
|
+
(function (ToOptionsFunction) {
|
|
67
|
+
ToOptionsFunction["TO_OPTIONS"] = "ToOptions";
|
|
68
|
+
ToOptionsFunction["TO_OPTIONS_FROM_OBJECT"] = "ToOptionsFromObject";
|
|
69
|
+
})(ToOptionsFunction || (exports.ToOptionsFunction = ToOptionsFunction = {}));
|
|
70
|
+
function NormalizeOptionsRequestMapper(mapper) {
|
|
71
|
+
var _a, _b, _c;
|
|
72
|
+
return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.OPTIONS, toFunction: (_a = mapper.toFunction) !== null && _a !== void 0 ? _a : ToOptionsFunction.TO_OPTIONS, toValue: (_b = mapper.toValue) !== null && _b !== void 0 ? _b : null, toDisplay: (_c = mapper.toDisplay) !== null && _c !== void 0 ? _c : null }));
|
|
73
|
+
}
|
|
74
|
+
exports.NormalizeOptionsRequestMapper = NormalizeOptionsRequestMapper;
|
|
75
|
+
function IsNormalizedOptionsRequestMapper(mapper) {
|
|
76
|
+
return mapper.kind === RequestMapperKinds.OPTIONS;
|
|
77
|
+
}
|
|
78
|
+
exports.IsNormalizedOptionsRequestMapper = IsNormalizedOptionsRequestMapper;
|
|
79
|
+
function NormalizeResolveRequestMapper(mapper) {
|
|
80
|
+
var _a;
|
|
81
|
+
return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.Resolve, value: (_a = mapper.value) !== null && _a !== void 0 ? _a : null }));
|
|
82
|
+
}
|
|
83
|
+
exports.NormalizeResolveRequestMapper = NormalizeResolveRequestMapper;
|
|
84
|
+
function IsNormalizedResolveRequestMapper(mapper) {
|
|
85
|
+
return mapper.kind === RequestMapperKinds.Resolve;
|
|
32
86
|
}
|
|
33
|
-
exports.
|
|
87
|
+
exports.IsNormalizedResolveRequestMapper = IsNormalizedResolveRequestMapper;
|
|
34
88
|
function NormalizeOpenApiUpstreamOptions(options) {
|
|
35
89
|
var _a, _b;
|
|
36
|
-
return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseUpstreamOptions(options)), { kind: UpstreamOptionsKinds.OPEN_API, operationId: options.operationId,
|
|
90
|
+
return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseUpstreamOptions(options)), { kind: UpstreamOptionsKinds.OPEN_API, operationId: options.operationId, scope: (_a = options.scope) !== null && _a !== void 0 ? _a : null, isService: (_b = options.isService) !== null && _b !== void 0 ? _b : false }));
|
|
37
91
|
}
|
|
38
92
|
exports.NormalizeOpenApiUpstreamOptions = NormalizeOpenApiUpstreamOptions;
|
|
39
93
|
function IsNormalizedOpenApiUpstreamOptions(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;AACvB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;
|
|
1
|
+
{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":"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"}
|