@rxap/schematics-ts-morph 16.0.1-dev.1 → 16.1.0-dev.0
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 +21 -0
- package/README.md +1 -1
- package/package.json +4 -4
- package/src/lib/angular/add-component-import.d.ts +9 -0
- package/src/lib/angular/add-component-import.js +9 -0
- package/src/lib/angular/add-component-import.js.map +1 -1
- package/src/lib/angular/add-component-input.d.ts +2 -1
- package/src/lib/angular/add-component-input.js +4 -3
- package/src/lib/angular/add-component-input.js.map +1 -1
- package/src/lib/angular/coerce-component-class.d.ts +2 -2
- package/src/lib/angular/coerce-component-class.js +2 -2
- package/src/lib/angular/coerce-component-class.js.map +1 -1
- package/src/lib/angular/coerce-component.js +4 -24
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-control.js +7 -3
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.js +0 -8
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js +1 -5
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js.map +1 -1
- package/src/lib/nest/add-operation-to-controller.d.ts +2 -1
- package/src/lib/nest/add-operation-to-controller.js +20 -19
- package/src/lib/nest/add-operation-to-controller.js.map +1 -1
- package/src/lib/nest/coerce-dto-class.d.ts +3 -0
- package/src/lib/nest/coerce-dto-class.js +28 -18
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-get-by-id-operation.d.ts +2 -0
- package/src/lib/nest/coerce-get-by-id-operation.js +14 -15
- package/src/lib/nest/coerce-get-by-id-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.js +2 -2
- package/src/lib/nest/coerce-options-operation.js.map +1 -1
- package/src/lib/nest/create-dto-class.d.ts +10 -5
- package/src/lib/nest/create-dto-class.js +11 -40
- package/src/lib/nest/create-dto-class.js.map +1 -1
- package/src/lib/ts-morph/coerce-interface.d.ts +2 -0
- package/src/lib/ts-morph/coerce-interface.js +6 -4
- package/src/lib/ts-morph/coerce-interface.js.map +1 -1
- package/src/lib/ts-morph/write-type.d.ts +16 -4
- package/src/lib/ts-morph/write-type.js +56 -19
- package/src/lib/ts-morph/write-type.js.map +1 -1
- package/src/lib/types/form-definition-control.d.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,27 @@
|
|
|
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
|
+
# [16.1.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.1-dev.1...@rxap/schematics-ts-morph@16.1.0-dev.0) (2024-02-22)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- add is modifier functions ([456c085](https://gitlab.com/rxap/packages/commit/456c085e4f455301e66fae0f61c657f4c43ed450))
|
|
11
|
+
- initial component class creation ([070552a](https://gitlab.com/rxap/packages/commit/070552a35cd3a8a01e0c27f2d5316c9083ad72b3))
|
|
12
|
+
- mark CoercePropertyDeclaration as deprected ([8e2c4da](https://gitlab.com/rxap/packages/commit/8e2c4da8b5a2b60fcc9a9ef576673231bb7fc8e0))
|
|
13
|
+
- merge the property and table property interface ([1ad96cb](https://gitlab.com/rxap/packages/commit/1ad96cba8d085a5458a3c061910755b4c782ca4e))
|
|
14
|
+
- small issues ([93f69c5](https://gitlab.com/rxap/packages/commit/93f69c5e2f445994db265360c6dd4a1e8228bfdb))
|
|
15
|
+
- support complex types ([d8b6f11](https://gitlab.com/rxap/packages/commit/d8b6f1190ecd343debead50587e0ed058eedc1b8))
|
|
16
|
+
- support TypeImport ([fa95a22](https://gitlab.com/rxap/packages/commit/fa95a22fff13303b0c2c8ce96c5188980cb74cfb))
|
|
17
|
+
- unify coerce component functions ([3bc1701](https://gitlab.com/rxap/packages/commit/3bc170116d7e794b94ef323251c59579a7887355))
|
|
18
|
+
- unify type import concept ([9cb2f7b](https://gitlab.com/rxap/packages/commit/9cb2f7b07e28eb36849b1f3afdba15989ba17c72))
|
|
19
|
+
- use correct function return type ([95d6c72](https://gitlab.com/rxap/packages/commit/95d6c728daacb76245e32c7c7530ce75e383267c))
|
|
20
|
+
|
|
21
|
+
### Features
|
|
22
|
+
|
|
23
|
+
- move WriteType to ts-morph package ([af6357a](https://gitlab.com/rxap/packages/commit/af6357a2f642199dc7807e21e5e369395872d595))
|
|
24
|
+
- support custom id property ([540d429](https://gitlab.com/rxap/packages/commit/540d429fa861e757e892c3f071c32a7d79e3ad90))
|
|
25
|
+
- support simple type ([6c012be](https://gitlab.com/rxap/packages/commit/6c012be37ca9f7ed1ffe5947327dcf42703c2bf9))
|
|
26
|
+
|
|
6
27
|
## [16.0.1-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.1-dev.0...@rxap/schematics-ts-morph@16.0.1-dev.1) (2024-02-09)
|
|
7
28
|
|
|
8
29
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0 @rxap/ts-morph@^1.1.0-dev.0 @rxap/utilities@^16.0.0 @rxap/workspace-ts-morph@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.0 @rxap/utilities@^16.0.0 @rxap/workspace-ts-morph@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0
|
|
2
|
+
"version": "16.1.0-dev.0",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
|
-
"@rxap/schematics-utilities": "^16.0.0",
|
|
15
|
+
"@rxap/schematics-utilities": "^16.0.1-dev.0",
|
|
16
16
|
"@rxap/ts-morph": "^1.1.0-dev.0",
|
|
17
17
|
"@rxap/utilities": "^16.0.0",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^16.0.1",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"packageGroup": [
|
|
43
43
|
{
|
|
44
44
|
"package": "@rxap/schematics-utilities",
|
|
45
|
-
"version": "16.0.0"
|
|
45
|
+
"version": "16.0.1-dev.0"
|
|
46
46
|
},
|
|
47
47
|
{
|
|
48
48
|
"package": "@rxap/ts-morph",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"directory": "packages/schematic/ts-morph"
|
|
69
69
|
},
|
|
70
70
|
"type": "commonjs",
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "f7c69031c4849d91b4a852bf9e5c31cabf3f98c9",
|
|
72
72
|
"main": "./src/index.js",
|
|
73
73
|
"types": "./src/index.d.ts"
|
|
74
74
|
}
|
|
@@ -1,2 +1,11 @@
|
|
|
1
1
|
import { SourceFile } from 'ts-morph';
|
|
2
|
+
/**
|
|
3
|
+
* Adds a provided class to the imports array of the component.
|
|
4
|
+
*
|
|
5
|
+
* @param sourceFile - The source file where the component class is located.
|
|
6
|
+
* @param namedImport - The name of the class that should be added to the imports array of the component.
|
|
7
|
+
* @param [moduleSpecifier] - The module specifier to import the class into the source file.
|
|
8
|
+
*
|
|
9
|
+
* @returns {void}
|
|
10
|
+
*/
|
|
2
11
|
export declare function AddComponentImport(sourceFile: SourceFile, namedImport: string, moduleSpecifier?: string): void;
|
|
@@ -4,6 +4,15 @@ exports.AddComponentImport = void 0;
|
|
|
4
4
|
const get_coerce_array_literal_form_object_literal_1 = require("../get-coerce-array-literal-form-object-literal");
|
|
5
5
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
6
|
const get_component_options_object_1 = require("./get-component-options-object");
|
|
7
|
+
/**
|
|
8
|
+
* Adds a provided class to the imports array of the component.
|
|
9
|
+
*
|
|
10
|
+
* @param sourceFile - The source file where the component class is located.
|
|
11
|
+
* @param namedImport - The name of the class that should be added to the imports array of the component.
|
|
12
|
+
* @param [moduleSpecifier] - The module specifier to import the class into the source file.
|
|
13
|
+
*
|
|
14
|
+
* @returns {void}
|
|
15
|
+
*/
|
|
7
16
|
function AddComponentImport(sourceFile, namedImport, moduleSpecifier) {
|
|
8
17
|
if (moduleSpecifier) {
|
|
9
18
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-component-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E,SAAgB,kBAAkB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAEtG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,gDAiBC"}
|
|
1
|
+
{"version":3,"file":"add-component-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAEtG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,gDAiBC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
1
2
|
import { ImportDeclarationStructure, JSDocStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
3
|
export interface ComponentInputDefinition {
|
|
3
4
|
name: string;
|
|
4
|
-
type: string | WriterFunction;
|
|
5
|
+
type: string | TypeImport | WriterFunction;
|
|
5
6
|
selector?: string;
|
|
6
7
|
required?: boolean;
|
|
7
8
|
initializer?: string | WriterFunction;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AddComponentInput = void 0;
|
|
4
4
|
const ts_morph_1 = require("ts-morph");
|
|
5
5
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
|
+
const ts_morph_2 = require("@rxap/ts-morph");
|
|
6
7
|
const get_component_class_1 = require("./get-component-class");
|
|
7
8
|
function AddComponentInput(sourceFile, componentInputDefinition, structures = []) {
|
|
8
9
|
const componentClass = (0, get_component_class_1.GetComponentClass)(sourceFile);
|
|
@@ -18,7 +19,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
18
19
|
parameters: [
|
|
19
20
|
{
|
|
20
21
|
name: componentInputDefinition.name,
|
|
21
|
-
type: componentInputDefinition.type,
|
|
22
|
+
type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
|
|
22
23
|
},
|
|
23
24
|
],
|
|
24
25
|
docs: componentInputDefinition.docs,
|
|
@@ -36,7 +37,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
36
37
|
componentClass.addProperty({
|
|
37
38
|
name: '_' + componentInputDefinition.name,
|
|
38
39
|
scope: ts_morph_1.Scope.Private,
|
|
39
|
-
type: componentInputDefinition.type,
|
|
40
|
+
type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
|
|
40
41
|
initializer: componentInputDefinition.initializer,
|
|
41
42
|
hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
|
|
42
43
|
hasExclamationToken: !componentInputDefinition.initializer && componentInputDefinition.required,
|
|
@@ -53,7 +54,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
53
54
|
componentClass.addProperty({
|
|
54
55
|
name: componentInputDefinition.name,
|
|
55
56
|
scope: ts_morph_1.Scope.Public,
|
|
56
|
-
type: componentInputDefinition.type,
|
|
57
|
+
type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
|
|
57
58
|
initializer: componentInputDefinition.initializer,
|
|
58
59
|
hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
|
|
59
60
|
hasExclamationToken: !componentInputDefinition.initializer && componentInputDefinition.required,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-component-input.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-input.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"add-component-input.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-input.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ClassDeclaration, ObjectLiteralExpression, Project, SourceFile } from 'ts-morph';
|
|
2
2
|
import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
|
|
3
3
|
export interface CoerceComponentClassRuleOptions extends TsMorphAngularProjectTransformOptions {
|
|
4
4
|
componentName: string;
|
|
5
5
|
selector?: string;
|
|
6
|
-
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, componentDecoratorObject: ObjectLiteralExpression
|
|
6
|
+
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, componentDecoratorObject: ObjectLiteralExpression) => void;
|
|
7
7
|
}
|
|
8
8
|
export declare function CoerceComponentClassRule(options: Readonly<CoerceComponentClassRuleOptions>): import("@angular-devkit/schematics").Rule;
|
|
@@ -8,8 +8,8 @@ function CoerceComponentClassRule(options) {
|
|
|
8
8
|
const { componentName, selector, tsMorphTransform, } = options;
|
|
9
9
|
return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
|
|
10
10
|
const sourceFile = (0, coerce_source_file_1.CoerceSourceFile)(project, `/${componentName}.component.ts`);
|
|
11
|
-
const { classDeclaration, componentDecoratorObject
|
|
12
|
-
tsMorphTransform === null || tsMorphTransform === void 0 ? void 0 : tsMorphTransform(project, sourceFile, classDeclaration, componentDecoratorObject
|
|
11
|
+
const { classDeclaration, componentDecoratorObject } = (0, ts_morph_1.CoerceComponent)(sourceFile, componentName, { selector, styleUrls: true, templateUrl: true });
|
|
12
|
+
tsMorphTransform === null || tsMorphTransform === void 0 ? void 0 : tsMorphTransform(project, sourceFile, classDeclaration, componentDecoratorObject);
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
15
|
exports.CoerceComponentClassRule = CoerceComponentClassRule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component-class.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAQjD,8DAAyD;AACzD,8DAG+B;
|
|
1
|
+
{"version":3,"file":"coerce-component-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component-class.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAQjD,8DAAyD;AACzD,8DAG+B;AAa/B,SAAgB,wBAAwB,CAAC,OAAkD;IACzF,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,IAAK,aAAc,eAAe,CAAC,CAAC;QAEjF,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,GAAG,IAAA,0BAAe,EAAC,UAAU,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpJ,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAEtF,CAAC,CAAC,CAAC;AAEL,CAAC;AAjBD,4DAiBC"}
|
|
@@ -4,8 +4,8 @@ exports.CoerceComponentRule = void 0;
|
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
7
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
7
8
|
const path_1 = require("path");
|
|
8
|
-
const ts_morph_1 = require("ts-morph");
|
|
9
9
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
10
10
|
const build_angular_base_path_1 = require("./build-angular-base-path");
|
|
11
11
|
const has_component_1 = require("./has-component");
|
|
@@ -24,30 +24,10 @@ function CoerceComponentRule(options) {
|
|
|
24
24
|
if (!hasComponent) {
|
|
25
25
|
rules.push(() => console.log(`Project '${project}' does not have a component '${name}' in the feature '${feature}' in the directory '${directory}', New component will be created.`));
|
|
26
26
|
rules.push((0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project, [componentSourceFile]) => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
decorators: [
|
|
31
|
-
{
|
|
32
|
-
name: 'Component',
|
|
33
|
-
arguments: [
|
|
34
|
-
ts_morph_1.Writers.object({
|
|
35
|
-
selector: w => w.quote(`${prefix}-${(0, schematics_utilities_1.dasherize)(name)}`),
|
|
36
|
-
templateUrl: w => w.quote(`./${name}.component.html`),
|
|
37
|
-
styleUrls: w => w.write('[').quote(`./${name}.component.scss`).write(']'),
|
|
38
|
-
changeDetection: 'ChangeDetectionStrategy.OnPush',
|
|
39
|
-
standalone: 'true',
|
|
40
|
-
}),
|
|
41
|
-
],
|
|
42
|
-
},
|
|
43
|
-
],
|
|
27
|
+
(0, ts_morph_1.CoerceComponent)(componentSourceFile, name, {
|
|
28
|
+
prefix,
|
|
29
|
+
changeDetection: 'OnPush',
|
|
44
30
|
});
|
|
45
|
-
componentSourceFile.addImportDeclarations([
|
|
46
|
-
{
|
|
47
|
-
moduleSpecifier: '@angular/core',
|
|
48
|
-
namedImports: ['Component', 'ChangeDetectionStrategy'],
|
|
49
|
-
},
|
|
50
|
-
]);
|
|
51
31
|
}, [
|
|
52
32
|
(0, path_1.join)(componentPath, `${name}.component.ts?`),
|
|
53
33
|
]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2DASoC;AACpC,
|
|
1
|
+
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
|
10
10
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
11
11
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
12
12
|
const coerce_interface_1 = require("../ts-morph/coerce-interface");
|
|
13
|
-
const
|
|
13
|
+
const ts_morph_2 = require("@rxap/ts-morph");
|
|
14
14
|
function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeName, control) {
|
|
15
15
|
if (sourceFile.getTypeAlias(formTypeName)) {
|
|
16
16
|
console.log(`Type alias ${formTypeName} already exists! Skip interface generation`);
|
|
@@ -18,7 +18,7 @@ function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeNa
|
|
|
18
18
|
}
|
|
19
19
|
const interfaceDeclaration = (0, coerce_interface_1.CoerceInterface)(sourceFile, formTypeName);
|
|
20
20
|
interfaceDeclaration.setIsExported(true);
|
|
21
|
-
(0, coerce_dto_class_1.CoercePropertyDeclaration)(interfaceDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({ type: (0,
|
|
21
|
+
(0, coerce_dto_class_1.CoercePropertyDeclaration)(interfaceDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({ type: (0, ts_morph_2.WriteType)(control, sourceFile) });
|
|
22
22
|
}
|
|
23
23
|
exports.CoerceInterfaceFormTypeControl = CoerceInterfaceFormTypeControl;
|
|
24
24
|
function isAngularValidator(validator) {
|
|
@@ -36,10 +36,14 @@ function isAngularValidator(validator) {
|
|
|
36
36
|
}
|
|
37
37
|
exports.isAngularValidator = isAngularValidator;
|
|
38
38
|
function CoerceFormControl(sourceFile, classDeclaration, control) {
|
|
39
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
40
|
+
namedImports: ['RxapFormControl', 'UseFormControl'],
|
|
41
|
+
moduleSpecifier: '@rxap/forms',
|
|
42
|
+
});
|
|
39
43
|
const propertyDeclaration = (0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({
|
|
40
44
|
type: w => {
|
|
41
45
|
w.write('RxapFormControl<');
|
|
42
|
-
(0,
|
|
46
|
+
(0, ts_morph_2.WriteType)(control, sourceFile)(w);
|
|
43
47
|
w.write('>');
|
|
44
48
|
},
|
|
45
49
|
hasExclamationToken: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":";;;AACA,qEAIoC;AACpC,uCAQkB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,+DAAqE;AACrE,8DAG+B;AAC/B,mEAA+D;AAC/D,+DAA2D;AAC3D,mEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,6 @@ function CoerceFormControls(sourceFile, classDeclaration, { controlList }) {
|
|
|
14
14
|
for (const control of controlList !== null && controlList !== void 0 ? controlList : []) {
|
|
15
15
|
(0, coerce_form_definition_control_1.CoerceFormControl)(sourceFile, classDeclaration, control);
|
|
16
16
|
}
|
|
17
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
18
|
-
namedImports: ['RxapFormControl', 'UseFormControl', 'RxapValidators'],
|
|
19
|
-
moduleSpecifier: '@rxap/forms',
|
|
20
|
-
});
|
|
21
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
22
|
-
namedImports: ['Validators'],
|
|
23
|
-
moduleSpecifier: '@angular/forms',
|
|
24
|
-
});
|
|
25
17
|
}
|
|
26
18
|
exports.CoerceFormControls = CoerceFormControls;
|
|
27
19
|
function CoerceFormDefinition(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,uCAIkB;AAClB,+DAAqE;AACrE,8DAG+B;AAC/B,mEAA+D;AAC/D,+DAA2D;AAE3D,qFAAqE;AACrE,+EAA6E;AAC7E,2EAIqC;AAmBrC,SAAgB,kBAAkB,CAChC,UAAsB,EACtB,gBAAkC,EAClC,EAAE,WAAW,EAA+B;IAE5C,KAAK,MAAM,OAAO,IAAI,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EAAE;QACvC,IAAA,kDAAiB,EAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;KAC1D;
|
|
1
|
+
{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const coerce_proxy_remote_method_class_1 = require("./coerce-proxy-remote-method
|
|
|
7
7
|
function CoerceTreeTableRootProxyRemoteMethodClass(options) {
|
|
8
8
|
let { tsMorphTransform, getRootOperationId, scope, } = options;
|
|
9
9
|
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
|
|
10
|
-
return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-root', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter
|
|
10
|
+
return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-root', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter<void>`, proxyMethod: (0, operation_id_utilities_1.OperationIdToClassName)(getRootOperationId), tsMorphTransform: (project, sourceFile, classDeclaration) => {
|
|
11
11
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
12
12
|
namedImports: [(0, operation_id_utilities_1.OperationIdToClassName)(getRootOperationId)],
|
|
13
13
|
moduleSpecifier: (0, operation_id_utilities_1.OperationIdToClassImportPath)(getRootOperationId, scope),
|
|
@@ -20,10 +20,6 @@ function CoerceTreeTableRootProxyRemoteMethodClass(options) {
|
|
|
20
20
|
namedImports: ['OpenApiRemoteMethodParameter'],
|
|
21
21
|
moduleSpecifier: '@rxap/open-api/remote-method',
|
|
22
22
|
});
|
|
23
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
24
|
-
namedImports: [(0, operation_id_utilities_1.OperationIdToParameterClassName)(getRootOperationId)],
|
|
25
|
-
moduleSpecifier: (0, operation_id_utilities_1.OperationIdToParameterClassImportPath)(getRootOperationId, scope),
|
|
26
|
-
});
|
|
27
23
|
return tsMorphTransform(project, sourceFile, classDeclaration);
|
|
28
24
|
} }));
|
|
29
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-tree-table-root-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAKA,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,yCAAyC,CAAC,OAAyD;IACjH,IAAI,EACF,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"coerce-tree-table-root-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAKA,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,yCAAyC,CAAC,OAAyD;IACjH,IAAI,EACF,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,oCAAoC,EAChD,WAAW,EAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,EACvD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,CAAE;gBAC5D,eAAe,EAAE,IAAA,qDAA4B,EAAC,kBAAkB,EAAE,KAAK,CAAC;aACzE,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,OAAO,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClE,CAAC,IACD,CAAC;AACL,CAAC;AA7BD,8FA6BC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
1
2
|
import { ClassDeclaration, DecoratorStructure, MethodDeclaration, OptionalKind, SourceFile, StatementStructures, WriterFunction } from 'ts-morph';
|
|
2
3
|
export interface OperationParameter {
|
|
3
4
|
name: string;
|
|
4
|
-
type?: string | WriterFunction;
|
|
5
|
+
type?: string | WriterFunction | TypeImport;
|
|
5
6
|
pipeList?: Array<string | WriterFunction>;
|
|
6
7
|
defaultValue?: string | WriterFunction;
|
|
7
8
|
hasQuestionToken?: boolean;
|
|
@@ -7,7 +7,8 @@ const coerce_class_method_1 = require("../coerce-class-method");
|
|
|
7
7
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
8
8
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
9
9
|
const coerce_statements_1 = require("../ts-morph/coerce-statements");
|
|
10
|
-
|
|
10
|
+
const ts_morph_2 = require("@rxap/ts-morph");
|
|
11
|
+
function buildMethodQueryParameters(queryList, sourceFile) {
|
|
11
12
|
if (queryList.length) {
|
|
12
13
|
return queryList.map(query => {
|
|
13
14
|
var _a, _b;
|
|
@@ -15,7 +16,7 @@ function buildMethodQueryParameters(queryList, importStructures) {
|
|
|
15
16
|
undefined) {
|
|
16
17
|
return query;
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
19
20
|
namedImports: ['DefaultValuePipe'],
|
|
20
21
|
moduleSpecifier: '@nestjs/common',
|
|
21
22
|
});
|
|
@@ -38,7 +39,7 @@ function buildMethodQueryParameters(queryList, importStructures) {
|
|
|
38
39
|
var _a, _b, _c;
|
|
39
40
|
return ({
|
|
40
41
|
name: (_a = query.alias) !== null && _a !== void 0 ? _a : query.name,
|
|
41
|
-
type: query.type,
|
|
42
|
+
type: query.type ? (0, ts_morph_2.WriteType)({ type: query.type, isArray: false }, sourceFile) : undefined,
|
|
42
43
|
hasQuestionToken: (_b = query.hasQuestionToken) !== null && _b !== void 0 ? _b : (!query.required && query.defaultValue === undefined),
|
|
43
44
|
decorators: [
|
|
44
45
|
{
|
|
@@ -54,21 +55,21 @@ function buildMethodQueryParameters(queryList, importStructures) {
|
|
|
54
55
|
}
|
|
55
56
|
return [];
|
|
56
57
|
}
|
|
57
|
-
function buildMethodParamParameters(paramList) {
|
|
58
|
+
function buildMethodParamParameters(paramList, sourceFile) {
|
|
58
59
|
if (paramList.length) {
|
|
59
|
-
return paramList.map(
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
});
|
|
60
|
+
return paramList.map(({ alias, name, type }) => ({
|
|
61
|
+
name: alias !== null && alias !== void 0 ? alias : name,
|
|
62
|
+
type: type ? (0, ts_morph_2.WriteType)({
|
|
63
|
+
type: type,
|
|
64
|
+
isArray: false
|
|
65
|
+
}, sourceFile) : undefined,
|
|
66
|
+
decorators: [
|
|
67
|
+
{
|
|
68
|
+
name: 'Param',
|
|
69
|
+
arguments: [w => w.quote(name)],
|
|
70
|
+
},
|
|
71
|
+
],
|
|
72
|
+
}));
|
|
72
73
|
}
|
|
73
74
|
return [];
|
|
74
75
|
}
|
|
@@ -164,8 +165,8 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
|
|
|
164
165
|
scope: ts_morph_1.Scope.Public,
|
|
165
166
|
isAsync,
|
|
166
167
|
parameters: [
|
|
167
|
-
...buildMethodQueryParameters(queryList,
|
|
168
|
-
...buildMethodParamParameters(paramList),
|
|
168
|
+
...buildMethodQueryParameters(queryList, sourceFile),
|
|
169
|
+
...buildMethodParamParameters(paramList, sourceFile),
|
|
169
170
|
...buildMethodBodyParameters(body),
|
|
170
171
|
].sort((a, b) => {
|
|
171
172
|
if (a.hasQuestionToken && b.hasQuestionToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-operation-to-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-operation-to-controller.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;
|
|
1
|
+
{"version":3,"file":"add-operation-to-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-operation-to-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ export interface CoerceDtoClassOutput {
|
|
|
6
6
|
sourceFile: SourceFile;
|
|
7
7
|
classDeclaration: ClassDeclaration;
|
|
8
8
|
}
|
|
9
|
+
/**
|
|
10
|
+
* @deprecated import from @rxap/ts-morph
|
|
11
|
+
*/
|
|
9
12
|
export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
|
|
10
13
|
export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
|
|
11
14
|
export interface CoerceDtoClassOptions {
|
|
@@ -8,7 +8,7 @@ const coerce_class_1 = require("../coerce-class");
|
|
|
8
8
|
const coerce_source_file_1 = require("../coerce-source-file");
|
|
9
9
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
10
10
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
11
|
-
const
|
|
11
|
+
const ts_morph_2 = require("@rxap/ts-morph");
|
|
12
12
|
function CoercePropertyDeclaration(node, name, structure = {}) {
|
|
13
13
|
let property = node.getProperty(name);
|
|
14
14
|
if (!property) {
|
|
@@ -41,8 +41,8 @@ function CoerceDtoClass(options) {
|
|
|
41
41
|
propertyName = prefixMatch[0] + propertyName;
|
|
42
42
|
}
|
|
43
43
|
const propertyDeclaration = CoercePropertyDeclaration(classDeclaration, propertyName).set({
|
|
44
|
-
type: (0,
|
|
45
|
-
hasQuestionToken: property.isOptional,
|
|
44
|
+
type: (0, ts_morph_2.WriteType)(property, sourceFile),
|
|
45
|
+
hasQuestionToken: !!property.isOptional,
|
|
46
46
|
hasExclamationToken: !property.isOptional,
|
|
47
47
|
});
|
|
48
48
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
|
|
@@ -66,12 +66,10 @@ function CoerceDtoClass(options) {
|
|
|
66
66
|
arguments: [
|
|
67
67
|
w => {
|
|
68
68
|
w.write('() => ');
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
property.type(w);
|
|
74
|
-
}
|
|
69
|
+
(0, ts_morph_2.WriteType)({
|
|
70
|
+
type: property.type,
|
|
71
|
+
isArray: false
|
|
72
|
+
}, sourceFile)(w);
|
|
75
73
|
},
|
|
76
74
|
],
|
|
77
75
|
});
|
|
@@ -81,14 +79,10 @@ function CoerceDtoClass(options) {
|
|
|
81
79
|
});
|
|
82
80
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
|
|
83
81
|
arguments: [
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
else {
|
|
89
|
-
property.type(w);
|
|
90
|
-
}
|
|
91
|
-
},
|
|
82
|
+
(0, ts_morph_2.WriteType)({
|
|
83
|
+
type: property.type,
|
|
84
|
+
isArray: false
|
|
85
|
+
}, sourceFile),
|
|
92
86
|
w => {
|
|
93
87
|
if (property.isArray) {
|
|
94
88
|
ts_morph_1.Writers.object({ each: 'true' })(w);
|
|
@@ -110,7 +104,14 @@ function CoerceDtoClass(options) {
|
|
|
110
104
|
moduleSpecifier: 'class-validator',
|
|
111
105
|
});
|
|
112
106
|
}
|
|
113
|
-
|
|
107
|
+
let autoType = 'none';
|
|
108
|
+
if (typeof property.type === 'string') {
|
|
109
|
+
autoType = property.type;
|
|
110
|
+
}
|
|
111
|
+
else if (typeof property.type === 'object') {
|
|
112
|
+
autoType = property.type.name;
|
|
113
|
+
}
|
|
114
|
+
switch (autoType) {
|
|
114
115
|
case 'date':
|
|
115
116
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
|
|
116
117
|
arguments: [],
|
|
@@ -167,6 +168,15 @@ function CoerceDtoClass(options) {
|
|
|
167
168
|
moduleSpecifier: 'class-validator',
|
|
168
169
|
});
|
|
169
170
|
break;
|
|
171
|
+
case 'unknown':
|
|
172
|
+
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
|
|
173
|
+
arguments: [ts_morph_1.Writers.object({ type: w => w.quote('unknown') })],
|
|
174
|
+
});
|
|
175
|
+
importStructureList.push({
|
|
176
|
+
namedImports: ['ApiProperty'],
|
|
177
|
+
moduleSpecifier: '@nestjs/swagger',
|
|
178
|
+
});
|
|
179
|
+
break;
|
|
170
180
|
}
|
|
171
181
|
}
|
|
172
182
|
(0, coerce_imports_1.CoerceImports)(sourceFile, importStructureList);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAKoC;AACpC,+BAA4B;AAC5B,uCAckB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,mEAA+D;AAC/D,+DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,7 @@ import { DtoClassProperty } from './create-dto-class';
|
|
|
3
3
|
export interface CoerceGetByIdControllerOptions extends Omit<CoerceOperationOptions, 'operationName'> {
|
|
4
4
|
propertyList?: DtoClassProperty[];
|
|
5
5
|
isArray?: boolean;
|
|
6
|
+
idProperty?: DtoClassProperty;
|
|
7
|
+
operationName?: string;
|
|
6
8
|
}
|
|
7
9
|
export declare function CoerceGetByIdOperation(options: CoerceGetByIdControllerOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -2,13 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceGetByIdOperation = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
-
const
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
6
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
7
7
|
const coerce_operation_1 = require("./coerce-operation");
|
|
8
8
|
function CoerceGetByIdOperation(options) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
|
|
9
|
+
const { controllerName, isArray, paramList = [], propertyList = [], idProperty = { name: 'uuid', type: 'string' }, operationName = 'getById', } = options;
|
|
10
|
+
let { nestModule } = options;
|
|
12
11
|
/**
|
|
13
12
|
* If the module is not specified. This controller has an own module. Else the
|
|
14
13
|
* module is originated by another controller.
|
|
@@ -29,30 +28,30 @@ function CoerceGetByIdOperation(options) {
|
|
|
29
28
|
* module = "report-details"
|
|
30
29
|
*/
|
|
31
30
|
const isFirstBornSibling = !nestModule || nestModule === controllerName;
|
|
32
|
-
if (isFirstBornSibling && !propertyList.some(param => param.name ===
|
|
33
|
-
propertyList.unshift(
|
|
34
|
-
name: 'uuid',
|
|
35
|
-
type: 'string',
|
|
36
|
-
});
|
|
31
|
+
if (isFirstBornSibling && !propertyList.some(param => param.name === idProperty.name)) {
|
|
32
|
+
propertyList.unshift(idProperty);
|
|
37
33
|
}
|
|
38
34
|
if (isFirstBornSibling) {
|
|
39
35
|
nestModule = controllerName;
|
|
40
36
|
}
|
|
41
|
-
if (!paramList.some(param => param.name ===
|
|
37
|
+
if (!paramList.some(param => param.name === idProperty.name)) {
|
|
42
38
|
paramList.push({
|
|
43
|
-
name:
|
|
44
|
-
type:
|
|
45
|
-
alias: isFirstBornSibling ? undefined : (0, schematics_utilities_1.CoerceSuffix)(nestModule, '-
|
|
39
|
+
name: idProperty.name,
|
|
40
|
+
type: idProperty.type,
|
|
41
|
+
alias: isFirstBornSibling ? undefined : (0, schematics_utilities_1.CoerceSuffix)(nestModule, '-' + idProperty.name),
|
|
46
42
|
fromParent: !isFirstBornSibling,
|
|
47
43
|
});
|
|
48
44
|
}
|
|
49
|
-
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule,
|
|
45
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule,
|
|
46
|
+
controllerName,
|
|
47
|
+
paramList,
|
|
48
|
+
operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
50
49
|
const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
51
50
|
project,
|
|
52
51
|
name: controllerName,
|
|
53
52
|
propertyList,
|
|
54
53
|
});
|
|
55
|
-
(0,
|
|
54
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
56
55
|
namedImports: [dtoClassName],
|
|
57
56
|
moduleSpecifier: dtoFilePath,
|
|
58
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,6CAA+C;AAC/C,yDAAoD;AACpD,yDAG4B;AAU5B,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,MAAM,EACJ,cAAc,EACd,OAAO,EACP,SAAS,GAAE,EAAE,EACb,YAAY,GAAG,EAAE,EACjB,UAAU,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAC7C,aAAa,GAAG,SAAS,GAC1B,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE7B;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,kBAAkB,GAAG,CAAC,UAAU,IAAI,UAAU,KAAK,cAAc,CAAC;IAExE,IAAI,kBAAkB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QACrF,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAClC;IAED,IAAI,kBAAkB,EAAE;QACtB,UAAU,GAAG,cAAc,CAAC;KAC7B;IAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QAC5D,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAW,EAAE,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC;YACxF,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,UAAU;QACV,cAAc;QACd,SAAS;QACT,aAAa,EACb,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aACjD,CAAC;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AAnFD,wDAmFC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CoerceOptionsOperationRule = void 0;
|
|
4
4
|
const utilities_1 = require("@rxap/utilities");
|
|
5
5
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
|
-
const
|
|
6
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
7
7
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
8
8
|
const coerce_operation_1 = require("./coerce-operation");
|
|
9
9
|
function CoerceOptionsOperationRule(options) {
|
|
@@ -20,7 +20,7 @@ function CoerceOptionsOperationRule(options) {
|
|
|
20
20
|
},
|
|
21
21
|
{
|
|
22
22
|
name: 'value',
|
|
23
|
-
type: (0,
|
|
23
|
+
type: (0, ts_morph_1.WriteType)(control, sourceFile),
|
|
24
24
|
},
|
|
25
25
|
],
|
|
26
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,+DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,+DAA2D;AAC3D,6CAA2C;AAE3C,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,eAAe,EACf,OAAO,EACP,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,eAAe,aAAf,eAAe,cAAf,eAAe,IAAf,eAAe,GAAK,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAE,CAAC,EAAC;IACvE,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;YAE1E,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,eAAgB;gBACtB,YAAY,EAAE;oBACZ;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,IAAA,oBAAS,EAAC,OAAO,EAAE,UAAU,CAAC;qBACrC;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,iBAAiB,CAAE;gBACnC,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,uBAAuB,CAAE;gBACzC,eAAe,EAAE,sBAAsB;aACxC,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,SAAU,SAAU,GAAG;gBACnC,UAAU,EAAE;oBACV,yBAAyB;oBACzB,SAAS,GAAG,GAAG;oBACf,KAAK;oBACL,uBAAuB;oBACvB,IAAI;iBACL;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtDD,gEAsDC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
1
2
|
import { ClassDeclaration, ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
3
|
export interface DtoClassProperty {
|
|
3
4
|
name: string;
|
|
@@ -6,14 +7,18 @@ export interface DtoClassProperty {
|
|
|
6
7
|
*
|
|
7
8
|
* if type = '<self>' the type will be the name of the class
|
|
8
9
|
*/
|
|
9
|
-
type: string | WriterFunction;
|
|
10
|
-
isArray?: boolean;
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
type: string | WriterFunction | TypeImport | '<self>';
|
|
11
|
+
isArray?: boolean | null;
|
|
12
|
+
/**
|
|
13
|
+
* indicates that the @Type decorator should be used as the type of the property is another dto class
|
|
14
|
+
*/
|
|
15
|
+
isType?: boolean | null;
|
|
16
|
+
isOptional?: boolean | null;
|
|
13
17
|
/**
|
|
14
18
|
* Use to import the type
|
|
19
|
+
* @deprecated use the type property with a TypeImport object
|
|
15
20
|
*/
|
|
16
|
-
moduleSpecifier?: string;
|
|
21
|
+
moduleSpecifier?: string | null;
|
|
17
22
|
}
|
|
18
23
|
export declare function CreateDtoClass(sourceFile: SourceFile, className: string, propertyList: DtoClassProperty[], classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;
|
|
19
24
|
export declare function CreatePageDtoClass(sourceFile: SourceFile, className: string, rowType: string | WriterFunction, classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;
|
|
@@ -5,6 +5,7 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
5
5
|
const ts_morph_1 = require("ts-morph");
|
|
6
6
|
const coerce_class_1 = require("../coerce-class");
|
|
7
7
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
8
|
+
const ts_morph_2 = require("@rxap/ts-morph");
|
|
8
9
|
function CreateDtoClass(sourceFile, className, propertyList, classStructure, structures) {
|
|
9
10
|
var _a;
|
|
10
11
|
className = (0, schematics_utilities_1.CoerceSuffix)(className, 'Dto');
|
|
@@ -42,17 +43,10 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
|
|
|
42
43
|
arguments: [
|
|
43
44
|
w => {
|
|
44
45
|
w.write('() => ');
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
else {
|
|
50
|
-
w.write(property.type);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
property.type(w);
|
|
55
|
-
}
|
|
46
|
+
(0, ts_morph_2.WriteType)({
|
|
47
|
+
type: property.type,
|
|
48
|
+
isArray: false
|
|
49
|
+
}, sourceFile)(w);
|
|
56
50
|
},
|
|
57
51
|
],
|
|
58
52
|
});
|
|
@@ -63,19 +57,10 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
|
|
|
63
57
|
decorators.push({
|
|
64
58
|
name: 'IsInstance',
|
|
65
59
|
arguments: [
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
w.write(property.type);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
property.type(w);
|
|
77
|
-
}
|
|
78
|
-
},
|
|
60
|
+
(0, ts_morph_2.WriteType)({
|
|
61
|
+
type: property.type,
|
|
62
|
+
isArray: false
|
|
63
|
+
}, sourceFile),
|
|
79
64
|
w => {
|
|
80
65
|
if (property.isArray) {
|
|
81
66
|
ts_morph_1.Writers.object({ each: 'true' })(w);
|
|
@@ -142,22 +127,8 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
|
|
|
142
127
|
}
|
|
143
128
|
classStructure.properties.push({
|
|
144
129
|
name: property.name,
|
|
145
|
-
type:
|
|
146
|
-
|
|
147
|
-
if (typeof property.type === 'string') {
|
|
148
|
-
if (property.type === 'date') {
|
|
149
|
-
w.write('Date');
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
w.write(property.type);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
property.type(w);
|
|
157
|
-
}
|
|
158
|
-
w.write('>');
|
|
159
|
-
},
|
|
160
|
-
hasQuestionToken: property.isOptional,
|
|
130
|
+
type: (0, ts_morph_2.WriteType)(property, sourceFile),
|
|
131
|
+
hasQuestionToken: !!property.isOptional,
|
|
161
132
|
hasExclamationToken: !property.isOptional,
|
|
162
133
|
decorators,
|
|
163
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/create-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;
|
|
1
|
+
{"version":3,"file":"create-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/create-dto-class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { NormalizedDataProperty } from '@rxap/ts-morph';
|
|
1
2
|
import { InterfaceDeclaration, InterfaceDeclarationStructure, OptionalKind, Project, SourceFile } from 'ts-morph';
|
|
2
3
|
import { TsMorphAngularProjectTransformOptions, TsMorphNestProjectTransformOptions, TsMorphTransformFunctionRule } from '../ts-morph-transform';
|
|
3
4
|
export declare function CoerceInterface(sourceFile: SourceFile, interfaceName: string, structure?: Omit<OptionalKind<InterfaceDeclarationStructure>, 'name'>): InterfaceDeclaration;
|
|
4
5
|
export interface CoerceInterfaceRuleOptions extends TsMorphNestProjectTransformOptions, TsMorphAngularProjectTransformOptions {
|
|
5
6
|
name: string;
|
|
6
7
|
structure?: Omit<OptionalKind<InterfaceDeclarationStructure>, 'name'>;
|
|
8
|
+
propertyList?: NormalizedDataProperty[];
|
|
7
9
|
tsMorphTransform?: (project: Project, sourceFile: SourceFile, interfaceDeclaration: InterfaceDeclaration) => void;
|
|
8
10
|
}
|
|
9
11
|
export declare function CoerceInterfaceRule(options: CoerceInterfaceRuleOptions, tsMorphTransForm: TsMorphTransformFunctionRule<TsMorphNestProjectTransformOptions | TsMorphAngularProjectTransformOptions>): import("@angular-devkit/schematics").Rule;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceInterfaceRule = exports.CoerceInterface = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
4
5
|
const utilities_1 = require("@rxap/utilities");
|
|
5
6
|
function CoerceInterface(sourceFile, interfaceName, structure = {}) {
|
|
6
7
|
let interfaceDeclaration = sourceFile.getInterface(interfaceName);
|
|
@@ -11,17 +12,18 @@ function CoerceInterface(sourceFile, interfaceName, structure = {}) {
|
|
|
11
12
|
}
|
|
12
13
|
exports.CoerceInterface = CoerceInterface;
|
|
13
14
|
function CoerceInterfaceRule(options, tsMorphTransForm) {
|
|
14
|
-
|
|
15
|
+
const { tsMorphTransform = utilities_1.noop, project, feature, shared, directory, structure = { isExported: true }, propertyList, } = options;
|
|
16
|
+
let { name } = options;
|
|
15
17
|
name = (0, utilities_1.classify)(name);
|
|
16
|
-
structure !== null && structure !== void 0 ? structure : (structure = {});
|
|
17
|
-
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
18
|
-
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => { });
|
|
19
18
|
return tsMorphTransForm({
|
|
20
19
|
project,
|
|
21
20
|
feature,
|
|
22
21
|
shared,
|
|
23
22
|
directory,
|
|
24
23
|
}, (project, [sourceFile]) => {
|
|
24
|
+
if (propertyList) {
|
|
25
|
+
structure.properties = propertyList.map(p => (0, ts_morph_1.NormalizeDataPropertyToPropertySignatureStructure)(p, sourceFile));
|
|
26
|
+
}
|
|
25
27
|
const interfaceDeclaration = CoerceInterface(sourceFile, name, structure);
|
|
26
28
|
tsMorphTransform(project, sourceFile, interfaceDeclaration);
|
|
27
29
|
}, [(0, utilities_1.dasherize)(name) + '.ts?']);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-interface.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-interface.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"coerce-interface.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-interface.ts"],"names":[],"mappings":";;;AAAA,6CAGwB;AACxB,+CAIyB;AAczB,SAAgB,eAAe,CAC7B,UAAsB,EACtB,aAAqB,EACrB,YAAuE,EAAE;IAEzE,IAAI,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAClE,IAAI,CAAC,oBAAoB,EAAE;QACzB,oBAAoB,GAAG,UAAU,CAAC,YAAY,iCACzC,SAAS,KACZ,IAAI,EAAE,aAAa,IACnB,CAAC;KACJ;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAbD,0CAaC;AAUD,SAAgB,mBAAmB,CACjC,OAAmC,EACnC,gBAA0H;IAE1H,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,EAChC,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACvB,IAAI,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;IAEtB,OAAO,gBAAgB,CAAC;QACtB,OAAO;QACP,OAAO;QACP,MAAM;QACN,SAAS;KACV,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAC7B,IAAI,YAAY,EAAE;YAChB,SAAS,CAAC,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,4DAAiD,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;SAChH;QACD,MAAM,oBAAoB,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1E,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;IAC9D,CAAC,EAAE,CAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,MAAM,CAAE,CAAC,CAAC;AACnC,CAAC;AA5BD,kDA4BC"}
|
|
@@ -1,6 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
2
|
+
import { CodeBlockWriter, SourceFile, WriterFunction } from 'ts-morph';
|
|
3
|
+
export type WriteType = string | TypeImport | WriterFunction;
|
|
2
4
|
export interface WriteTypeOptions {
|
|
3
|
-
isArray?: boolean;
|
|
4
|
-
type:
|
|
5
|
+
isArray?: boolean | null;
|
|
6
|
+
type: WriteType;
|
|
5
7
|
}
|
|
6
|
-
export declare function
|
|
8
|
+
export declare function IsWriteTypeOptions(value: any): value is WriteTypeOptions;
|
|
9
|
+
/**
|
|
10
|
+
* Uses the CodeBlockWriter to write the type to the AST thereby the value of the property type is evaluated
|
|
11
|
+
* to determine the value that should be written to the AST
|
|
12
|
+
* @param type
|
|
13
|
+
* @param w
|
|
14
|
+
* @constructor
|
|
15
|
+
*/
|
|
16
|
+
export declare function WriteStringType(type: string, w: CodeBlockWriter): void;
|
|
17
|
+
export declare function WriteType(type: WriteType, sourceFile: SourceFile): WriterFunction;
|
|
18
|
+
export declare function WriteType(property: WriteTypeOptions, sourceFile: SourceFile): WriterFunction;
|
|
@@ -1,31 +1,68 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WriteType = void 0;
|
|
4
|
-
|
|
3
|
+
exports.WriteType = exports.WriteStringType = exports.IsWriteTypeOptions = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
|
+
function IsWriteTypeOptions(value) {
|
|
6
|
+
return value && typeof value === 'object' && value.type;
|
|
7
|
+
}
|
|
8
|
+
exports.IsWriteTypeOptions = IsWriteTypeOptions;
|
|
9
|
+
/**
|
|
10
|
+
* Uses the CodeBlockWriter to write the type to the AST thereby the value of the property type is evaluated
|
|
11
|
+
* to determine the value that should be written to the AST
|
|
12
|
+
* @param type
|
|
13
|
+
* @param w
|
|
14
|
+
* @constructor
|
|
15
|
+
*/
|
|
16
|
+
function WriteStringType(type, w) {
|
|
17
|
+
switch (type) {
|
|
18
|
+
case 'date':
|
|
19
|
+
w.write('Date');
|
|
20
|
+
break;
|
|
21
|
+
case 'uuid':
|
|
22
|
+
w.write('string');
|
|
23
|
+
break;
|
|
24
|
+
default:
|
|
25
|
+
w.write(type);
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.WriteStringType = WriteStringType;
|
|
30
|
+
function WriteType(propertyOrType, sourceFile) {
|
|
31
|
+
var _a;
|
|
32
|
+
let isArray = false;
|
|
33
|
+
let type;
|
|
34
|
+
if (IsWriteTypeOptions(propertyOrType)) {
|
|
35
|
+
isArray = (_a = propertyOrType.isArray) !== null && _a !== void 0 ? _a : isArray;
|
|
36
|
+
type = propertyOrType.type;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
type = propertyOrType;
|
|
40
|
+
}
|
|
41
|
+
if ((0, ts_morph_1.IsTypeImport)(type)) {
|
|
42
|
+
if (sourceFile) {
|
|
43
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, (0, ts_morph_1.TypeImportToImportStructure)(type));
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
console.warn('WriteType :: No source file provided to coerce imports');
|
|
47
|
+
}
|
|
48
|
+
}
|
|
5
49
|
return (w) => {
|
|
6
|
-
if (
|
|
50
|
+
if (isArray) {
|
|
7
51
|
w.write('Array<');
|
|
8
52
|
}
|
|
9
|
-
if (typeof
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
default:
|
|
18
|
-
w.write(property.type);
|
|
19
|
-
break;
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
else if (typeof property.type === 'function') {
|
|
23
|
-
property.type(w);
|
|
53
|
+
if (typeof type === 'string') {
|
|
54
|
+
WriteStringType(type, w);
|
|
55
|
+
}
|
|
56
|
+
else if (typeof type === 'function') {
|
|
57
|
+
type(w);
|
|
58
|
+
}
|
|
59
|
+
else if ((0, ts_morph_1.IsTypeImport)(type)) {
|
|
60
|
+
WriteStringType(type.name, w);
|
|
24
61
|
}
|
|
25
62
|
else {
|
|
26
63
|
throw new Error('Invalid type');
|
|
27
64
|
}
|
|
28
|
-
if (
|
|
65
|
+
if (isArray) {
|
|
29
66
|
w.write('>');
|
|
30
67
|
}
|
|
31
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-type.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/write-type.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"write-type.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/write-type.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAcxB,SAAgB,kBAAkB,CAAC,KAAU;IAC3C,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC;AAC1D,CAAC;AAFD,gDAEC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAY,EAAE,CAAkB;IAC9D,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM;QACR,KAAK,MAAM;YACT,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClB,MAAM;QACR;YACE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACd,MAAM;KACT;AACH,CAAC;AAZD,0CAYC;AAID,SAAgB,SAAS,CAAC,cAA4C,EAAE,UAAsB;;IAC5F,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,IAAe,CAAC;IACpB,IAAI,kBAAkB,CAAC,cAAc,CAAC,EAAE;QACtC,OAAO,GAAG,MAAA,cAAc,CAAC,OAAO,mCAAI,OAAO,CAAC;QAC5C,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;KAC5B;SAAM;QACL,IAAI,GAAG,cAAc,CAAC;KACvB;IACD,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,EAAE;QACtB,IAAI,UAAU,EAAE;YACd,IAAA,wBAAa,EAAC,UAAU,EAAE,IAAA,sCAA2B,EAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;SACxE;KACF;IACD,OAAO,CAAC,CAAkB,EAAE,EAAE;QAC5B,IAAI,OAAO,EAAE;YACX,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACnB;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC1B;aAAM,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YACrC,IAAI,CAAC,CAAC,CAAC,CAAC;SACT;aAAM,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,EAAE;YAC7B,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QACD,IAAI,OAAO,EAAE;YACX,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACd;IACH,CAAC,CAAC;AACJ,CAAC;AAjCD,8BAiCC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
1
2
|
import { WriterFunction } from 'ts-morph';
|
|
2
3
|
export interface FormDefinitionControl {
|
|
3
4
|
name: string;
|
|
4
|
-
type?: string | WriterFunction;
|
|
5
|
+
type?: string | TypeImport | WriterFunction;
|
|
5
6
|
isArray?: boolean;
|
|
6
7
|
state?: string | WriterFunction | null;
|
|
7
8
|
isRequired?: boolean;
|