@rxap/schematics-ts-morph 16.0.0-dev.25 → 16.0.0-dev.26
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 +10 -0
- package/package.json +3 -3
- package/src/lib/add-provider-to-array.d.ts +1 -1
- package/src/lib/add-provider-to-array.js +4 -3
- package/src/lib/add-provider-to-array.js.map +1 -1
- package/src/lib/add-to-array.d.ts +1 -1
- package/src/lib/add-to-array.js +4 -3
- package/src/lib/add-to-array.js.map +1 -1
- package/src/lib/angular/coerce-component.d.ts +1 -1
- package/src/lib/angular/coerce-component.js +1 -1
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-dialog-component.d.ts +2 -5
- package/src/lib/angular/coerce-dialog-component.js +2 -1
- package/src/lib/angular/coerce-dialog-component.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-control.js +13 -5
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-method-class.d.ts +1 -1
- package/src/lib/angular/coerce-method-class.js +1 -1
- package/src/lib/angular/coerce-method-class.js.map +1 -1
- package/src/lib/nest/add-nest-provider-to-array.d.ts +1 -1
- package/src/lib/nest/add-nest-provider-to-array.js +4 -3
- package/src/lib/nest/add-nest-provider-to-array.js.map +1 -1
- package/src/lib/nest/remove-nest-provider-to-array.d.ts +1 -1
- package/src/lib/nest/remove-nest-provider-to-array.js +1 -1
- package/src/lib/nest/remove-nest-provider-to-array.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
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.0.0-dev.26](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.25...@rxap/schematics-ts-morph@16.0.0-dev.26) (2023-10-09)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- only add validators import if used ([5b739e4](https://gitlab.com/rxap/packages/commit/5b739e4c4974e203d61f42f6d61017546e863f69))
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- support overwrite array ([e528c87](https://gitlab.com/rxap/packages/commit/e528c87fd5fb49898583e0c08c191942e7e2f8e4))
|
|
15
|
+
|
|
6
16
|
# [16.0.0-dev.25](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.24...@rxap/schematics-ts-morph@16.0.0-dev.25) (2023-10-02)
|
|
7
17
|
|
|
8
18
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0.0-dev.
|
|
2
|
+
"version": "16.0.0-dev.26",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"ts-morph": "^18.0.0",
|
|
18
18
|
"tslib": "2.6.2",
|
|
19
19
|
"@rxap/node-utilities": "1.1.0-dev.13",
|
|
20
|
-
"@rxap/workspace-utilities": "0.1.0-dev.
|
|
20
|
+
"@rxap/workspace-utilities": "0.1.0-dev.20"
|
|
21
21
|
},
|
|
22
22
|
"author": {
|
|
23
23
|
"name": "Merzough Münker",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"directory": "packages/schematic/ts-morph"
|
|
62
62
|
},
|
|
63
63
|
"type": "commonjs",
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "e74e74e04d2978364d8e781f5ec8a105f7c2443e",
|
|
65
65
|
"main": "./src/index.js",
|
|
66
66
|
"types": "./src/index.d.ts"
|
|
67
67
|
}
|
|
@@ -3,4 +3,4 @@ import { ProviderObject } from './provider-object';
|
|
|
3
3
|
/**
|
|
4
4
|
* @deprecated import from @rxap/ts-morph
|
|
5
5
|
*/
|
|
6
|
-
export declare function AddProviderToArray(providerObject: ProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean, compare?: (ole: ObjectLiteralExpression, po: ProviderObject) => boolean): Expression;
|
|
6
|
+
export declare function AddProviderToArray(providerObject: ProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean | string[], compare?: (ole: ObjectLiteralExpression, po: ProviderObject) => boolean): Expression;
|
|
@@ -38,16 +38,17 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
|
-
|
|
41
|
+
let index = providerArray.getElements().findIndex(element => {
|
|
42
42
|
if (element instanceof ts_morph_1.ObjectLiteralExpression) {
|
|
43
43
|
return compare(element, providerObject);
|
|
44
44
|
}
|
|
45
45
|
return false;
|
|
46
46
|
});
|
|
47
|
-
if (overwrite && index !== -1) {
|
|
47
|
+
if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
|
|
48
48
|
providerArray.removeElement(index);
|
|
49
|
+
index = -1;
|
|
49
50
|
}
|
|
50
|
-
if (
|
|
51
|
+
if (index === -1) {
|
|
51
52
|
expression = providerArray.addElement(ts_morph_1.Writers.object((0, utilities_1.DeleteUndefinedProperties)({
|
|
52
53
|
provide: providerObject.provide,
|
|
53
54
|
useClass: providerObject.useClass,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-provider-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,uCAMkB;AAGlB;;GAEG;AACH,SAAgB,kBAAkB,CAChC,cAAuC,EACvC,aAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"add-provider-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-provider-to-array.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,4 @@ import { SourceFile } from 'ts-morph';
|
|
|
9
9
|
* @param overwrite
|
|
10
10
|
* @constructor
|
|
11
11
|
*/
|
|
12
|
-
export declare function AddToArray(sourceFile: SourceFile, arrayName: string, value: string, type?: string, overwrite?: boolean): void;
|
|
12
|
+
export declare function AddToArray(sourceFile: SourceFile, arrayName: string, value: string, type?: string, overwrite?: boolean | string[]): void;
|
package/src/lib/add-to-array.js
CHANGED
|
@@ -19,11 +19,12 @@ function AddToArray(sourceFile, arrayName, value, type = 'any[]', overwrite = fa
|
|
|
19
19
|
type,
|
|
20
20
|
}).getInitializer();
|
|
21
21
|
if (providerArray instanceof ts_morph_1.ArrayLiteralExpression) {
|
|
22
|
-
|
|
23
|
-
if (overwrite && index !== -1) {
|
|
22
|
+
let index = providerArray.getElements().findIndex(element => element.getFullText().trim() === value);
|
|
23
|
+
if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
|
|
24
24
|
providerArray.removeElement(index);
|
|
25
|
+
index = -1;
|
|
25
26
|
}
|
|
26
|
-
if (
|
|
27
|
+
if (index === -1) {
|
|
27
28
|
providerArray.addElement(value);
|
|
28
29
|
}
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,+EAA0E;AAE1E;;;;;;;;;GASG;AACH,SAAgB,UAAU,CACxB,UAAsB,EACtB,SAAiB,EACjB,KAAa,EACb,IAAI,GAAG,OAAO,EACd,
|
|
1
|
+
{"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,+EAA0E;AAE1E;;;;;;;;;GASG;AACH,SAAgB,UAAU,CACxB,UAAsB,EACtB,SAAiB,EACjB,KAAa,EACb,IAAI,GAAG,OAAO,EACd,YAAgC,KAAK;IAGrC,MAAM,aAAa,GAAG,IAAA,uDAAyB,EAC7C,UAAU,EACV,SAAS,EACT;QACE,WAAW,EAAE,IAAI;QACjB,IAAI;KACL,CACF,CAAC,cAAc,EAAE,CAAC;IAEnB,IAAI,aAAa,YAAY,iCAAsB,EAAE;QAEnD,IAAI,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,CAAC;QAErG,IAAI,CACE,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3D,CACZ,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACrB,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,KAAK,GAAG,CAAC,CAAC,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACjC;KAEF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;AAEH,CAAC;AAtCD,gCAsCC"}
|
|
@@ -9,7 +9,7 @@ export interface CoerceComponentOptions extends TsMorphAngularProjectTransformOp
|
|
|
9
9
|
name: string;
|
|
10
10
|
flat?: boolean;
|
|
11
11
|
template?: TemplateOptions;
|
|
12
|
-
overwrite?: boolean;
|
|
12
|
+
overwrite?: boolean | string[];
|
|
13
13
|
tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceComponentOptions) => void;
|
|
14
14
|
}
|
|
15
15
|
export declare function CoerceComponentRule(options: Readonly<CoerceComponentOptions>): Rule;
|
|
@@ -56,7 +56,7 @@ function CoerceComponentRule(options) {
|
|
|
56
56
|
(0, schematics_utilities_1.CoerceFile)(tree, (0, path_1.join)(basePath, componentPath, `${name}.component.scss`), '');
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
|
-
if (template && (overwrite || !hasComponent)) {
|
|
59
|
+
if (template && (overwrite === true || (Array.isArray(overwrite) && (overwrite === null || overwrite === void 0 ? void 0 : overwrite.includes('template'))) || !hasComponent)) {
|
|
60
60
|
(_a = template.url) !== null && _a !== void 0 ? _a : (template.url = './files/component');
|
|
61
61
|
const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, core_1.strings), { prefix, scope: `${prefix}` }), options), ((_b = template === null || template === void 0 ? void 0 : template.options) !== null && _b !== void 0 ? _b : {})), { componentName: name });
|
|
62
62
|
(_c = templateOptions['prefix']) !== null && _c !== void 0 ? _c : (templateOptions['prefix'] = (0, schematics_utilities_1.GetProjectPrefix)(tree, options.project));
|
|
@@ -1 +1 @@
|
|
|
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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
|
|
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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"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
export interface CoerceDialogComponentOptions extends TsMorphAngularProjectTransformOptions {
|
|
3
|
+
import { CoerceComponentOptions } from './coerce-component';
|
|
4
|
+
export interface CoerceDialogComponentOptions extends Omit<CoerceComponentOptions, 'tsMorphTransform' | 'name'> {
|
|
6
5
|
dialogName: string;
|
|
7
6
|
title?: string;
|
|
8
|
-
overwrite?: boolean;
|
|
9
|
-
template?: TemplateOptions;
|
|
10
7
|
tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceDialogComponentOptions) => void;
|
|
11
8
|
coerceSubmitMethod?: (classDeclaration: ClassDeclaration, options: CoerceDialogComponentOptions) => void;
|
|
12
9
|
}
|
|
@@ -17,7 +17,7 @@ function DefaultDialogSubmitMethod(classDeclaration, options) {
|
|
|
17
17
|
}
|
|
18
18
|
exports.DefaultDialogSubmitMethod = DefaultDialogSubmitMethod;
|
|
19
19
|
function CoerceDialogComponentRule(options) {
|
|
20
|
-
let { template, coerceSubmitMethod, tsMorphTransform, directory, overwrite, title, dialogName, project, feature, } = options;
|
|
20
|
+
let { template, coerceSubmitMethod, tsMorphTransform, directory, overwrite, title, dialogName, project, feature, flat, } = options;
|
|
21
21
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
22
22
|
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => {
|
|
23
23
|
});
|
|
@@ -31,6 +31,7 @@ function CoerceDialogComponentRule(options) {
|
|
|
31
31
|
directory,
|
|
32
32
|
overwrite,
|
|
33
33
|
template,
|
|
34
|
+
flat,
|
|
34
35
|
tsMorphTransform: (_, [componentSourceFile], [componentClass]) => {
|
|
35
36
|
(0, add_component_import_1.AddComponentImport)(componentSourceFile, 'FlexLayoutModule', '@angular/flex-layout');
|
|
36
37
|
(0, add_component_import_1.AddComponentImport)(componentSourceFile, 'MatDialogModule', '@angular/material/dialog');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-dialog-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-component.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AAMpC,0EAAqE;AACrE,gEAA2D;
|
|
1
|
+
{"version":3,"file":"coerce-dialog-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,9 +60,17 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
|
|
|
60
60
|
for (let i = 0; i < control.validatorList.length; i++) {
|
|
61
61
|
const validator = control.validatorList[i];
|
|
62
62
|
if (isAngularValidator(validator)) {
|
|
63
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
64
|
+
namedImports: ['Validators'],
|
|
65
|
+
moduleSpecifier: '@angular/forms',
|
|
66
|
+
});
|
|
63
67
|
w.write('Validators.');
|
|
64
68
|
}
|
|
65
69
|
else {
|
|
70
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
71
|
+
namedImports: ['RxapValidators'],
|
|
72
|
+
moduleSpecifier: '@rxap/forms',
|
|
73
|
+
});
|
|
66
74
|
w.write('RxapValidators.');
|
|
67
75
|
}
|
|
68
76
|
w.write(validator);
|
|
@@ -74,6 +82,10 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
|
|
|
74
82
|
if (control.validatorList.length) {
|
|
75
83
|
w.write(',');
|
|
76
84
|
}
|
|
85
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
86
|
+
namedImports: ['Validators'],
|
|
87
|
+
moduleSpecifier: '@angular/forms',
|
|
88
|
+
});
|
|
77
89
|
w.write('Validators.required');
|
|
78
90
|
}
|
|
79
91
|
if (control.validatorList.length > 1 || (control.validatorList.length && control.isRequired)) {
|
|
@@ -105,13 +117,9 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
|
|
|
105
117
|
],
|
|
106
118
|
});
|
|
107
119
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
108
|
-
namedImports: ['RxapFormControl', 'UseFormControl'
|
|
120
|
+
namedImports: ['RxapFormControl', 'UseFormControl'],
|
|
109
121
|
moduleSpecifier: '@rxap/forms',
|
|
110
122
|
});
|
|
111
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
112
|
-
namedImports: ['Validators'],
|
|
113
|
-
moduleSpecifier: '@angular/forms',
|
|
114
|
-
});
|
|
115
123
|
return {
|
|
116
124
|
propertyDeclaration,
|
|
117
125
|
decoratorDeclaration,
|
|
@@ -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":"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
|
|
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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"}
|
|
@@ -2,7 +2,7 @@ import { ClassDeclaration, MethodDeclarationStructure, OptionalKind, Project, So
|
|
|
2
2
|
import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
|
|
3
3
|
export interface CoerceMethodClassOptions extends TsMorphAngularProjectTransformOptions {
|
|
4
4
|
name: string;
|
|
5
|
-
overwrite?: boolean;
|
|
5
|
+
overwrite?: boolean | string[];
|
|
6
6
|
providedIn?: string;
|
|
7
7
|
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => Partial<Omit<OptionalKind<MethodDeclarationStructure>, 'name'>>;
|
|
8
8
|
}
|
|
@@ -44,7 +44,7 @@ function CoerceMethodClass(options) {
|
|
|
44
44
|
]);
|
|
45
45
|
(_b = methodStructure.returnType) !== null && _b !== void 0 ? _b : (methodStructure.returnType = 'any');
|
|
46
46
|
const methodDeclaration = (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'call', methodStructure);
|
|
47
|
-
if (overwrite) {
|
|
47
|
+
if (overwrite === true || (Array.isArray(overwrite) && overwrite.includes('method-declaration'))) {
|
|
48
48
|
methodDeclaration.set(methodStructure);
|
|
49
49
|
}
|
|
50
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-method-class.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,uCAOkB;AAClB,kDAA8C;AAC9C,gEAA2D;AAC3D,8DAAyD;AACzD,8DAG+B;AAC/B,+DAA2D;AAa3D,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,IAAI,EACF,SAAS,EACT,IAAI,EACJ,gBAAgB,EAChB,UAAU,GACX,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,MAAM,SAAS,GAAG,IAAA,+BAAQ,EAAC,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAClD,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE;YAC1D,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,YAAY;oBAClB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAE,kBAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE;iBAChE;aACF;YACD,UAAU,EAAE,CAAE,QAAQ,CAAE;SACzB,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;SAC3B,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,YAAY,CAAE;SAC/B,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACjF,MAAA,eAAe,CAAC,UAAU,oCAA1B,eAAe,CAAC,UAAU,GAAK;YAC7B;gBACE,IAAI,EAAE,YAAY;gBAClB,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,KAAK;aACZ;SACF,EAAC;QACF,MAAA,eAAe,CAAC,UAAU,oCAA1B,eAAe,CAAC,UAAU,GAAK,KAAK,EAAC;QACrC,MAAM,iBAAiB,GAAG,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QACvF,IAAI,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"coerce-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-method-class.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,uCAOkB;AAClB,kDAA8C;AAC9C,gEAA2D;AAC3D,8DAAyD;AACzD,8DAG+B;AAC/B,+DAA2D;AAa3D,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,IAAI,EACF,SAAS,EACT,IAAI,EACJ,gBAAgB,EAChB,UAAU,GACX,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,MAAM,SAAS,GAAG,IAAA,+BAAQ,EAAC,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAClD,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE;YAC1D,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,YAAY;oBAClB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAE,kBAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE;iBAChE;aACF;YACD,UAAU,EAAE,CAAE,QAAQ,CAAE;SACzB,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;SAC3B,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,YAAY,CAAE;SAC/B,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACjF,MAAA,eAAe,CAAC,UAAU,oCAA1B,eAAe,CAAC,UAAU,GAAK;YAC7B;gBACE,IAAI,EAAE,YAAY;gBAClB,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,KAAK;aACZ;SACF,EAAC;QACF,MAAA,eAAe,CAAC,UAAU,oCAA1B,eAAe,CAAC,UAAU,GAAK,KAAK,EAAC;QACrC,MAAM,iBAAiB,GAAG,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QACvF,IAAI,SAAS,KAAK,IAAI,IAAI,CACxB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CACrE,EAAE;YACD,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SACxC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA/CD,8CA+CC"}
|
|
@@ -3,4 +3,4 @@ import { NestProviderObject } from './nest-provider-object';
|
|
|
3
3
|
/**
|
|
4
4
|
* @deprecated import from @rxap/ts-morph as CoerceNestProviderToArray
|
|
5
5
|
*/
|
|
6
|
-
export declare function AddNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean): void;
|
|
6
|
+
export declare function AddNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean | string[]): void;
|
|
@@ -13,7 +13,7 @@ function AddNestProviderToArray(providerObject, providerArray, overwrite = false
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
|
|
16
|
+
let index = providerArray.getElements().findIndex(element => {
|
|
17
17
|
var _a;
|
|
18
18
|
if (element instanceof ts_morph_1.ObjectLiteralExpression) {
|
|
19
19
|
const provideProperty = element.getProperty('provide');
|
|
@@ -23,10 +23,11 @@ function AddNestProviderToArray(providerObject, providerArray, overwrite = false
|
|
|
23
23
|
}
|
|
24
24
|
return false;
|
|
25
25
|
});
|
|
26
|
-
if (overwrite && index !== -1) {
|
|
26
|
+
if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
|
|
27
27
|
providerArray.removeElement(index);
|
|
28
|
+
index = -1;
|
|
28
29
|
}
|
|
29
|
-
if (
|
|
30
|
+
if (index === -1) {
|
|
30
31
|
providerArray.addElement(ts_morph_1.Writers.object((0, schematics_utilities_1.DeleteUndefinedProperties)({
|
|
31
32
|
provide: providerObject.provide,
|
|
32
33
|
useClass: providerObject.useClass,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,uCAKkB;AAGlB;;GAEG;AACH,SAAgB,sBAAsB,CACpC,cAA2C,EAC3C,aAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"add-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,uCAKkB;AAGlB;;GAEG;AACH,SAAgB,sBAAsB,CACpC,cAA2C,EAC3C,aAAqC,EACrC,YAAgC,KAAK;IAGrC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QAEtC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,cAAc,CAAC,EAAE;YACjG,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC1C;KAEF;SAAM;QAEL,IAAI,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;;YAC1D,IAAI,OAAO,YAAY,kCAAuB,EAAE;gBAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,eAAe,YAAY,6BAAkB,EAAE;oBACjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,WAAW,GAAG,IAAI,EAAE,MAAK,cAAc,CAAC,OAAO,CAAC;iBAC1F;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,CACE,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3D,CACZ,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACrB,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,KAAK,GAAG,CAAC,CAAC,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,aAAa,CAAC,UAAU,CAAC,kBAAO,CAAC,MAAM,CAAC,IAAA,gDAAyB,EAAC;gBAChE,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,KAAK,EAAE,cAAc,CAAC,KAAK;gBAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC7B,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAM,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAE,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC3G,SAAS;aACZ,CAAC,CAAC,CAAC,CAAC;SACN;KAEF;AAEH,CAAC;AAjDD,wDAiDC"}
|
|
@@ -3,4 +3,4 @@ import { NestProviderObject } from './nest-provider-object';
|
|
|
3
3
|
/**
|
|
4
4
|
* @deprecated import from @rxap/ts-morph
|
|
5
5
|
*/
|
|
6
|
-
export declare function RemoveNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean): void;
|
|
6
|
+
export declare function RemoveNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean | string[]): void;
|
|
@@ -23,7 +23,7 @@ function RemoveNestProviderToArray(providerObject, providerArray, overwrite = fa
|
|
|
23
23
|
}
|
|
24
24
|
return false;
|
|
25
25
|
});
|
|
26
|
-
if (overwrite && index !== -1) {
|
|
26
|
+
if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
|
|
27
27
|
providerArray.removeElement(index);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/remove-nest-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAGlB;;GAEG;AACH,SAAgB,yBAAyB,CACvC,cAA2C,EAC3C,aAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"remove-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/remove-nest-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAGlB;;GAEG;AACH,SAAgB,yBAAyB,CACvC,cAA2C,EAC3C,aAAqC,EACrC,YAAgC,KAAK;IAGrC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QAEtC,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,cAAc,CAAC,CAAC;QAC7G,IAAI,OAAO,EAAE;YACX,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;SACtD;KAEF;SAAM;QAEL,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;;YAC5D,IAAI,OAAO,YAAY,kCAAuB,EAAE;gBAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,eAAe,YAAY,6BAAkB,EAAE;oBACjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,WAAW,GAAG,IAAI,EAAE,MAAK,cAAc,CAAC,OAAO,CAAC;iBAC1F;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,CACE,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3D,CACZ,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACrB,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACpC;KAEF;AAEH,CAAC;AAnCD,8DAmCC"}
|