@rxap/ts-morph 1.1.0-dev.20 → 1.1.0-dev.22
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 +19 -0
- package/README.md +1 -1
- package/package.json +4 -4
- package/src/lib/angular/build-route-object.d.ts +3 -0
- package/src/lib/angular/build-route-object.js +27 -0
- package/src/lib/angular/build-route-object.js.map +1 -1
- package/src/lib/angular/coerce-component.d.ts +1 -1
- package/src/lib/angular/coerce-component.js +13 -9
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/coerce-array-element.js +6 -1
- package/src/lib/coerce-array-element.js.map +1 -1
- package/src/lib/nest/coerce-nest-app-config.js +14 -1
- package/src/lib/nest/coerce-nest-app-config.js.map +1 -1
- package/src/lib/nest/coerce-nest-cache-module-import.js +1 -0
- package/src/lib/nest/coerce-nest-cache-module-import.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
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.22](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.21...@rxap/ts-morph@1.1.0-dev.22) (2024-03-31)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure default string value is wrapped in quotes ([2d16467](https://gitlab.com/rxap/packages/commit/2d16467015b36db9a67e9655961a961a576ef47f))
|
|
11
|
+
- import CacheModule as global module ([fe1b28e](https://gitlab.com/rxap/packages/commit/fe1b28e86aa282c4e06968e36328bc30d1283133))
|
|
12
|
+
|
|
13
|
+
# [1.1.0-dev.21](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.20...@rxap/ts-morph@1.1.0-dev.21) (2024-03-23)
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
- normalize the insert at instead to 0 if negative ([11161d8](https://gitlab.com/rxap/packages/commit/11161d86fe48c6314c7fcea3389a7d67a7c7e809))
|
|
18
|
+
- skip component selector if false ([d7d3bed](https://gitlab.com/rxap/packages/commit/d7d3bed5c74e204810132452d969c29e76d9f265))
|
|
19
|
+
- support component routes ([6431132](https://gitlab.com/rxap/packages/commit/64311320d13db6e96699613b30ffbb336388f9bf))
|
|
20
|
+
|
|
21
|
+
### Features
|
|
22
|
+
|
|
23
|
+
- support route outlet and data ([ce4dec6](https://gitlab.com/rxap/packages/commit/ce4dec6008f77a8482a50d53c6b450522d64451c))
|
|
24
|
+
|
|
6
25
|
# [1.1.0-dev.20](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.19...@rxap/ts-morph@1.1.0-dev.20) (2024-03-15)
|
|
7
26
|
|
|
8
27
|
### Bug Fixes
|
package/README.md
CHANGED
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.1.0-dev.
|
|
2
|
+
"version": "1.1.0-dev.22",
|
|
3
3
|
"name": "@rxap/ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"tslib": "2.6.2"
|
|
7
7
|
},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
9
|
+
"@rxap/utilities": "^16.1.0-dev.8",
|
|
10
10
|
"ts-morph": "^18.0.0",
|
|
11
11
|
"tslib": "2.6.2"
|
|
12
12
|
},
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"packageGroup": [
|
|
31
31
|
{
|
|
32
32
|
"package": "@rxap/utilities",
|
|
33
|
-
"version": "16.1.0-dev.
|
|
33
|
+
"version": "16.1.0-dev.8"
|
|
34
34
|
}
|
|
35
35
|
]
|
|
36
36
|
},
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"directory": "packages/ts-morph"
|
|
45
45
|
},
|
|
46
46
|
"type": "commonjs",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "88bb83e5ae16a958b2618d657587390058b48a3f",
|
|
48
48
|
"main": "./src/index.js",
|
|
49
49
|
"types": "./src/index.d.ts"
|
|
50
50
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { WriterFunction } from 'ts-morph';
|
|
2
2
|
export interface AngularRoute {
|
|
3
3
|
path: string;
|
|
4
|
+
component?: string;
|
|
4
5
|
loadChildren?: string | {
|
|
5
6
|
import: string;
|
|
6
7
|
then: string;
|
|
@@ -9,5 +10,7 @@ export interface AngularRoute {
|
|
|
9
10
|
import: string;
|
|
10
11
|
then: string;
|
|
11
12
|
};
|
|
13
|
+
outlet?: string | null;
|
|
14
|
+
data?: Record<string, any> | null;
|
|
12
15
|
}
|
|
13
16
|
export declare function BuildRouteObject(route: AngularRoute): WriterFunction;
|
|
@@ -22,6 +22,33 @@ function BuildRouteObject(route) {
|
|
|
22
22
|
obj['loadComponent'] = `() => import('${route.loadComponent.import}').then((m) => m.${route.loadComponent.then})`;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
+
else if (route.component) {
|
|
26
|
+
obj['component'] = route.component;
|
|
27
|
+
}
|
|
28
|
+
if (route.outlet) {
|
|
29
|
+
obj['outlet'] = w => w.quote(route.outlet);
|
|
30
|
+
}
|
|
31
|
+
if (route.data) {
|
|
32
|
+
obj['data'] = ts_morph_1.Writers.object(Object.entries(route.data)
|
|
33
|
+
.reduce((acc, [key, value]) => {
|
|
34
|
+
if (['true', 'false'].includes(value) || typeof value === 'boolean') {
|
|
35
|
+
if (typeof value === 'string') {
|
|
36
|
+
acc[key] = w => w.quote(value);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
acc[key] = value ? 'true' : 'false';
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (typeof value === 'number') {
|
|
43
|
+
acc[key] = value.toString();
|
|
44
|
+
}
|
|
45
|
+
if (!isNaN(Number(value))) {
|
|
46
|
+
acc[key] = value;
|
|
47
|
+
}
|
|
48
|
+
acc[key] = w => w.quote(value);
|
|
49
|
+
return acc;
|
|
50
|
+
}, {}));
|
|
51
|
+
}
|
|
25
52
|
return ts_morph_1.Writers.object(obj);
|
|
26
53
|
}
|
|
27
54
|
exports.BuildRouteObject = BuildRouteObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-route-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/build-route-object.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;
|
|
1
|
+
{"version":3,"file":"build-route-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/build-route-object.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAWlB,SAAgB,gBAAgB,CAAC,KAAmB;IAClD,MAAM,GAAG,GAA4C;QACnD,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;KAC/B,CAAC;IACF,IAAI,KAAK,CAAC,YAAY,EAAE;QACtB,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE;YAC1C,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAkB,KAAK,CAAC,YAAa,IAAI,CAAC;SACjE;aAAM;YACL,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAkB,KAAK,CAAC,YAAY,CAAC,MAAO,oBAAqB,KAAK,CAAC,YAAY,CAAC,IAAK,GAAG,CAAC;SACpH;KACF;IACD,IAAI,KAAK,CAAC,aAAa,EAAE;QACvB,IAAI,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ,EAAE;YAC3C,GAAG,CAAC,eAAe,CAAC,GAAG,iBAAkB,KAAK,CAAC,aAAc,IAAI,CAAC;SACnE;aAAM;YACL,GAAG,CAAC,eAAe,CAAC,GAAG,iBAAkB,KAAK,CAAC,aAAa,CAAC,MAAO,oBAAqB,KAAK,CAAC,aAAa,CAAC,IAAK,GAAG,CAAC;SACvH;KACF;SAAM,IAAI,KAAK,CAAC,SAAS,EAAE;QAC1B,GAAG,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;KACpC;IACD,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;KAC7C;IACD,IAAI,KAAK,CAAC,IAAI,EAAE;QACd,GAAG,CAAC,MAAM,CAAC,GAAG,kBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;aACpD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAE,GAAG,EAAE,KAAK,CAAE,EAAE,EAAE;YAC9B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;gBACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC7B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBAChC;qBAAM;oBACL,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;iBACrC;aACF;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;aAC7B;YACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACzB,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAClB;YACD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAA6C,CAAC,CAAC,CAAC;KACtD;IACD,OAAO,kBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AA5CD,4CA4CC"}
|
|
@@ -11,15 +11,17 @@ function CoerceComponent(sourceFile, name, options = {}, classStructure = {}) {
|
|
|
11
11
|
const className = (0, utilities_1.classify)((0, utilities_1.CoerceSuffix)((0, utilities_1.dasherize)(name), '-component'));
|
|
12
12
|
const { prefix, changeDetection, } = options;
|
|
13
13
|
let { selector, template, templateUrl, styles, styleUrls, } = options;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
if (
|
|
17
|
-
|
|
14
|
+
if (selector !== false) {
|
|
15
|
+
selector !== null && selector !== void 0 ? selector : (selector = prefix ? `${prefix}-${(0, utilities_1.dasherize)(name)}` : (0, utilities_1.dasherize)(name));
|
|
16
|
+
if (selector.includes('{{prefix}}')) {
|
|
17
|
+
if (!prefix) {
|
|
18
|
+
throw new Error(`The selector '${selector}' contains a template expression '{{prefix}}' but no prefix is provided`);
|
|
19
|
+
}
|
|
20
|
+
selector = selector.replace('{{prefix}}', prefix);
|
|
21
|
+
}
|
|
22
|
+
if (selector.match(/\{\{.*}}/)) {
|
|
23
|
+
throw new Error(`The selector '${selector}' contains an invalid templates expression`);
|
|
18
24
|
}
|
|
19
|
-
selector = selector.replace('{{prefix}}', prefix);
|
|
20
|
-
}
|
|
21
|
-
if (selector.match(/\{\{.*}}/)) {
|
|
22
|
-
throw new Error(`The selector '${selector}' contains an invalid templates expression`);
|
|
23
25
|
}
|
|
24
26
|
if (templateUrl === true || !template) {
|
|
25
27
|
template = undefined;
|
|
@@ -45,8 +47,10 @@ function CoerceComponent(sourceFile, name, options = {}, classStructure = {}) {
|
|
|
45
47
|
const classDeclaration = (0, coerce_class_1.CoerceClass)(sourceFile, className, classStructure);
|
|
46
48
|
const componentOptions = {
|
|
47
49
|
standalone: 'true',
|
|
48
|
-
selector: w => w.quote(selector),
|
|
49
50
|
};
|
|
51
|
+
if (selector) {
|
|
52
|
+
componentOptions['selector'] = w => w.quote(selector);
|
|
53
|
+
}
|
|
50
54
|
if (changeDetection) {
|
|
51
55
|
componentOptions['changeDetection'] = `ChangeDetectionStrategy.${changeDetection}`;
|
|
52
56
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;AAAA,+CAIyB;AACzB,uCAOkB;AAClB,kDAA8C;AAC9C,0DAAsD;AACtD,sDAAkD;AAkBlD,SAAgB,eAAe,CAC7B,UAAsB,EACtB,IAAY,EACZ,UAAkC,EAAE,EACpC,iBAAwE,EAAE;;IAE1E,MAAM,SAAS,GAAG,IAAA,oBAAQ,EAAC,IAAA,wBAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,MAAM,EACJ,MAAM,EACN,eAAe,GAChB,GAAG,OAAO,CAAC;IACZ,IAAI,EACF,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,MAAM,EACN,SAAS,GACV,GAAG,OAAO,CAAC;IAEZ,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,MAAM,CAAC,CAAC,CAAC,GAAI,MAAO,IAAK,IAAA,qBAAS,EAAC,IAAI,CAAE,EAAE,CAAC,CAAC,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAC;
|
|
1
|
+
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;AAAA,+CAIyB;AACzB,uCAOkB;AAClB,kDAA8C;AAC9C,0DAAsD;AACtD,sDAAkD;AAkBlD,SAAgB,eAAe,CAC7B,UAAsB,EACtB,IAAY,EACZ,UAAkC,EAAE,EACpC,iBAAwE,EAAE;;IAE1E,MAAM,SAAS,GAAG,IAAA,oBAAQ,EAAC,IAAA,wBAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,MAAM,EACJ,MAAM,EACN,eAAe,GAChB,GAAG,OAAO,CAAC;IACZ,IAAI,EACF,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,MAAM,EACN,SAAS,GACV,GAAG,OAAO,CAAC;IAEZ,IAAI,QAAQ,KAAK,KAAK,EAAE;QACtB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,MAAM,CAAC,CAAC,CAAC,GAAI,MAAO,IAAK,IAAA,qBAAS,EAAC,IAAI,CAAE,EAAE,CAAC,CAAC,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAC;QAC3E,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACnC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,iBAAkB,QAAS,yEAAyE,CAAC,CAAC;aACzG;YACD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACnD;QACD,IAAI,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,iBAAkB,QAAS,4CAA4C,CAAC,CAAC;SAC1F;KACF;IACD,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;QACrC,QAAQ,GAAG,SAAS,CAAC;QACrB,WAAW,GAAG,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,iBAAiB,CAAC;KACvD;IACD,IAAI,SAAS,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;QACjC,MAAM,GAAG,SAAS,CAAC;QACnB,SAAS,GAAG,CAAE,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,iBAAiB,CAAE,CAAC;KACzD;IACD,IAAI,CAAC,WAAW,EAAE;QAChB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,EAAE,EAAC;KACjB;IACD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,aAAN,MAAM,cAAN,MAAM,IAAN,MAAM,GAAK,IAAI,EAAC;KACjB;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,SAAS,GAAG,KAAM,SAAS,CAAC,IAAI,CAAC,SAAS,CAAE,IAAI,CAAC;KAClD;IACD,IAAI,SAAS,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,CAAC,GAAG,CAAC,CAAA,EAAE;QAC5C,SAAS,GAAG,IAAK,SAAU,GAAG,CAAC;KAChC;IAED,MAAA,cAAc,CAAC,UAAU,oCAAzB,cAAc,CAAC,UAAU,GAAK,IAAI,EAAC;IAEnC,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAE5E,MAAM,gBAAgB,GAA4C;QAChE,UAAU,EAAE,MAAM;KACnB,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAkB,CAAC,CAAC;KACjE;IAED,IAAI,eAAe,EAAE;QACnB,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,2BAA4B,eAAgB,EAAE,CAAC;QACrF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,WAAW,EAAE,yBAAyB,CAAE;YACxD,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;KACJ;IAED,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAS,CAAC,CAAC;KACxD;IAED,IAAI,WAAW,EAAE;QACf,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAqB,CAAC,CAAC;KACvE;IAED,IAAI,MAAM,EAAE;QACV,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;KACpD;IAED,IAAI,SAAS,EAAE;QACb,gBAAgB,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;KAC3C;IAED,MAAM,6BAA6B,GAAG,IAAA,kCAAe,EAAC,gBAAgB,EAAE,WAAW,EAAE;QACnF,SAAS,EAAE;YACT,kBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;SACjC;KACF,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,6BAA6B,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,IAAI,CAAC,wBAAwB,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,4DAA6D,SAAU,GAAG,CAAC,CAAC;KAC7F;IACD,IAAI,CAAC,CAAC,wBAAwB,YAAY,kCAAuB,CAAC,EAAE;QAClE,MAAM,IAAI,KAAK,CAAC,6CAA8C,SAAU,uCAAuC,CAAC,CAAC;KAClH;IAED,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AACxD,CAAC;AAxGD,0CAwGC"}
|
|
@@ -36,7 +36,12 @@ function CoerceArrayElement(array, element, findExisting, insertAt) {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
if (insertAt) {
|
|
39
|
-
|
|
39
|
+
const index = insertAt(array);
|
|
40
|
+
if (index < 0) {
|
|
41
|
+
console.warn('The insertAt function returned a negative index - normalizing to 0');
|
|
42
|
+
return array.insertElement(0, element);
|
|
43
|
+
}
|
|
44
|
+
return array.insertElement(index, element);
|
|
40
45
|
}
|
|
41
46
|
return array.addElement(element);
|
|
42
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-array-element.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-array-element.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,SAAgB,gCAAgC,CAAC,QAAgB,EAAE,KAAa;IAC9E,OAAO,CAAC,CAAa,EAAE,EAAE;QACvB,IAAI,CAAC,YAAY,kCAAuB,EAAE;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,6BAAkB,EAAE;gBACxC,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;gBAC3D,IAAI,CAAC,EAAE;oBACL,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,KAAK,CAAC;iBACrC;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAbD,4EAaC;AAED,SAAgB,0BAA0B,CAAC,OAAe;IACxD,OAAO,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;AAC3D,CAAC;AAFD,gEAEC;AAED,SAAgB,kBAAkB,CAChC,KAA6B,EAC7B,OAAgC,EAChC,YAAyC,EACzC,QAAoD;IAGpD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,YAAY,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;SACpD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC3F;KACF;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;QACnC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;YACnB,OAAO,CAAC,CAAC;SACV;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,KAAK,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"coerce-array-element.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-array-element.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,SAAgB,gCAAgC,CAAC,QAAgB,EAAE,KAAa;IAC9E,OAAO,CAAC,CAAa,EAAE,EAAE;QACvB,IAAI,CAAC,YAAY,kCAAuB,EAAE;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,6BAAkB,EAAE;gBACxC,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;gBAC3D,IAAI,CAAC,EAAE;oBACL,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,KAAK,CAAC;iBACrC;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAbD,4EAaC;AAED,SAAgB,0BAA0B,CAAC,OAAe;IACxD,OAAO,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;AAC3D,CAAC;AAFD,gEAEC;AAED,SAAgB,kBAAkB,CAChC,KAA6B,EAC7B,OAAgC,EAChC,YAAyC,EACzC,QAAoD;IAGpD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,YAAY,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;SACpD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC3F;KACF;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;QACnC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;YACnB,OAAO,CAAC,CAAC;SACV;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YACnF,OAAO,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACxC;QACD,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;KAC5C;IAED,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAEnC,CAAC;AAhCD,gDAgCC"}
|
|
@@ -65,7 +65,20 @@ function buildValidationSchemaExpressionValue(item) {
|
|
|
65
65
|
w.write(`Joi.${(_a = item.type) !== null && _a !== void 0 ? _a : 'string'}()`);
|
|
66
66
|
if (item.defaultValue) {
|
|
67
67
|
if (typeof item.defaultValue === 'string') {
|
|
68
|
-
|
|
68
|
+
if (item.type === 'string') {
|
|
69
|
+
w.write(`.default(`);
|
|
70
|
+
// wrap the string in single quotes if it is not already
|
|
71
|
+
if ((!item.defaultValue.startsWith("'") && !item.defaultValue.endsWith("'")) || (!item.defaultValue.startsWith('"') && !item.defaultValue.endsWith('"'))) {
|
|
72
|
+
w.quote(item.defaultValue);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
w.write(item.defaultValue);
|
|
76
|
+
}
|
|
77
|
+
w.write(`)`);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
w.write(`.default(${item.defaultValue})`);
|
|
81
|
+
}
|
|
69
82
|
}
|
|
70
83
|
else {
|
|
71
84
|
w.write('.default(');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,sDAAkD;AAClD,gFAA2E;AAc3E,SAAgB,mBAAmB,CAAC,UAAsB,EAAE,OAAmC;IAE7F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAExC,MAAM,sBAAsB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,kBAAkB,EAAE;QACvF,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,IAAI;KAClB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1B,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE;gBACZ,WAAW;aACZ;YACD,eAAe,EAAE,KAAK;SACvB;QACD;YACE,eAAe,EAAE,KAAK;YACtB,eAAe,EAAE,KAAK;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,yBAAyB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,mBAAmB,EAAE;QAC3F,WAAW,EAAE,8BAA8B;KAC5C,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,oBAAoB,EAAG,CAAC,aAAa,EAAE,CAAC;IAChF,MAAM,WAAW,GAAG,yBAAyB,CAAC,oBAAoB,EAAG,CAAC,aAAa,EAAE,CAAC;IAEtF,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,KAAK,IAAI,KAAK,GAAG,QAAQ,GAAG,CAAC,EAAE,KAAK,GAAG,WAAW,EAAE,KAAK,EAAE,EAAE;QAC3D,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;KACvD;IAED,MAAM,mBAAmB,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,mBAAmB,CAAC,CAAC;IAE5G,MAAM,2BAA2B,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEtH,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,MAAM,QAAQ,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;aACT,UAAU,CAAC,qBAAsB,IAAI,CAAC,IAAK,IAAI,CAAC,CAAC,CAAC;QACjH,IAAI,QAAQ,EAAE;YACZ,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,eAAe,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC;aACjE;SACF;aAAM;YACL,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC;SACjF;KACF;AAEH,CAAC;AAnDD,kDAmDC;AAGD,SAAS,+BAA+B,CAAC,IAAoC;IAC3E,OAAO,CAAC,CAAC,EAAE;QACT,CAAC,CAAC,KAAK,CAAC,qBAAsB,IAAI,CAAC,IAAK,OAAO,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oCAAoC,CAAC,IAAI,CAAC,CAAC;QAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChB;aAAM;YACL,KAAK,CAAC,CAAC,CAAC,CAAC;SACV;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAAC,IAAqD;IACjG,OAAO,CAAC,CAAC,EAAE;;QACT,CAAC,CAAC,KAAK,CAAC,OAAQ,MAAA,IAAI,CAAC,IAAI,mCAAI,QAAS,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE;gBACzC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;oBAC1B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBACrB,wDAAwD;oBACxD,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;wBACxJ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;qBAC5B;yBAAM;wBACL,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;qBAC5B;oBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACL,CAAC,CAAC,KAAK,CAAC,YAAa,IAAI,CAAC,YAAa,GAAG,CAAC,CAAC;iBAC7C;aACF;iBAAM;gBACL,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACrB,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACd;SACF;QACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-nest-cache-module-import.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-cache-module-import.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,2EAGqC;AAIrC,SAAgB,2BAA2B,CACzC,UAAsB,EACtB,OAA2C;IAE3C,IAAA,kDAAsB,EACpB,UAAU,kCACL,OAAO,KACV,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE;YACV;gBACE,eAAe,EAAE,uBAAuB;gBACxC,YAAY,EAAE,CAAE,aAAa,CAAE;aAChC;YACD;gBACE,eAAe,EAAE,sBAAsB;gBACvC,YAAY,EAAE,CAAE,0BAA0B,CAAE;aAC7C;SACF,EACD,YAAY,EAAE,CAAC,CAAC,EAAE;YAChB,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;YAC1C,kBAAO,CAAC,MAAM,CAAC;gBACb,QAAQ,EAAE,0BAA0B;aACrC,CAAC,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,IAEJ,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"coerce-nest-cache-module-import.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-cache-module-import.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,2EAGqC;AAIrC,SAAgB,2BAA2B,CACzC,UAAsB,EACtB,OAA2C;IAE3C,IAAA,kDAAsB,EACpB,UAAU,kCACL,OAAO,KACV,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE;YACV;gBACE,eAAe,EAAE,uBAAuB;gBACxC,YAAY,EAAE,CAAE,aAAa,CAAE;aAChC;YACD;gBACE,eAAe,EAAE,sBAAsB;gBACvC,YAAY,EAAE,CAAE,0BAA0B,CAAE;aAC7C;SACF,EACD,YAAY,EAAE,CAAC,CAAC,EAAE;YAChB,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;YAC1C,kBAAO,CAAC,MAAM,CAAC;gBACb,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,0BAA0B;aACrC,CAAC,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,IAEJ,CAAC;AACJ,CAAC;AA5BD,kEA4BC"}
|