@trapi/metadata 0.1.0 → 0.1.4
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/LICENSE +21 -0
- package/README.md +8 -1
- package/dist/cache/driver.js +1 -2
- package/dist/cache/driver.js.map +1 -1
- package/dist/cache/utils.d.ts.map +1 -1
- package/dist/cache/utils.js +12 -12
- package/dist/cache/utils.js.map +1 -1
- package/dist/decorator/mapper/index.js +13 -14
- package/dist/decorator/mapper/index.js.map +1 -1
- package/dist/decorator/mapper/utils.js +4 -4
- package/dist/decorator/mapper/utils.js.map +1 -1
- package/dist/decorator/representation/index.js +8 -10
- package/dist/decorator/representation/index.js.map +1 -1
- package/dist/decorator/representation/property/utils.js +6 -5
- package/dist/decorator/representation/property/utils.js.map +1 -1
- package/dist/decorator/utils/validator.js +5 -5
- package/dist/decorator/utils/validator.js.map +1 -1
- package/dist/generator/controller.js +1 -1
- package/dist/generator/controller.js.map +1 -1
- package/dist/generator/endpoint.d.ts +1 -1
- package/dist/generator/endpoint.d.ts.map +1 -1
- package/dist/generator/endpoint.js +6 -9
- package/dist/generator/endpoint.js.map +1 -1
- package/dist/generator/index.js +3 -9
- package/dist/generator/index.js.map +1 -1
- package/dist/generator/method.js +7 -9
- package/dist/generator/method.js.map +1 -1
- package/dist/generator/parameter.js +1 -9
- package/dist/generator/parameter.js.map +1 -1
- package/dist/resolver/type-node.js +46 -79
- package/dist/resolver/type-node.js.map +1 -1
- package/dist/resolver/utils/initializer.d.ts.map +1 -1
- package/dist/resolver/utils/initializer.js +4 -3
- package/dist/resolver/utils/initializer.js.map +1 -1
- package/dist/resolver/utils/validator.js +2 -1
- package/dist/resolver/utils/validator.js.map +1 -1
- package/dist/utils/generator.js +2 -2
- package/dist/utils/generator.js.map +1 -1
- package/dist/utils/js-doc.js +4 -4
- package/dist/utils/js-doc.js.map +1 -1
- package/package.json +9 -6
- package/src/cache/utils.ts +10 -12
- package/src/decorator/mapper/index.ts +1 -1
- package/src/decorator/mapper/utils.ts +1 -1
- package/src/decorator/representation/index.ts +1 -1
- package/src/decorator/representation/property/utils.ts +1 -1
- package/src/decorator/utils/validator.ts +1 -1
- package/src/generator/endpoint.ts +5 -5
- package/src/generator/method.ts +4 -4
- package/src/resolver/type-node.ts +2 -2
- package/src/resolver/utils/initializer.ts +5 -2
- package/src/utils/generator.ts +1 -1
- package/src/utils/js-doc.ts +1 -1
- package/test/unit/utils/js-doc.spec.ts +11 -2
- package/tsconfig.json +2 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2021 Peter Placzek
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# @trapi/metadata
|
|
1
|
+
# @trapi/metadata 📚
|
|
2
2
|
|
|
3
3
|
[](https://github.com/Tada5hi/typescript-rest-api/actions/workflows/main.yml)
|
|
4
4
|
[](https://codecov.io/gh/Tada5hi/typescript-rest-api)
|
|
@@ -170,3 +170,10 @@ console.log(metadata);
|
|
|
170
170
|
```
|
|
171
171
|
|
|
172
172
|
## Structure
|
|
173
|
+
|
|
174
|
+
**coming soon**
|
|
175
|
+
|
|
176
|
+
## Credits
|
|
177
|
+
Parts of this package **@trapi/metadata** code rest on a continued fork repository ([typescript-swagger](https://github.com/Tada5hi/typescript-swagger)) of the
|
|
178
|
+
[typescript-rest-swagger](https://github.com/thiagobustamante/typescript-rest-swagger) library of [thiagobustamante](https://github.com/thiagobustamante)
|
|
179
|
+
and was also inspired by the [tsoa](https://github.com/lukeautry/tsoa) library of [lukeatury](https://github.com/lukeautry).
|
package/dist/cache/driver.js
CHANGED
|
@@ -34,7 +34,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
34
34
|
const glob = __importStar(require("glob"));
|
|
35
35
|
const path_1 = __importDefault(require("path"));
|
|
36
36
|
class CacheDriver {
|
|
37
|
-
config;
|
|
38
37
|
constructor(config) {
|
|
39
38
|
this.config = (0, utils_1.buildCacheConfig)(config);
|
|
40
39
|
}
|
|
@@ -93,7 +92,7 @@ class CacheDriver {
|
|
|
93
92
|
return this.config.fileName;
|
|
94
93
|
}
|
|
95
94
|
else {
|
|
96
|
-
return `.swagger-${hash
|
|
95
|
+
return `.swagger-${hash !== null && hash !== void 0 ? hash : (0, utils_1.buildFileHash)(sourceFilesSize)}.json`;
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
}
|
package/dist/cache/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/cache/driver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,mCAAwD;AACxD,4CAAoB;AACpB,2CAA6B;AAC7B,gDAAwB;AAExB,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/cache/driver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,mCAAwD;AACxD,4CAAoB;AACpB,2CAA6B;AAC7B,gDAAwB;AAExB,MAAa,WAAW;IAGpB,YAAY,MAAgD;QACxD,IAAI,CAAC,MAAM,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,4EAA4E;IAErE,IAAI,CAAC,IAAgB;QACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,QAAQ,GAAW,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE7E,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAEjD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,GAAG,CAAC,eAAuB;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,MAAM,QAAQ,GAAW,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAExE,IAAI;YACA,MAAM,MAAM,GAAW,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEjD,MAAM,OAAO,GAAW,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAEjD,2CAA2C;YAC3C,MAAM,KAAK,GAA2B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAe,CAAC;YAExE,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,CAAC,eAAe,KAAK,eAAe,EAAE;gBAC3E,OAAO,SAAS,CAAC;aACpB;YAED,OAAO,KAAK,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACR,0BAA0B;YAC1B,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IAED,4EAA4E;IAE5E;;OAEG;IAEH,0BAA0B;IACnB,KAAK;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACpD,OAAO;SACV;QAED,MAAM,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,IAAI,GAAG,EAAE,EAAE;YACX,OAAO;SACV;QAED,MAAM,KAAK,GAAa,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,4EAA4E;IAEpE,aAAa,CAAC,IAAa,EAAE,eAAwB;QACzD,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAC3F,CAAC;IAEO,aAAa,CAAC,IAAa,EAAE,eAAwB;QACzD,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC/B;aAAM;YACH,OAAO,YAAY,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAA,qBAAa,EAAC,eAAe,CAAC,OAAO,CAAC;SACpE;IACL,CAAC;CACJ;AAnFD,kCAmFC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cache/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAI7B,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAI,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cache/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAI7B,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAI,KAAK,CAAC,MAAM,CA2BjG;AAED,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ9D"}
|
package/dist/cache/utils.js
CHANGED
|
@@ -13,6 +13,7 @@ exports.buildFileHash = exports.buildCacheConfig = void 0;
|
|
|
13
13
|
const path_1 = __importDefault(require("path"));
|
|
14
14
|
const crypto_1 = __importDefault(require("crypto"));
|
|
15
15
|
function buildCacheConfig(config) {
|
|
16
|
+
var _a, _b;
|
|
16
17
|
if (typeof config === 'string') {
|
|
17
18
|
config = {
|
|
18
19
|
enabled: true,
|
|
@@ -24,23 +25,22 @@ function buildCacheConfig(config) {
|
|
|
24
25
|
enabled: config
|
|
25
26
|
};
|
|
26
27
|
}
|
|
27
|
-
config
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
config !== null && config !== void 0 ? config : (config = {});
|
|
29
|
+
/* istanbul ignore next */
|
|
30
|
+
const isTestEnvironment = !!process.env.NODE_ENV && process.env.NODE_ENV === 'test';
|
|
31
|
+
return {
|
|
32
|
+
fileName: config.fileName,
|
|
33
|
+
directoryPath: typeof config.directoryPath === 'string' ?
|
|
34
|
+
path_1.default.isAbsolute(config.directoryPath) ? config.directoryPath : path_1.default.join(process.cwd(), config.directoryPath) :
|
|
35
|
+
process.cwd(),
|
|
36
|
+
enabled: (_a = config.enabled) !== null && _a !== void 0 ? _a : false,
|
|
37
|
+
clearAtRandom: (_b = config.clearAtRandom) !== null && _b !== void 0 ? _b : !isTestEnvironment
|
|
32
38
|
};
|
|
33
|
-
data.enabled = config.enabled ?? false;
|
|
34
|
-
data.fileName = config.fileName;
|
|
35
|
-
data.directoryPath = typeof config.directoryPath === 'string' ?
|
|
36
|
-
path_1.default.isAbsolute(config.directoryPath) ? config.directoryPath : path_1.default.join(process.cwd(), config.directoryPath) :
|
|
37
|
-
process.cwd();
|
|
38
|
-
return data;
|
|
39
39
|
}
|
|
40
40
|
exports.buildCacheConfig = buildCacheConfig;
|
|
41
41
|
function buildFileHash(sourceFilesSize) {
|
|
42
42
|
const hash = crypto_1.default.createHash('sha256');
|
|
43
|
-
const strSize = (sourceFilesSize
|
|
43
|
+
const strSize = (sourceFilesSize !== null && sourceFilesSize !== void 0 ? sourceFilesSize : 0).toString();
|
|
44
44
|
hash.update(strSize);
|
|
45
45
|
return hash.digest('hex');
|
|
46
46
|
}
|
package/dist/cache/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cache/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAGH,gDAAwB;AACxB,oDAA4B;AAE5B,SAAgB,gBAAgB,CAAC,MAAiD
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cache/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAGH,gDAAwB;AACxB,oDAA4B;AAE5B,SAAgB,gBAAgB,CAAC,MAAiD;;IAC9E,IAAG,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC3B,MAAM,GAAG;YACL,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,MAAM;SACxB,CAAA;KACJ;IAED,IAAG,OAAO,MAAM,KAAK,SAAS,EAAE;QAC5B,MAAM,GAAG;YACL,OAAO,EAAE,MAAM;SAClB,CAAA;KACJ;IAED,MAAM,aAAN,MAAM,cAAN,MAAM,IAAN,MAAM,GAAK,EAAE,EAAC;IAEd,0BAA0B;IAC1B,MAAM,iBAAiB,GAAa,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC;IAE9F,OAAO;QACH,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,aAAa,EAAE,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;YACrD,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;YAC/G,OAAO,CAAC,GAAG,EAAE;QACjB,OAAO,EAAE,MAAA,MAAM,CAAC,OAAO,mCAAI,KAAK;QAChC,aAAa,EAAE,MAAA,MAAM,CAAC,aAAa,mCAAI,CAAC,iBAAiB;KAC5D,CAAC;AACN,CAAC;AA3BD,4CA2BC;AAED,SAAgB,aAAa,CAAC,eAAwB;IAClD,MAAM,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEzC,MAAM,OAAO,GAAW,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE1D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AARD,sCAQC"}
|
|
@@ -7,15 +7,14 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.DecoratorMapper = void 0;
|
|
10
|
-
const
|
|
10
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
11
11
|
const representation_1 = require("../representation");
|
|
12
|
-
const
|
|
13
|
-
const
|
|
12
|
+
const utils_1 = require("./utils");
|
|
13
|
+
const utils_2 = require("../utils");
|
|
14
14
|
class DecoratorMapper {
|
|
15
|
-
config;
|
|
16
|
-
mapping = {};
|
|
17
15
|
constructor(config) {
|
|
18
16
|
this.config = config;
|
|
17
|
+
this.mapping = {};
|
|
19
18
|
this.aggregate();
|
|
20
19
|
}
|
|
21
20
|
setConfig(config) {
|
|
@@ -29,10 +28,10 @@ class DecoratorMapper {
|
|
|
29
28
|
* @param data
|
|
30
29
|
*/
|
|
31
30
|
match(type, data) {
|
|
32
|
-
if (!(0,
|
|
31
|
+
if (!(0, metadata_utils_1.hasOwnProperty)(this.mapping, type)) {
|
|
33
32
|
return undefined;
|
|
34
33
|
}
|
|
35
|
-
const decorators = Array.isArray(data) ? data : (0,
|
|
34
|
+
const decorators = Array.isArray(data) ? data : (0, utils_2.getNodeDecorators)(data);
|
|
36
35
|
const representations = (Array.isArray(this.mapping[type]) ? this.mapping[type] : [this.mapping[type]]);
|
|
37
36
|
for (let i = 0; i < representations.length; i++) {
|
|
38
37
|
const items = decorators.filter(decorator => decorator.text === representations[i].id);
|
|
@@ -50,11 +49,11 @@ class DecoratorMapper {
|
|
|
50
49
|
}
|
|
51
50
|
const items = [];
|
|
52
51
|
// mapping - internal
|
|
53
|
-
const internalMap = (0,
|
|
52
|
+
const internalMap = (0, utils_1.getDecoratorMap)('internal');
|
|
54
53
|
items.push(typeof this.config.internal === 'undefined' ?
|
|
55
54
|
internalMap :
|
|
56
|
-
(0,
|
|
57
|
-
return (0,
|
|
55
|
+
(0, utils_1.reduceTypeRepresentationMapping)(internalMap, (type) => {
|
|
56
|
+
return (0, utils_1.isMappingTypeIncluded)(type, this.config.internal);
|
|
58
57
|
}));
|
|
59
58
|
// mapping - extension
|
|
60
59
|
if (typeof this.config.map !== 'undefined') {
|
|
@@ -68,13 +67,13 @@ class DecoratorMapper {
|
|
|
68
67
|
const libraries = Array.isArray(this.config.library) ?
|
|
69
68
|
this.config.library :
|
|
70
69
|
[this.config.library];
|
|
71
|
-
items.push(...libraries.map(library => (0,
|
|
70
|
+
items.push(...libraries.map(library => (0, utils_1.getDecoratorMap)(library)));
|
|
72
71
|
}
|
|
73
72
|
else {
|
|
74
73
|
// tslint:disable-next-line:forin
|
|
75
74
|
for (const key in this.config.library) {
|
|
76
|
-
items.push((0,
|
|
77
|
-
return (0,
|
|
75
|
+
items.push((0, utils_1.reduceTypeRepresentationMapping)((0, utils_1.getDecoratorMap)(key), (type) => {
|
|
76
|
+
return (0, utils_1.isMappingTypeIncluded)(type, this.config.library[key]);
|
|
78
77
|
}));
|
|
79
78
|
}
|
|
80
79
|
}
|
|
@@ -97,7 +96,7 @@ class DecoratorMapper {
|
|
|
97
96
|
for (let i = 0; i < keys.length; i++) {
|
|
98
97
|
const representations = [];
|
|
99
98
|
for (let j = 0; j < mappings.length; j++) {
|
|
100
|
-
if ((0,
|
|
99
|
+
if ((0, metadata_utils_1.hasOwnProperty)(mappings[j], keys[i])) {
|
|
101
100
|
const value = mappings[j][keys[i]];
|
|
102
101
|
if (typeof value === 'undefined') {
|
|
103
102
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorator/mapper/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorator/mapper/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.getDecoratorMap = exports.isMappingTypeIncluded = exports.reduceTypeRepresentationMapping = void 0;
|
|
10
|
-
const
|
|
10
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
11
11
|
/**
|
|
12
12
|
*
|
|
13
13
|
*
|
|
@@ -45,7 +45,7 @@ function isMappingTypeIncluded(type, config) {
|
|
|
45
45
|
case '[object Array]':
|
|
46
46
|
return config.indexOf(type) !== -1;
|
|
47
47
|
case '[object Object]':
|
|
48
|
-
return (0,
|
|
48
|
+
return (0, metadata_utils_1.hasOwnProperty)(config, type) && config[type];
|
|
49
49
|
}
|
|
50
50
|
/* istanbul ignore next */
|
|
51
51
|
return false;
|
|
@@ -53,7 +53,7 @@ function isMappingTypeIncluded(type, config) {
|
|
|
53
53
|
exports.isMappingTypeIncluded = isMappingTypeIncluded;
|
|
54
54
|
let decoratorMap = {};
|
|
55
55
|
function getDecoratorMap(name) {
|
|
56
|
-
if ((0,
|
|
56
|
+
if ((0, metadata_utils_1.hasOwnProperty)(decoratorMap, name)) {
|
|
57
57
|
return decoratorMap[name];
|
|
58
58
|
}
|
|
59
59
|
const content = loadDecoratorMap(name);
|
|
@@ -64,7 +64,7 @@ exports.getDecoratorMap = getDecoratorMap;
|
|
|
64
64
|
/* istanbul ignore next */
|
|
65
65
|
function loadDecoratorMap(library) {
|
|
66
66
|
const exp = require(`./maps/${library}`);
|
|
67
|
-
if ((0,
|
|
67
|
+
if ((0, metadata_utils_1.hasOwnProperty)(exp, 'default')) {
|
|
68
68
|
return exp.default;
|
|
69
69
|
}
|
|
70
70
|
/* istanbul ignore next */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/decorator/mapper/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/decorator/mapper/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,0DAAqD;AAGrD;;;;;GAKG;AACH,SAAgB,+BAA+B,CAC3C,OAAiD,EACjD,OAA0C;IAE1C,MAAM,WAAW,GAAsB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAsB,CAAC;IACjF,MAAM,YAAY,GAAqB,WAAW;SAC7C,MAAM,CAAC,OAAO,CAAC,CAAC;IAErB,IAAI,WAAW,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE;QAC5C,OAAO,OAAO,CAAC;KAClB;IAED,MAAM,MAAM,GAA6C,EAAE,CAAC;IAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,aAAa;QACb,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACtD;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAnBD,0EAmBC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CACjC,IAAoB,EACpB,MAA0C;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3D,QAAQ,WAAW,EAAE;QACjB,KAAK,kBAAkB;YACnB,OAAO,CAAC,CAAC,MAAM,CAAC;QACpB,KAAK,iBAAiB;YAClB,OAAQ,MAAiB,KAAK,IAAI,CAAC;QACvC,KAAK,gBAAgB;YACjB,OAAQ,MAAsC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACxE,KAAK,iBAAiB;YAClB,OAAO,IAAA,+BAAc,EAAE,MAA0C,EAAE,IAAI,CAAC,IAAK,MAA0C,CAAC,IAAI,CAAC,CAAC;KACrI;IAED,0BAA0B;IAC1B,OAAO,KAAK,CAAC;AACjB,CAAC;AAlBD,sDAkBC;AAED,IAAI,YAAY,GAA8D,EAAE,CAAC;AAEjF,SAAgB,eAAe,CAAC,IAAY;IACxC,IAAG,IAAA,+BAAc,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE;QACnC,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;KAC7B;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEtC,YAAyE,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IAE3F,OAAO,OAAO,CAAC;AACnB,CAAC;AAVD,0CAUC;AAED,0BAA0B;AAC1B,SAAS,gBAAgB,CAAC,OAAe;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;IAEzC,IAAG,IAAA,+BAAc,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE;QAC/B,OAAO,GAAG,CAAC,OAAO,CAAC;KACtB;IAED,0BAA0B;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -7,15 +7,13 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.RepresentationManager = void 0;
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
11
|
+
const utils_1 = require("./property/utils");
|
|
12
12
|
class RepresentationManager {
|
|
13
|
-
representation;
|
|
14
|
-
decorators;
|
|
15
|
-
extendedProperties = {};
|
|
16
13
|
constructor(representation, decorators) {
|
|
17
14
|
this.representation = representation;
|
|
18
15
|
this.decorators = decorators;
|
|
16
|
+
this.extendedProperties = {};
|
|
19
17
|
}
|
|
20
18
|
// -------------------------------------------
|
|
21
19
|
/**
|
|
@@ -31,7 +29,7 @@ class RepresentationManager {
|
|
|
31
29
|
let decorator;
|
|
32
30
|
if (typeof decoratorOrIndex === 'number' ||
|
|
33
31
|
typeof decoratorOrIndex === 'undefined') {
|
|
34
|
-
decoratorOrIndex = decoratorOrIndex
|
|
32
|
+
decoratorOrIndex = decoratorOrIndex !== null && decoratorOrIndex !== void 0 ? decoratorOrIndex : 0;
|
|
35
33
|
if (decoratorOrIndex < 0 || decoratorOrIndex >= this.decorators.length) {
|
|
36
34
|
return undefined;
|
|
37
35
|
}
|
|
@@ -40,22 +38,22 @@ class RepresentationManager {
|
|
|
40
38
|
else {
|
|
41
39
|
decorator = decoratorOrIndex;
|
|
42
40
|
}
|
|
43
|
-
return (0,
|
|
41
|
+
return (0, utils_1.extractRepresentationPropertyValue)(decorator, config);
|
|
44
42
|
}
|
|
45
43
|
// -------------------------------------------
|
|
46
44
|
getPropertyConfiguration(type) {
|
|
47
|
-
if (!(0,
|
|
45
|
+
if (!(0, metadata_utils_1.hasOwnProperty)(this.representation.properties, type)) {
|
|
48
46
|
return undefined;
|
|
49
47
|
}
|
|
50
48
|
return this.extendProperty(type);
|
|
51
49
|
}
|
|
52
50
|
// -------------------------------------------
|
|
53
51
|
extendProperty(type) {
|
|
54
|
-
if ((0,
|
|
52
|
+
if ((0, metadata_utils_1.hasOwnProperty)(this.extendedProperties, type)) {
|
|
55
53
|
return this.extendedProperties[type];
|
|
56
54
|
}
|
|
57
55
|
const property = this.representation.properties[type];
|
|
58
|
-
this.extendedProperties[type] = (0,
|
|
56
|
+
this.extendedProperties[type] = (0, utils_1.extendRepresentationPropertyConfig)(property);
|
|
59
57
|
return this.extendedProperties[type];
|
|
60
58
|
}
|
|
61
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorator/representation/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorator/representation/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,0DAAqD;AAErD,4CAAwG;AAGxG,MAAa,qBAAqB;IAG9B,YACc,cAA2C,EAC9C,UAA4B;QADzB,mBAAc,GAAd,cAAc,CAA6B;QAC9C,eAAU,GAAV,UAAU,CAAkB;QAJ7B,uBAAkB,GAA+E,EAAE,CAAC;IAO9G,CAAC;IAED,8CAA8C;IAE9C;;;;OAIG;IACI,gBAAgB,CACnB,IAAO,EACP,gBAA0C;QAE1C,MAAM,MAAM,GAAwB,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxE,IAAG,OAAO,MAAM,KAAK,WAAW,EAAE;YAC9B,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,SAA0B,CAAC;QAE/B,IACI,OAAO,gBAAgB,KAAK,QAAQ;YACpC,OAAO,gBAAgB,KAAK,WAAW,EACzC;YACE,gBAAgB,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CAAC;YACzC,IAAI,gBAAgB,GAAG,CAAC,IAAI,gBAAgB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBACpE,OAAO,SAAS,CAAC;aACpB;YAED,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;SACjD;aAAM;YACH,SAAS,GAAG,gBAAgB,CAAC;SAChC;QAED,OAAO,IAAA,0CAAkC,EAAO,SAAS,EAAE,MAAM,CAAC,CAAC;IACvE,CAAC;IAED,8CAA8C;IAEvC,wBAAwB,CAAC,IAAwC;QACpE,IAAG,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE;YACtD,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,8CAA8C;IAEpC,cAAc,CAA+C,IAAO;QAC1E,IAAG,IAAA,+BAAc,EAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SACxC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,IAAA,0CAAkC,EAAC,QAAQ,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAEzC,CAAC;CACJ;AApED,sDAoEC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.mergeArrayArguments = exports.mergeObjectArguments = exports.extractRepresentationPropertyValue = exports.extendRepresentationPropertyConfig = void 0;
|
|
10
|
-
const
|
|
10
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
11
11
|
const resolver_1 = require("../../../resolver");
|
|
12
12
|
function extendRepresentationPropertyConfig(property) {
|
|
13
13
|
if (typeof property.isType === 'undefined') {
|
|
@@ -27,6 +27,7 @@ function extendRepresentationPropertyConfig(property) {
|
|
|
27
27
|
}
|
|
28
28
|
exports.extendRepresentationPropertyConfig = extendRepresentationPropertyConfig;
|
|
29
29
|
function extractRepresentationPropertyValue(decorator, config) {
|
|
30
|
+
var _a, _b, _c;
|
|
30
31
|
let items = [];
|
|
31
32
|
switch (config.srcArgumentType) {
|
|
32
33
|
case 'typeArgument':
|
|
@@ -39,8 +40,8 @@ function extractRepresentationPropertyValue(decorator, config) {
|
|
|
39
40
|
if (!config.isType) {
|
|
40
41
|
items = extractValueFromArgumentType(items);
|
|
41
42
|
}
|
|
42
|
-
const srcPosition = config.srcPosition
|
|
43
|
-
const srcAmount = config.srcAmount
|
|
43
|
+
const srcPosition = (_a = config.srcPosition) !== null && _a !== void 0 ? _a : 0;
|
|
44
|
+
const srcAmount = (_b = config.srcAmount) !== null && _b !== void 0 ? _b : 1;
|
|
44
45
|
if (items.length <= srcPosition) {
|
|
45
46
|
switch (config.type) {
|
|
46
47
|
case 'element':
|
|
@@ -53,7 +54,7 @@ function extractRepresentationPropertyValue(decorator, config) {
|
|
|
53
54
|
if (data.length === 0) {
|
|
54
55
|
return (config.type === 'array' ? [] : undefined);
|
|
55
56
|
}
|
|
56
|
-
const srcStrategy = config.srcStrategy
|
|
57
|
+
const srcStrategy = (_c = config.srcStrategy) !== null && _c !== void 0 ? _c : 'none';
|
|
57
58
|
switch (srcStrategy) {
|
|
58
59
|
case "merge":
|
|
59
60
|
switch (config.type) {
|
|
@@ -108,7 +109,7 @@ exports.mergeArrayArguments = mergeArrayArguments;
|
|
|
108
109
|
function extractValueFromArgumentType(argument) {
|
|
109
110
|
const values = [];
|
|
110
111
|
for (let i = 0; i < argument.length; i++) {
|
|
111
|
-
if (!(0,
|
|
112
|
+
if (!(0, metadata_utils_1.hasOwnProperty)(argument[i], 'kind')) {
|
|
112
113
|
values.push(argument[i]);
|
|
113
114
|
continue;
|
|
114
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/decorator/representation/property/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAKH,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/decorator/representation/property/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.useDecoratorConfigValidator = void 0;
|
|
10
10
|
const yup_1 = require("yup");
|
|
11
|
-
const
|
|
11
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
12
12
|
let validatorInstance;
|
|
13
13
|
function useDecoratorConfigValidator() {
|
|
14
14
|
if (typeof validatorInstance !== 'undefined') {
|
|
@@ -26,7 +26,7 @@ function useDecoratorConfigValidator() {
|
|
|
26
26
|
}
|
|
27
27
|
if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
28
28
|
// todo: setup type key check :)
|
|
29
|
-
return (0, yup_1.object)((0,
|
|
29
|
+
return (0, yup_1.object)((0, metadata_utils_1.mapYupRuleForDictionary)(value, (0, yup_1.boolean)())).optional().default({});
|
|
30
30
|
}
|
|
31
31
|
return (0, yup_1.mixed)().optional().default(undefined);
|
|
32
32
|
});
|
|
@@ -39,7 +39,7 @@ function useDecoratorConfigValidator() {
|
|
|
39
39
|
}
|
|
40
40
|
if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
41
41
|
// todo: setup library key check :)
|
|
42
|
-
return (0, yup_1.object)((0,
|
|
42
|
+
return (0, yup_1.object)((0, metadata_utils_1.mapYupRuleForDictionary)(value, configMappingOptionValidator));
|
|
43
43
|
}
|
|
44
44
|
return (0, yup_1.mixed)().optional().default(undefined);
|
|
45
45
|
});
|
|
@@ -56,14 +56,14 @@ function useDecoratorConfigValidator() {
|
|
|
56
56
|
id: (0, yup_1.string)().required(),
|
|
57
57
|
properties: (0, yup_1.lazy)(value => {
|
|
58
58
|
if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
59
|
-
return (0, yup_1.object)((0,
|
|
59
|
+
return (0, yup_1.object)((0, metadata_utils_1.mapYupRuleForDictionary)(value, representationPropertyValidator)).optional().default({});
|
|
60
60
|
}
|
|
61
61
|
return (0, yup_1.mixed)().optional().default(undefined);
|
|
62
62
|
})
|
|
63
63
|
});
|
|
64
64
|
const overrideValidator = (0, yup_1.lazy)(value => {
|
|
65
65
|
if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
66
|
-
return (0, yup_1.object)((0,
|
|
66
|
+
return (0, yup_1.object)((0, metadata_utils_1.mapYupRuleForDictionary)(value, (0, yup_1.lazy)(val => {
|
|
67
67
|
if (Array.isArray(val)) {
|
|
68
68
|
return (0, yup_1.array)().of(representationValidator);
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/decorator/utils/validator.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/decorator/utils/validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ const typescript_1 = require("typescript");
|
|
|
11
11
|
const endpoint_1 = require("./endpoint");
|
|
12
12
|
const method_1 = require("./method");
|
|
13
13
|
class ControllerGenerator extends endpoint_1.EndpointGenerator {
|
|
14
|
-
genMethods = new Set();
|
|
15
14
|
// --------------------------------------------------------------------
|
|
16
15
|
constructor(node, current) {
|
|
17
16
|
super(node, current);
|
|
17
|
+
this.genMethods = new Set();
|
|
18
18
|
this.generatePath('CLASS_PATH');
|
|
19
19
|
}
|
|
20
20
|
isValid() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/generator/controller.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA2E;AAC3E,yCAA6C;AAE7C,qCAAyC;AAGzC,MAAa,mBAAoB,SAAQ,4BAAmC;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/generator/controller.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA2E;AAC3E,yCAA6C;AAE7C,qCAAyC;AAGzC,MAAa,mBAAoB,SAAQ,4BAAmC;IAGxE,uEAAuE;IAEvE,YAAY,IAAsB,EAAE,OAA0B;QAC1D,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QALjB,eAAU,GAAgB,IAAI,GAAG,EAAU,CAAC;QAOhD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACpC,CAAC;IACM,OAAO;QACV,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;SAAE;QACxG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAAE;QAExF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAEpD,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;YAC5B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;YAC5B,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE;YAC/B,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;YACrB,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;YAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;YAC9B,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;SACvB,CAAC;IACN,CAAC;IAES,kBAAkB;QACxB,OAAQ,IAAI,CAAC,IAAyB,CAAC,IAAI,CAAC,IAAI,CAAC;IACrD,CAAC;IAEO,YAAY;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;aACnB,MAAM,CAAC,CAAC,MAA0B,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,uBAAU,CAAC,iBAAiB,CAAC,CAAC;aACtF,MAAM,CAAC,CAAC,MAAyB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,MAAyB,EAAE,EAAE,CAAC,IAAI,wBAAe,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;aAC7F,MAAM,CAAC,CAAC,SAA0B,EAAE,EAAE;YACnC,IAAI,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,EAAE;gBACxE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;gBAC/C,OAAO,IAAI,CAAC;aACf;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,SAA0B,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnE,CAAC;CACJ;AAnDD,kDAmDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ArrayLiteralExpression, Node } from 'typescript';
|
|
2
|
-
import { Decorator } from "../decorator
|
|
2
|
+
import { Decorator } from "../decorator";
|
|
3
3
|
import { MetadataGenerator } from './index';
|
|
4
4
|
import { Response } from "../type";
|
|
5
5
|
export declare abstract class EndpointGenerator<T extends Node> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../../src/generator/endpoint.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,sBAAsB,EAA4B,IAAI,
|
|
1
|
+
{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../../src/generator/endpoint.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,sBAAsB,EAA4B,IAAI,EAAW,MAAM,YAAY,CAAC;AAG5F,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAG1C,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAGjC,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,IAAI;IAMnB,SAAS,CAAC,OAAO,EAAE,iBAAiB;IALnE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAIlB,SAAS,aAAa,IAAI,EAAE,CAAC,EAAY,OAAO,EAAE,iBAAiB;IAMnE,SAAS,CAAC,YAAY,CAClB,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,GAC1D,IAAI;IAgBR,SAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,GAAE,OAAe,GAAI,GAAG,EAAE;IAuB5F,SAAS,CAAC,WAAW;;;;IAcrB,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,EAAE;IAWtE,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAI,OAAO,EAAE;IAoBrD,SAAS,CAAC,YAAY,IAAI,QAAQ,EAAE;IA+B7B,WAAW,IAAK,MAAM,EAAE;IAcxB,WAAW,IAAK,MAAM,EAAE;IAgBxB,OAAO,IAAK,MAAM,EAAE;IAkB3B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,IAAI,MAAM;IAIxC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAI,OAAO;IAI9B,YAAY,CAAC,IAAI,EAAE,IAAI,GAAI,OAAO;CAO5C"}
|
|
@@ -8,14 +8,11 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.EndpointGenerator = void 0;
|
|
10
10
|
const typescript_1 = require("typescript");
|
|
11
|
-
const
|
|
11
|
+
const metadata_utils_1 = require("@trapi/metadata-utils");
|
|
12
12
|
const resolver_1 = require("../resolver");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const utils_1 = require("../utils");
|
|
14
|
+
const decorator_1 = require("../decorator");
|
|
15
15
|
class EndpointGenerator {
|
|
16
|
-
current;
|
|
17
|
-
path;
|
|
18
|
-
node;
|
|
19
16
|
// -------------------------------------------
|
|
20
17
|
constructor(node, current) {
|
|
21
18
|
this.current = current;
|
|
@@ -31,11 +28,11 @@ class EndpointGenerator {
|
|
|
31
28
|
values.push(value);
|
|
32
29
|
}
|
|
33
30
|
}
|
|
34
|
-
this.path = (0,
|
|
31
|
+
this.path = (0, metadata_utils_1.normalizePath)(values.join('/'));
|
|
35
32
|
}
|
|
36
33
|
// --------------------------------------------------------------------
|
|
37
34
|
getDecoratorValues(decoratorName, acceptMultiple = false) {
|
|
38
|
-
const decorators = (0,
|
|
35
|
+
const decorators = (0, decorator_1.getNodeDecorators)(this.node, decorator => decorator.text === decoratorName);
|
|
39
36
|
if (!decorators || !decorators.length) {
|
|
40
37
|
return [];
|
|
41
38
|
}
|
|
@@ -155,7 +152,7 @@ class EndpointGenerator {
|
|
|
155
152
|
return typeof this.current.decoratorMapper.match('HIDDEN', node) !== 'undefined';
|
|
156
153
|
}
|
|
157
154
|
isDeprecated(node) {
|
|
158
|
-
if ((0,
|
|
155
|
+
if ((0, utils_1.isExistJSDocTag)(node, tag => tag.tagName.text === 'deprecated')) {
|
|
159
156
|
return true;
|
|
160
157
|
}
|
|
161
158
|
return typeof this.current.decoratorMapper.match('DEPRECATED', node) !== 'undefined';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../src/generator/endpoint.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,YAAY,CAAC;;;AAEb,
|
|
1
|
+
{"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../src/generator/endpoint.ts"],"names":[],"mappings":"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"}
|
package/dist/generator/index.js
CHANGED
|
@@ -15,17 +15,11 @@ const resolver_1 = require("../resolver");
|
|
|
15
15
|
const driver_1 = require("../cache/driver");
|
|
16
16
|
const minimatch = require("minimatch");
|
|
17
17
|
class MetadataGenerator {
|
|
18
|
-
nodes = new Array();
|
|
19
|
-
typeChecker;
|
|
20
|
-
decoratorMapper;
|
|
21
|
-
config;
|
|
22
|
-
program;
|
|
23
|
-
cache;
|
|
24
|
-
controllers;
|
|
25
|
-
referenceTypes = {};
|
|
26
|
-
circularDependencyResolvers = new Array();
|
|
27
18
|
// -------------------------------------------------------------------------
|
|
28
19
|
constructor(config, compilerOptions) {
|
|
20
|
+
this.nodes = new Array();
|
|
21
|
+
this.referenceTypes = {};
|
|
22
|
+
this.circularDependencyResolvers = new Array();
|
|
29
23
|
this.config = config;
|
|
30
24
|
this.cache = new driver_1.CacheDriver(config.cache);
|
|
31
25
|
this.decoratorMapper = new mapper_1.DecoratorMapper(config.decorator);
|