@rxap/schematics-ts-morph 18.1.0-dev.0 → 18.1.0-dev.2
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 +13 -0
- package/package.json +10 -10
- package/src/lib/angular/coerce-form-definition-form-control.js +36 -16
- package/src/lib/angular/coerce-form-definition-form-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.js +6 -8
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-form-providers-file.js +3 -0
- package/src/lib/angular/coerce-form-providers-file.js.map +1 -1
- package/src/lib/nest/build-nest-controller-name.d.ts +8 -5
- package/src/lib/nest/build-nest-controller-name.js +5 -30
- package/src/lib/nest/build-nest-controller-name.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,19 @@
|
|
|
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
|
+
# [18.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@18.1.0-dev.1...@rxap/schematics-ts-morph@18.1.0-dev.2) (2024-06-17)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- dont overwrite form definition decorators ([82e9162](https://gitlab.com/rxap/packages/commit/82e916206fc8e31add674c8a8f9011d8d7dfff12))
|
|
11
|
+
- dont overwrite UseFormControl props ([eed3be8](https://gitlab.com/rxap/packages/commit/eed3be8fd71885a98e704c14915871d64ab683d5))
|
|
12
|
+
|
|
13
|
+
# [18.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@18.1.0-dev.0...@rxap/schematics-ts-morph@18.1.0-dev.1) (2024-06-10)
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
- support autocomplete controls ([d5acd93](https://gitlab.com/rxap/packages/commit/d5acd93b543c33ed35387ba2b7a9ae43408e2f07))
|
|
18
|
+
|
|
6
19
|
# [18.1.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@18.0.3-dev.2...@rxap/schematics-ts-morph@18.1.0-dev.0) (2024-06-05)
|
|
7
20
|
|
|
8
21
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "18.1.0-dev.
|
|
2
|
+
"version": "18.1.0-dev.2",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
"peerDependencies": {
|
|
11
11
|
"@angular-devkit/core": "^18.0.2",
|
|
12
12
|
"@angular-devkit/schematics": "^18.0.2",
|
|
13
|
-
"@rxap/schematics-utilities": "^18.0.
|
|
14
|
-
"@rxap/ts-morph": "^1.
|
|
13
|
+
"@rxap/schematics-utilities": "^18.0.2-dev.0",
|
|
14
|
+
"@rxap/ts-morph": "^1.4.0-dev.0",
|
|
15
15
|
"@rxap/utilities": "^16.2.2",
|
|
16
|
-
"@rxap/workspace-ts-morph": "^19.1.0-dev.
|
|
17
|
-
"@rxap/workspace-utilities": "^19.2.0-dev.
|
|
16
|
+
"@rxap/workspace-ts-morph": "^19.1.0-dev.1",
|
|
17
|
+
"@rxap/workspace-utilities": "^19.2.0-dev.4",
|
|
18
18
|
"ts-morph": "^18.0.0"
|
|
19
19
|
},
|
|
20
20
|
"author": {
|
|
@@ -42,11 +42,11 @@
|
|
|
42
42
|
},
|
|
43
43
|
{
|
|
44
44
|
"package": "@rxap/schematics-utilities",
|
|
45
|
-
"version": "18.0.
|
|
45
|
+
"version": "18.0.2-dev.0"
|
|
46
46
|
},
|
|
47
47
|
{
|
|
48
48
|
"package": "@rxap/ts-morph",
|
|
49
|
-
"version": "1.
|
|
49
|
+
"version": "1.4.0-dev.0"
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
52
|
"package": "@rxap/utilities",
|
|
@@ -54,11 +54,11 @@
|
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
"package": "@rxap/workspace-ts-morph",
|
|
57
|
-
"version": "19.1.0-dev.
|
|
57
|
+
"version": "19.1.0-dev.1"
|
|
58
58
|
},
|
|
59
59
|
{
|
|
60
60
|
"package": "@rxap/workspace-utilities",
|
|
61
|
-
"version": "19.2.0-dev.
|
|
61
|
+
"version": "19.2.0-dev.4"
|
|
62
62
|
}
|
|
63
63
|
]
|
|
64
64
|
},
|
|
@@ -72,6 +72,6 @@
|
|
|
72
72
|
"directory": "packages/schematic/ts-morph"
|
|
73
73
|
},
|
|
74
74
|
"type": "commonjs",
|
|
75
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "5afd8658e3a0ef98b0f57be07094c6be6419a318",
|
|
76
76
|
"main": "./src/index.js"
|
|
77
77
|
}
|
|
@@ -17,6 +17,7 @@ function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeNa
|
|
|
17
17
|
}
|
|
18
18
|
exports.CoerceInterfaceFormTypeControl = CoerceInterfaceFormTypeControl;
|
|
19
19
|
function CoerceFormControl(sourceFile, classDeclaration, formTypeName, control) {
|
|
20
|
+
var _a;
|
|
20
21
|
const propertyDeclaration = (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({
|
|
21
22
|
type: w => {
|
|
22
23
|
w.write('RxapFormControl<');
|
|
@@ -27,26 +28,45 @@ function CoerceFormControl(sourceFile, classDeclaration, formTypeName, control)
|
|
|
27
28
|
scope: ts_morph_2.Scope.Public,
|
|
28
29
|
isReadonly: true,
|
|
29
30
|
});
|
|
30
|
-
const decoratorDeclaration = (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseFormControl')
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
const decoratorDeclaration = (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseFormControl', { arguments: [] });
|
|
32
|
+
const items = {};
|
|
33
|
+
if (((_a = control.validatorList) === null || _a === void 0 ? void 0 : _a.length) || control.isRequired) {
|
|
34
|
+
items['validators'] = (0, coerce_form_definition_control_1.FormControlValidatorCodeBlockWriter)(sourceFile, control);
|
|
35
|
+
}
|
|
36
|
+
if (control.state) {
|
|
37
|
+
items['state'] = (0, coerce_form_definition_control_1.FormControlStateCodeBlockWriter)(sourceFile, control);
|
|
38
|
+
}
|
|
39
|
+
else if (control.isArray) {
|
|
40
|
+
items['state'] = '[]';
|
|
41
|
+
}
|
|
42
|
+
if (Object.keys(items).length) {
|
|
43
|
+
const [firstArgument] = decoratorDeclaration.getArguments();
|
|
44
|
+
if (!firstArgument) {
|
|
45
|
+
decoratorDeclaration.set({ arguments: [ts_morph_2.Writers.object(items)] });
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
const argument = firstArgument.asKindOrThrow(ts_morph_2.SyntaxKind.ObjectLiteralExpression);
|
|
49
|
+
if (items['validators']) {
|
|
50
|
+
const validators = argument.getProperty('validators');
|
|
51
|
+
if (validators) {
|
|
52
|
+
// TODO : merge validators
|
|
53
|
+
console.log('validators already exists');
|
|
37
54
|
}
|
|
38
|
-
|
|
39
|
-
items['
|
|
55
|
+
else {
|
|
56
|
+
argument.addPropertyAssignment({ name: 'validators', initializer: items['validators'] });
|
|
40
57
|
}
|
|
41
|
-
|
|
42
|
-
|
|
58
|
+
}
|
|
59
|
+
if (items['state']) {
|
|
60
|
+
const state = argument.getProperty('state');
|
|
61
|
+
if (state) {
|
|
62
|
+
state.asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment).setInitializer(items['state']);
|
|
43
63
|
}
|
|
44
|
-
|
|
45
|
-
|
|
64
|
+
else {
|
|
65
|
+
argument.addPropertyAssignment({ name: 'state', initializer: items['state'] });
|
|
46
66
|
}
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
50
70
|
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
51
71
|
namedImports: ['RxapFormControl', 'UseFormControl'],
|
|
52
72
|
moduleSpecifier: '@rxap/forms',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-definition-form-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-form-control.ts"],"names":[],"mappings":";;;AACA,qEAAsD;AACtD,6CAKwB;AACxB,
|
|
1
|
+
{"version":3,"file":"coerce-form-definition-form-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-form-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,6 @@ const ts_morph_1 = require("@rxap/ts-morph");
|
|
|
6
6
|
const utilities_1 = require("@rxap/utilities");
|
|
7
7
|
const ts_morph_2 = require("ts-morph");
|
|
8
8
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
9
|
-
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
10
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
11
9
|
const coerce_form_definition_array_1 = require("./coerce-form-definition-array");
|
|
12
10
|
const coerce_form_definition_form_control_1 = require("./coerce-form-definition-form-control");
|
|
13
11
|
const coerce_form_definition_group_1 = require("./coerce-form-definition-group");
|
|
@@ -41,7 +39,7 @@ function CoerceFormDefinition(options) {
|
|
|
41
39
|
if (!classDeclaration.getImplements().some(implement => implement.getText().startsWith('FormType'))) {
|
|
42
40
|
classDeclaration.addImplements(`FormType<${interfaceName}>`);
|
|
43
41
|
}
|
|
44
|
-
(0,
|
|
42
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
45
43
|
namedImports: ['FormType'],
|
|
46
44
|
moduleSpecifier: '@rxap/forms',
|
|
47
45
|
});
|
|
@@ -52,19 +50,19 @@ function CoerceFormDefinition(options) {
|
|
|
52
50
|
isReadonly: true,
|
|
53
51
|
scope: ts_morph_2.Scope.Public,
|
|
54
52
|
});
|
|
55
|
-
(0,
|
|
53
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
56
54
|
namedImports: ['RxapFormGroup'],
|
|
57
55
|
moduleSpecifier: '@rxap/forms',
|
|
58
56
|
});
|
|
59
57
|
coerceFormControls(sourceFile, classDeclaration, interfaceName, options);
|
|
60
58
|
// region add class decorators
|
|
61
|
-
(0,
|
|
62
|
-
(0,
|
|
59
|
+
(0, ts_morph_1.CoerceDecorator)(classDeclaration, 'RxapForm', { arguments: [w => w.quote(name)] });
|
|
60
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
63
61
|
namedImports: ['RxapForm'],
|
|
64
62
|
moduleSpecifier: '@rxap/forms',
|
|
65
63
|
});
|
|
66
|
-
(0,
|
|
67
|
-
(0,
|
|
64
|
+
(0, ts_morph_1.CoerceDecorator)(classDeclaration, 'Injectable', { arguments: [] });
|
|
65
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
68
66
|
namedImports: ['Injectable'],
|
|
69
67
|
moduleSpecifier: '@angular/core',
|
|
70
68
|
});
|
|
@@ -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,
|
|
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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"}
|
|
@@ -17,6 +17,9 @@ function CoerceFormProvidersFile(options) {
|
|
|
17
17
|
const interfaceName = `I${className}`;
|
|
18
18
|
return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
|
|
19
19
|
const sourceFile = (0, coerce_source_file_1.CoerceSourceFile)(project, '/form.providers.ts');
|
|
20
|
+
if (sourceFile.getStatements().some(statement => statement.getText().includes(`// rxap-no-index-export`))) {
|
|
21
|
+
sourceFile.addStatements('// rxap-no-index-export');
|
|
22
|
+
}
|
|
20
23
|
(0, coerce_form_provider_1.CoerceFormProvider)(sourceFile, className);
|
|
21
24
|
(0, coerce_form_component_provider_1.CoerceFormComponentProvider)(sourceFile, {
|
|
22
25
|
provide: 'RXAP_FORM_DEFINITION',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-providers-file.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-providers-file.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,uCAAmC;AACnC,8DAAyD;AACzD,8DAA2E;AAC3E,iEAA6D;AAC7D,+DAA2D;AAC3D,qEAAiE;AACjE,iFAA2E;AAC3E,qFAA+E;AAC/E,iEAA4D;AAS5D,SAAgB,uBAAuB,CAAC,OAAiD;IACvF,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;IAExC,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAEnE,IAAA,yCAAkB,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAA,4DAA2B,EAAC,UAAU,EAAE;YACtC,OAAO,EAAE,sBAAsB;YAC/B,UAAU,EAAE,aAAa;YACzB,IAAI,EAAE,CAAE,UAAU,EAAE,6CAA6C,CAAE;SACpE,CAAC,CAAC;QACH,IAAA,wDAAyB,EAAC,UAAU,EAAE;YACpC,OAAO,EAAE,8BAA8B;YACvC,UAAU,EAAE,oBAAoB;YAChC,IAAI,EAAE,CAAE,UAAU,CAAE;SACrB,CAAC,CAAC;QACH,MAAM,8BAA8B,GAAG,IAAA,gCAAc,EAAC,UAAU,EAAE,aAAa,EAAE;YAC/E,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,UAAU;iBACjB;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,kBAAO,CAAC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;iBAC/C;aACF;YACD,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,IAAA,oCAAgB,EAAC,8BAA8B,EAAE;YAC/C,8BAA+B,aAAc,KAAM,SAAU,iCAAiC;SAC/F,CAAC,CAAC;QACH,MAAM,6BAA6B,GAAG,IAAA,gCAAc,EAAC,UAAU,EAAE,oBAAoB,EAAE;YACrF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,UAAU,EAAE,oBAAqB,SAAU,GAAG;SAC/C,CAAC,CAAC;QACH,IAAA,oCAAgB,EAAC,6BAA6B,EAAE;YAC9C,8BAA+B,aAAc,KAAM,SAAU,cAAc;SAC5E,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,SAAS,EAAE,aAAa,CAAE;YAC1C,eAAe,EAAE,KAAM,IAAK,OAAO;SACpC,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE;gBACZ,UAAU;gBACV,UAAU;gBACV,UAAU;aACX;YACD,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE;gBACZ,iBAAiB;gBACjB,8BAA8B;gBAC9B,sBAAsB;gBACtB,yBAAyB;aAC1B;YACD,eAAe,EAAE,aAAa;SAC/B,CAAC,CAAC;IAEL,CAAC,CAAC,CAAC;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"coerce-form-providers-file.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-providers-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import { BuildNestControllerNameOptions as NEW_BuildNestControllerNameOptions } from '@rxap/workspace-utilities';
|
|
2
|
+
/**
|
|
3
|
+
* @deprecated import from @rxap/workspace-utilities
|
|
4
|
+
*/
|
|
5
|
+
export type BuildNestControllerNameOptions = NEW_BuildNestControllerNameOptions;
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated import from @rxap/workspace-utilities
|
|
8
|
+
*/
|
|
6
9
|
export declare function BuildNestControllerName(options: BuildNestControllerNameOptions): string;
|
|
@@ -1,37 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BuildNestControllerName = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
4
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated import from @rxap/workspace-utilities
|
|
7
|
+
*/
|
|
6
8
|
function BuildNestControllerName(options) {
|
|
7
|
-
|
|
8
|
-
if (nestModule && nestModule !== controllerName) {
|
|
9
|
-
console.log('The nest module name is different from the controller name');
|
|
10
|
-
if (controllerName) {
|
|
11
|
-
console.log('controllerName', controllerName);
|
|
12
|
-
if (!controllerName.startsWith(nestModule)) {
|
|
13
|
-
console.log('The controller name is not prefixed with the nest module name');
|
|
14
|
-
controllerName = [nestModule, controllerName].join('-');
|
|
15
|
-
}
|
|
16
|
-
else {
|
|
17
|
-
console.warn('The controller name is already prefixed with the nest module name');
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
console.warn('The controller name is not defined');
|
|
22
|
-
controllerName = nestModule;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
else {
|
|
26
|
-
console.log('The nest module name is the same as the controller name');
|
|
27
|
-
}
|
|
28
|
-
if (controllerNameSuffix) {
|
|
29
|
-
controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);
|
|
30
|
-
}
|
|
31
|
-
if (!controllerName) {
|
|
32
|
-
throw new schematics_1.SchematicsException('Could not determine the controller name');
|
|
33
|
-
}
|
|
34
|
-
return controllerName;
|
|
9
|
+
return (0, workspace_utilities_1.BuildNestControllerName)(options);
|
|
35
10
|
}
|
|
36
11
|
exports.BuildNestControllerName = BuildNestControllerName;
|
|
37
12
|
//# sourceMappingURL=build-nest-controller-name.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,mEAGmC;AAOnC;;GAEG;AACH,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,OAAO,IAAA,6CAA2B,EAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAFD,0DAEC"}
|