@rxap/schematics-ts-morph 16.0.0-dev.10 → 16.0.0-dev.11
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 +6 -0
- package/README.md +1 -1
- package/package.json +7 -7
- package/src/index.js +141 -144
- package/src/index.js.map +1 -1
- package/src/lib/add-class-method.js +5 -6
- package/src/lib/add-class-method.js.map +1 -1
- package/src/lib/add-dir.js +4 -8
- package/src/lib/add-dir.js.map +1 -1
- package/src/lib/add-fake-provider.js +18 -23
- package/src/lib/add-fake-provider.js.map +1 -1
- package/src/lib/add-method-class.js +14 -20
- package/src/lib/add-method-class.js.map +1 -1
- package/src/lib/add-provider-to-array.js +7 -12
- package/src/lib/add-provider-to-array.js.map +1 -1
- package/src/lib/add-to-array.js +5 -9
- package/src/lib/add-to-array.js.map +1 -1
- package/src/lib/add-variable-fake-provider.js +5 -9
- package/src/lib/add-variable-fake-provider.js.map +1 -1
- package/src/lib/add-variable-provider.js +10 -14
- package/src/lib/add-variable-provider.js.map +1 -1
- package/src/lib/angular/add-component-animations.js +7 -11
- package/src/lib/angular/add-component-animations.js.map +1 -1
- package/src/lib/angular/add-component-fake-provider.js +5 -9
- package/src/lib/angular/add-component-fake-provider.js.map +1 -1
- package/src/lib/angular/add-component-import.js +7 -11
- package/src/lib/angular/add-component-import.js.map +1 -1
- package/src/lib/angular/add-component-input.js +11 -15
- package/src/lib/angular/add-component-input.js.map +1 -1
- package/src/lib/angular/add-component-provider.js +9 -13
- package/src/lib/angular/add-component-provider.js.map +1 -1
- package/src/lib/angular/add-control-validator.js +5 -10
- package/src/lib/angular/add-control-validator.js.map +1 -1
- package/src/lib/angular/add-dependency-injection.js +14 -19
- package/src/lib/angular/add-dependency-injection.js.map +1 -1
- package/src/lib/angular/add-ng-module-export.js +7 -11
- package/src/lib/angular/add-ng-module-export.js.map +1 -1
- package/src/lib/angular/add-ng-module-import.js +7 -11
- package/src/lib/angular/add-ng-module-import.js.map +1 -1
- package/src/lib/angular/add-ng-module-provider.js +9 -13
- package/src/lib/angular/add-ng-module-provider.js.map +1 -1
- package/src/lib/angular/build-angular-base-path.js +8 -12
- package/src/lib/angular/build-angular-base-path.js.map +1 -1
- package/src/lib/angular/coerce-accordion-component.js +5 -9
- package/src/lib/angular/coerce-accordion-component.js.map +1 -1
- package/src/lib/angular/coerce-component-class.js +17 -21
- package/src/lib/angular/coerce-component-class.js.map +1 -1
- package/src/lib/angular/coerce-component.js +40 -38
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-data-source-class.js +27 -35
- package/src/lib/angular/coerce-data-source-class.js.map +1 -1
- package/src/lib/angular/coerce-dialog-component.js +27 -32
- package/src/lib/angular/coerce-dialog-component.js.map +1 -1
- package/src/lib/angular/coerce-dialog-table-action-component.js +35 -39
- package/src/lib/angular/coerce-dialog-table-action-component.js.map +1 -1
- package/src/lib/angular/coerce-dialog-table-action.js +27 -24
- package/src/lib/angular/coerce-dialog-table-action.js.map +1 -1
- package/src/lib/angular/coerce-form-builder-provider.js +15 -20
- package/src/lib/angular/coerce-form-builder-provider.js.map +1 -1
- package/src/lib/angular/coerce-form-component-provider.js +16 -21
- package/src/lib/angular/coerce-form-component-provider.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-control.js +32 -40
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-type.js +14 -19
- package/src/lib/angular/coerce-form-definition-type.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.js +32 -37
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-form-provider.js +15 -20
- package/src/lib/angular/coerce-form-provider.js.map +1 -1
- package/src/lib/angular/coerce-form-providers-file.js +25 -29
- package/src/lib/angular/coerce-form-providers-file.js.map +1 -1
- package/src/lib/angular/coerce-form-table-action.js +38 -33
- package/src/lib/angular/coerce-form-table-action.js.map +1 -1
- package/src/lib/angular/coerce-method-class.js +21 -26
- package/src/lib/angular/coerce-method-class.js.map +1 -1
- package/src/lib/angular/coerce-navigation-table-action.js +25 -21
- package/src/lib/angular/coerce-navigation-table-action.js.map +1 -1
- package/src/lib/angular/coerce-operation-table-action.js +26 -23
- package/src/lib/angular/coerce-operation-table-action.js.map +1 -1
- package/src/lib/angular/coerce-options-data-source.js +12 -16
- package/src/lib/angular/coerce-options-data-source.js.map +1 -1
- package/src/lib/angular/coerce-project-feature.js +10 -14
- package/src/lib/angular/coerce-project-feature.js.map +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.js +24 -29
- package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-table-action-index-provider.js +8 -12
- package/src/lib/angular/coerce-table-action-index-provider.js.map +1 -1
- package/src/lib/angular/coerce-table-action-index.js +7 -11
- package/src/lib/angular/coerce-table-action-index.js.map +1 -1
- package/src/lib/angular/coerce-table-action-provider.js +19 -24
- package/src/lib/angular/coerce-table-action-provider.js.map +1 -1
- package/src/lib/angular/coerce-table-action.js +41 -36
- package/src/lib/angular/coerce-table-action.js.map +1 -1
- package/src/lib/angular/coerce-table-data-source.js +26 -25
- package/src/lib/angular/coerce-table-data-source.js.map +1 -1
- package/src/lib/angular/coerce-table-header-button-method.js +22 -24
- package/src/lib/angular/coerce-table-header-button-method.js.map +1 -1
- package/src/lib/angular/coerce-table-parameters-from-route.js +18 -22
- package/src/lib/angular/coerce-table-parameters-from-route.js.map +1 -1
- package/src/lib/angular/coerce-table-select-resolve-value-method.js +19 -20
- package/src/lib/angular/coerce-table-select-resolve-value-method.js.map +1 -1
- package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js +22 -19
- package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js +22 -19
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/enforce-use-form-control-order.js +6 -10
- package/src/lib/angular/enforce-use-form-control-order.js.map +1 -1
- package/src/lib/angular/find-component-module-source-file.js +3 -7
- package/src/lib/angular/find-component-module-source-file.js.map +1 -1
- package/src/lib/angular/find-component-source-file.js +3 -7
- package/src/lib/angular/find-component-source-file.js.map +1 -1
- package/src/lib/angular/find-routing-module.js +4 -9
- package/src/lib/angular/find-routing-module.js.map +1 -1
- package/src/lib/angular/form-definition-utilities.js +11 -19
- package/src/lib/angular/form-definition-utilities.js.map +1 -1
- package/src/lib/angular/get-component-class.js +1 -5
- package/src/lib/angular/get-component-class.js.map +1 -1
- package/src/lib/angular/get-component-options-object.js +4 -8
- package/src/lib/angular/get-component-options-object.js.map +1 -1
- package/src/lib/angular/get-ng-module-options-object.js +4 -8
- package/src/lib/angular/get-ng-module-options-object.js.map +1 -1
- package/src/lib/angular/handle-component-module.js +1 -2
- package/src/lib/angular/handle-component.js +1 -2
- package/src/lib/angular/has-accordion-component.js +12 -16
- package/src/lib/angular/has-accordion-component.js.map +1 -1
- package/src/lib/angular/has-component.js +14 -18
- package/src/lib/angular/has-component.js.map +1 -1
- package/src/lib/angular/has-dialog-component.js +5 -9
- package/src/lib/angular/has-dialog-component.js.map +1 -1
- package/src/lib/angular/has-project-feature.js +10 -14
- package/src/lib/angular/has-project-feature.js.map +1 -1
- package/src/lib/angular/has-table-component.js +10 -14
- package/src/lib/angular/has-table-component.js.map +1 -1
- package/src/lib/angular/index.js +26 -29
- package/src/lib/angular/index.js.map +1 -1
- package/src/lib/auto-import.js +7 -11
- package/src/lib/auto-import.js.map +1 -1
- package/src/lib/coerce-class-constructor.js +1 -5
- package/src/lib/coerce-class-constructor.js.map +1 -1
- package/src/lib/coerce-class-method.js +1 -5
- package/src/lib/coerce-class-method.js.map +1 -1
- package/src/lib/coerce-class.js +5 -6
- package/src/lib/coerce-class.js.map +1 -1
- package/src/lib/coerce-property-key.js +1 -5
- package/src/lib/coerce-property-key.js.map +1 -1
- package/src/lib/coerce-source-file.js +1 -5
- package/src/lib/coerce-source-file.js.map +1 -1
- package/src/lib/coerce-variable-declaration.js +14 -13
- package/src/lib/coerce-variable-declaration.js.map +1 -1
- package/src/lib/fix-missing-imports.js +7 -11
- package/src/lib/fix-missing-imports.js.map +1 -1
- package/src/lib/get-array-declaration.js +5 -9
- package/src/lib/get-array-declaration.js.map +1 -1
- package/src/lib/get-class-decorator-arguments.js +2 -7
- package/src/lib/get-class-decorator-arguments.js.map +1 -1
- package/src/lib/get-coerce-array-literal-form-object-literal.js +4 -8
- package/src/lib/get-coerce-array-literal-form-object-literal.js.map +1 -1
- package/src/lib/get-form-providers-source-file.js +8 -13
- package/src/lib/get-form-providers-source-file.js.map +1 -1
- package/src/lib/get-variable-declaration.js +2 -7
- package/src/lib/get-variable-declaration.js.map +1 -1
- package/src/lib/is-array-literal-expression.js +4 -9
- package/src/lib/is-array-literal-expression.js.map +1 -1
- package/src/lib/merge-ts-morph-project.js +3 -7
- package/src/lib/merge-ts-morph-project.js.map +1 -1
- package/src/lib/nest/add-nest-controller.js +15 -20
- package/src/lib/nest/add-nest-controller.js.map +1 -1
- package/src/lib/nest/add-nest-module-controller.js +9 -13
- package/src/lib/nest/add-nest-module-controller.js.map +1 -1
- package/src/lib/nest/add-nest-module-import.js +8 -12
- package/src/lib/nest/add-nest-module-import.js.map +1 -1
- package/src/lib/nest/add-nest-module-provider.js +9 -13
- package/src/lib/nest/add-nest-module-provider.js.map +1 -1
- package/src/lib/nest/add-nest-module-to-app-module.js +12 -16
- package/src/lib/nest/add-nest-module-to-app-module.js.map +1 -1
- package/src/lib/nest/add-nest-provider-to-array.js +7 -12
- package/src/lib/nest/add-nest-provider-to-array.js.map +1 -1
- package/src/lib/nest/add-operation-to-controller.js +67 -74
- package/src/lib/nest/add-operation-to-controller.js.map +1 -1
- package/src/lib/nest/assert-nest-project.js +5 -9
- package/src/lib/nest/assert-nest-project.js.map +1 -1
- package/src/lib/nest/build-nest-base-path.js +8 -12
- package/src/lib/nest/build-nest-base-path.js.map +1 -1
- package/src/lib/nest/build-nest-controller-name.js +5 -9
- package/src/lib/nest/build-nest-controller-name.js.map +1 -1
- package/src/lib/nest/coerce-dto-class.js +36 -41
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-form-submit-operation.js +21 -17
- package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-by-id-operation.js +19 -16
- package/src/lib/nest/coerce-get-by-id-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-children-operation.js +24 -20
- package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-data-grid-operation.js +22 -18
- package/src/lib/nest/coerce-get-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.js +53 -56
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.js +22 -18
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-nest-controller.js +28 -32
- package/src/lib/nest/coerce-nest-controller.js.map +1 -1
- package/src/lib/nest/coerce-nest-module.js +17 -21
- package/src/lib/nest/coerce-nest-module.js.map +1 -1
- package/src/lib/nest/coerce-nest-service-project.js +8 -12
- package/src/lib/nest/coerce-nest-service-project.js.map +1 -1
- package/src/lib/nest/coerce-operation.js +25 -27
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.js +17 -18
- package/src/lib/nest/coerce-options-operation.js.map +1 -1
- package/src/lib/nest/coerce-page-dto-class.js +11 -15
- package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-row-dto-class.js +7 -11
- package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-submit-data-grid-operation.js +11 -12
- package/src/lib/nest/coerce-submit-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-operation.js +10 -11
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +14 -15
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
- package/src/lib/nest/coerce-tree-operation.js +21 -18
- package/src/lib/nest/coerce-tree-operation.js.map +1 -1
- package/src/lib/nest/create-dto-class.js +24 -30
- package/src/lib/nest/create-dto-class.js.map +1 -1
- package/src/lib/nest/find-nest-module-declaration.js +5 -9
- package/src/lib/nest/find-nest-module-declaration.js.map +1 -1
- package/src/lib/nest/find-nest-module-source-file.js +3 -7
- package/src/lib/nest/find-nest-module-source-file.js.map +1 -1
- package/src/lib/nest/get-nest-module-metadata.js +7 -11
- package/src/lib/nest/get-nest-module-metadata.js.map +1 -1
- package/src/lib/nest/has-nest-controller.js +7 -11
- package/src/lib/nest/has-nest-controller.js.map +1 -1
- package/src/lib/nest/has-nest-module-class.js +3 -7
- package/src/lib/nest/has-nest-module-class.js.map +1 -1
- package/src/lib/nest/has-nest-module.js +11 -15
- package/src/lib/nest/has-nest-module.js.map +1 -1
- package/src/lib/nest/is-nest-module-class.js +1 -5
- package/src/lib/nest/is-nest-module-class.js.map +1 -1
- package/src/lib/nest/nest-provider-object.js +1 -2
- package/src/lib/nest/operation-id-utilities.js +37 -52
- package/src/lib/nest/operation-id-utilities.js.map +1 -1
- package/src/lib/nest/project-utilities.js +4 -9
- package/src/lib/nest/project-utilities.js.map +1 -1
- package/src/lib/nest/remove-nest-module-provider.js +7 -11
- package/src/lib/nest/remove-nest-module-provider.js.map +1 -1
- package/src/lib/nest/remove-nest-provider-to-array.js +5 -10
- package/src/lib/nest/remove-nest-provider-to-array.js.map +1 -1
- package/src/lib/organize-imports.js +5 -9
- package/src/lib/organize-imports.js.map +1 -1
- package/src/lib/overwrite-decorator.js +2 -6
- package/src/lib/overwrite-decorator.js.map +1 -1
- package/src/lib/overwrite-property.js +2 -6
- package/src/lib/overwrite-property.js.map +1 -1
- package/src/lib/provider-object.js +1 -2
- package/src/lib/to-value-context.js +1 -2
- package/src/lib/ts-morph/apply-ts-morph-project.js +3 -7
- package/src/lib/ts-morph/apply-ts-morph-project.js.map +1 -1
- package/src/lib/ts-morph/coerce-class-implementation.js +1 -5
- package/src/lib/ts-morph/coerce-class-implementation.js.map +1 -1
- package/src/lib/ts-morph/coerce-class-property.js +5 -6
- package/src/lib/ts-morph/coerce-class-property.js.map +1 -1
- package/src/lib/ts-morph/coerce-decorator.js +7 -8
- package/src/lib/ts-morph/coerce-decorator.js.map +1 -1
- package/src/lib/ts-morph/coerce-function.js +1 -5
- package/src/lib/ts-morph/coerce-function.js.map +1 -1
- package/src/lib/ts-morph/coerce-imports.js +1 -5
- package/src/lib/ts-morph/coerce-imports.js.map +1 -1
- package/src/lib/ts-morph/coerce-interface.js +11 -13
- package/src/lib/ts-morph/coerce-interface.js.map +1 -1
- package/src/lib/ts-morph/coerce-parameter-declaration.js +3 -6
- package/src/lib/ts-morph/coerce-parameter-declaration.js.map +1 -1
- package/src/lib/ts-morph/coerce-statements.js +1 -5
- package/src/lib/ts-morph/coerce-statements.js.map +1 -1
- package/src/lib/ts-morph/coerce-type-alias.js +6 -6
- package/src/lib/ts-morph/coerce-type-alias.js.map +1 -1
- package/src/lib/ts-morph/find-function.js +1 -5
- package/src/lib/ts-morph/find-function.js.map +1 -1
- package/src/lib/ts-morph/write-type.js +1 -5
- package/src/lib/ts-morph/write-type.js.map +1 -1
- package/src/lib/ts-morph-transform.js +7 -13
- package/src/lib/ts-morph-transform.js.map +1 -1
- package/src/lib/types/form-definition-control.js +1 -2
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
6
|
-
const coerce_imports_1 = require("./ts-morph/coerce-imports");
|
|
7
|
-
exports.DEFAULT_ADD_METHOD_CLASS_OPTIONS = {
|
|
1
|
+
import { Scope, } from 'ts-morph';
|
|
2
|
+
import { CoerceSuffix } from '@rxap/schematics-utilities';
|
|
3
|
+
import { CoerceImports } from './ts-morph/coerce-imports';
|
|
4
|
+
export const DEFAULT_ADD_METHOD_CLASS_OPTIONS = {
|
|
8
5
|
structures: [],
|
|
9
6
|
returnType: 'any',
|
|
10
7
|
parameterType: 'any',
|
|
@@ -15,19 +12,17 @@ exports.DEFAULT_ADD_METHOD_CLASS_OPTIONS = {
|
|
|
15
12
|
decorators: [],
|
|
16
13
|
ctors: [],
|
|
17
14
|
};
|
|
18
|
-
function CoerceMethodClassLegacy(sourceFile, name, options = {}) {
|
|
19
|
-
name =
|
|
15
|
+
export function CoerceMethodClassLegacy(sourceFile, name, options = {}) {
|
|
16
|
+
name = CoerceSuffix(name, 'Method');
|
|
20
17
|
const hasClass = !!sourceFile.getClass(name);
|
|
21
18
|
if (!hasClass) {
|
|
22
19
|
AddMethodClass(sourceFile, name, options);
|
|
23
20
|
}
|
|
24
21
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const
|
|
29
|
-
name = (0, schematics_utilities_1.CoerceSuffix)(name, 'Method');
|
|
30
|
-
const decorators = (_a = options.decorators) !== null && _a !== void 0 ? _a : [];
|
|
22
|
+
export function AddMethodClass(sourceFile, name, options = {}) {
|
|
23
|
+
const parameters = Object.assign({}, DEFAULT_ADD_METHOD_CLASS_OPTIONS, options);
|
|
24
|
+
name = CoerceSuffix(name, 'Method');
|
|
25
|
+
const decorators = options.decorators ?? [];
|
|
31
26
|
if (!decorators.some(d => d.name === 'Injectable')) {
|
|
32
27
|
decorators.push({
|
|
33
28
|
name: 'Injectable',
|
|
@@ -48,7 +43,7 @@ function AddMethodClass(sourceFile, name, options = {}) {
|
|
|
48
43
|
{
|
|
49
44
|
name: 'call',
|
|
50
45
|
isAsync: parameters.isAsync,
|
|
51
|
-
scope:
|
|
46
|
+
scope: Scope.Public,
|
|
52
47
|
parameters: [
|
|
53
48
|
{
|
|
54
49
|
name: 'parameters',
|
|
@@ -56,11 +51,11 @@ function AddMethodClass(sourceFile, name, options = {}) {
|
|
|
56
51
|
},
|
|
57
52
|
],
|
|
58
53
|
returnType: parameters.isAsync ? `Promise<${parameters.returnType}>` : parameters.returnType,
|
|
59
|
-
statements:
|
|
54
|
+
statements: parameters.statements ?? [],
|
|
60
55
|
},
|
|
61
56
|
],
|
|
62
57
|
});
|
|
63
|
-
|
|
58
|
+
CoerceImports(sourceFile, [
|
|
64
59
|
{
|
|
65
60
|
namedImports: ['Injectable'],
|
|
66
61
|
moduleSpecifier: '@angular/core',
|
|
@@ -70,7 +65,6 @@ function AddMethodClass(sourceFile, name, options = {}) {
|
|
|
70
65
|
moduleSpecifier: '@rxap/rxjs',
|
|
71
66
|
},
|
|
72
67
|
]);
|
|
73
|
-
|
|
68
|
+
CoerceImports(sourceFile, parameters.structures);
|
|
74
69
|
}
|
|
75
|
-
exports.AddMethodClass = AddMethodClass;
|
|
76
70
|
//# sourceMappingURL=add-method-class.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-method-class.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-method-class.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-method-class.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-method-class.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,GAKN,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAa1D,MAAM,CAAC,MAAM,gCAAgC,GAAoC;IAC/E,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,EAAE;IACd,cAAc,EAAE,EAAE;IAClB,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,UAAU,uBAAuB,CACrC,UAAsB,EACtB,IAAY,EACZ,UAAiC,EAAE;IAGnC,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAI,CAAC,QAAQ,EAAE;QACb,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;KAC3C;AAEH,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,UAAsB,EACtB,IAAY,EACZ,UAAiC,EAAE;IAGnC,MAAM,UAAU,GAAoC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAEjH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAE5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE;QAClD,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;KACJ;IAED,UAAU,CAAC,QAAQ,CAAC;QAClB,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,IAAI;QAChB,UAAU;QACV,cAAc,EAAE,UAAU,CAAC,cAAc;QACzC,UAAU,EAAE;YACV,UAAW,UAAU,CAAC,UAAW,KAAM,UAAU,CAAC,aAAc,GAAG;YACnE,GAAG,UAAU,CAAC,UAAU;SACzB;QACD,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,UAAU,CAAC,aAAa;qBAC/B;iBACF;gBACD,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,WAAY,UAAU,CAAC,UAAW,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU;gBAC9F,UAAU,EAAE,UAAU,CAAC,UAAU,IAAI,EAAE;aACxC;SACF;KACF,CAAC,CAAC;IACH,aAAa,CAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE,CAAE,YAAY,CAAE;YAC9B,eAAe,EAAE,eAAe;SACjC;QACD;YACE,YAAY,EAAE,CAAE,QAAQ,CAAE;YAC1B,eAAe,EAAE,YAAY;SAC9B;KACF,CAAC,CAAC;IACH,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;AAEnD,CAAC"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
-
const ts_morph_1 = require("ts-morph");
|
|
6
|
-
function AddProviderToArray(providerObject, providerArray, overwrite = false, compare = (ole, po) => {
|
|
7
|
-
var _a;
|
|
1
|
+
import { DeleteUndefinedProperties } from '@rxap/schematics-utilities';
|
|
2
|
+
import { ObjectLiteralExpression, PropertyAssignment, Writers, } from 'ts-morph';
|
|
3
|
+
export function AddProviderToArray(providerObject, providerArray, overwrite = false, compare = (ole, po) => {
|
|
8
4
|
const provideProperty = ole.getProperty('provide');
|
|
9
|
-
if (provideProperty instanceof
|
|
10
|
-
return
|
|
5
|
+
if (provideProperty instanceof PropertyAssignment) {
|
|
6
|
+
return provideProperty.getInitializer()?.getFullText().trim() === po.provide;
|
|
11
7
|
}
|
|
12
8
|
return false;
|
|
13
9
|
}) {
|
|
@@ -18,7 +14,7 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
|
|
|
18
14
|
}
|
|
19
15
|
else {
|
|
20
16
|
const index = providerArray.getElements().findIndex(element => {
|
|
21
|
-
if (element instanceof
|
|
17
|
+
if (element instanceof ObjectLiteralExpression) {
|
|
22
18
|
return compare(element, providerObject);
|
|
23
19
|
}
|
|
24
20
|
return false;
|
|
@@ -27,7 +23,7 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
|
|
|
27
23
|
providerArray.removeElement(index);
|
|
28
24
|
}
|
|
29
25
|
if (overwrite || index === -1) {
|
|
30
|
-
providerArray.addElement(
|
|
26
|
+
providerArray.addElement(Writers.object(DeleteUndefinedProperties({
|
|
31
27
|
provide: providerObject.provide,
|
|
32
28
|
useClass: providerObject.useClass,
|
|
33
29
|
useFactory: providerObject.useFactory,
|
|
@@ -43,5 +39,4 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
|
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
41
|
}
|
|
46
|
-
exports.AddProviderToArray = AddProviderToArray;
|
|
47
42
|
//# sourceMappingURL=add-provider-to-array.js.map
|
|
@@ -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":"
|
|
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,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAEL,uBAAuB,EACvB,kBAAkB,EAClB,OAAO,GACR,MAAM,UAAU,CAAC;AAGlB,MAAM,UAAU,kBAAkB,CAChC,cAAuC,EACvC,aAAqC,EACrC,SAAS,GAAG,KAAK,EACjB,UAAyE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;IACnF,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,eAAe,YAAY,kBAAkB,EAAE;QAEjD,OAAO,eAAe,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC;KAE9E;IACD,OAAO,KAAK,CAAC;AACf,CAAC;IAGD,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,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YAE5D,IAAI,OAAO,YAAY,uBAAuB,EAAE;gBAC9C,OAAO,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;aACzC;YAED,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAC7B,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACpC;QAED,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAC7B,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC;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,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;oBACzB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAE,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACrG,SAAS;gBACX,KAAK,EAAE,cAAc,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;oBACpC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oBACtB,cAAc,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;aACrE,CAAC,CAAC,CAAC,CAAC;SACN;KAEF;AAEH,CAAC"}
|
package/src/lib/add-to-array.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.AddToArray = void 0;
|
|
4
|
-
const ts_morph_1 = require("ts-morph");
|
|
5
|
-
const coerce_variable_declaration_1 = require("./coerce-variable-declaration");
|
|
1
|
+
import { ArrayLiteralExpression, } from 'ts-morph';
|
|
2
|
+
import { CoerceVariableDeclaration } from './coerce-variable-declaration';
|
|
6
3
|
/**
|
|
7
4
|
* Adds the value to the array with the name arrayName
|
|
8
5
|
*
|
|
@@ -13,12 +10,12 @@ const coerce_variable_declaration_1 = require("./coerce-variable-declaration");
|
|
|
13
10
|
* @param overwrite
|
|
14
11
|
* @constructor
|
|
15
12
|
*/
|
|
16
|
-
function AddToArray(sourceFile, arrayName, value, type = 'any[]', overwrite = false) {
|
|
17
|
-
const providerArray =
|
|
13
|
+
export function AddToArray(sourceFile, arrayName, value, type = 'any[]', overwrite = false) {
|
|
14
|
+
const providerArray = CoerceVariableDeclaration(sourceFile, arrayName, {
|
|
18
15
|
initializer: '[]',
|
|
19
16
|
type,
|
|
20
17
|
}).getInitializer();
|
|
21
|
-
if (providerArray instanceof
|
|
18
|
+
if (providerArray instanceof ArrayLiteralExpression) {
|
|
22
19
|
const index = providerArray.getElements().findIndex(element => element.getFullText().trim() === value);
|
|
23
20
|
if (overwrite && index !== -1) {
|
|
24
21
|
providerArray.removeElement(index);
|
|
@@ -31,5 +28,4 @@ function AddToArray(sourceFile, arrayName, value, type = 'any[]', overwrite = fa
|
|
|
31
28
|
throw new Error('The options provider value is not an array literal expression!');
|
|
32
29
|
}
|
|
33
30
|
}
|
|
34
|
-
exports.AddToArray = AddToArray;
|
|
35
31
|
//# sourceMappingURL=add-to-array.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,GAEvB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E;;;;;;;;;GASG;AACH,MAAM,UAAU,UAAU,CACxB,UAAsB,EACtB,SAAiB,EACjB,KAAa,EACb,IAAI,GAAG,OAAO,EACd,SAAS,GAAG,KAAK;IAGjB,MAAM,aAAa,GAAG,yBAAyB,CAC7C,UAAU,EACV,SAAS,EACT;QACE,WAAW,EAAE,IAAI;QACjB,IAAI;KACL,CACF,CAAC,cAAc,EAAE,CAAC;IAEnB,IAAI,aAAa,YAAY,sBAAsB,EAAE;QAEnD,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,CAAC;QAEvG,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAC7B,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACpC;QAED,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAC7B,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACjC;KAEF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;AAEH,CAAC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
function AddVariableFakeProvider(sourceFile, variableName, fakeProviderObject, realProviderObject, fakeName, structures = [], overwrite = false) {
|
|
7
|
-
(0, add_variable_provider_1.AddVariableProvider)(sourceFile, variableName, 'FAKE_PROVIDER_FACTORY', structures, overwrite);
|
|
8
|
-
(0, add_fake_provider_1.AddFakeProvider)(sourceFile, fakeProviderObject, realProviderObject, fakeName, overwrite);
|
|
1
|
+
import { AddFakeProvider } from './add-fake-provider';
|
|
2
|
+
import { AddVariableProvider } from './add-variable-provider';
|
|
3
|
+
export function AddVariableFakeProvider(sourceFile, variableName, fakeProviderObject, realProviderObject, fakeName, structures = [], overwrite = false) {
|
|
4
|
+
AddVariableProvider(sourceFile, variableName, 'FAKE_PROVIDER_FACTORY', structures, overwrite);
|
|
5
|
+
AddFakeProvider(sourceFile, fakeProviderObject, realProviderObject, fakeName, overwrite);
|
|
9
6
|
}
|
|
10
|
-
exports.AddVariableFakeProvider = AddVariableFakeProvider;
|
|
11
7
|
//# sourceMappingURL=add-variable-fake-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-variable-fake-provider.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-variable-fake-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-variable-fake-provider.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-variable-fake-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,UAAU,uBAAuB,CACrC,UAAsB,EACtB,YAAoB,EACpB,kBAAuD,EACvD,kBAAuD,EACvD,QAAgB,EAChB,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,mBAAmB,CACjB,UAAU,EACV,YAAY,EACZ,uBAAuB,EACvB,UAAU,EACV,SAAS,CACV,CAAC;IAEF,eAAe,CACb,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,SAAS,CACV,CAAC;AAEJ,CAAC"}
|
|
@@ -1,25 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
function AddVariableProvider(sourceFile, variableName, providerObject, structures = [], overwrite = false) {
|
|
9
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, structures);
|
|
10
|
-
const variableDeclaration = (0, coerce_variable_declaration_1.CoerceVariableDeclaration)(sourceFile, variableName, {
|
|
1
|
+
import { ArrayLiteralExpression, } from 'ts-morph';
|
|
2
|
+
import { AddProviderToArray } from './add-provider-to-array';
|
|
3
|
+
import { CoerceVariableDeclaration } from './coerce-variable-declaration';
|
|
4
|
+
import { CoerceImports } from './ts-morph/coerce-imports';
|
|
5
|
+
export function AddVariableProvider(sourceFile, variableName, providerObject, structures = [], overwrite = false) {
|
|
6
|
+
CoerceImports(sourceFile, structures);
|
|
7
|
+
const variableDeclaration = CoerceVariableDeclaration(sourceFile, variableName, {
|
|
11
8
|
initializer: '[]',
|
|
12
9
|
type: 'Provider[]',
|
|
13
10
|
});
|
|
14
|
-
|
|
11
|
+
CoerceImports(sourceFile, {
|
|
15
12
|
namedImports: ['Provider'],
|
|
16
13
|
moduleSpecifier: '@angular/core',
|
|
17
14
|
});
|
|
18
15
|
const providerArray = variableDeclaration.getInitializer();
|
|
19
|
-
if (!(providerArray instanceof
|
|
16
|
+
if (!(providerArray instanceof ArrayLiteralExpression)) {
|
|
20
17
|
throw new Error(`The variable '${variableName}' initializer is not an array literal expression`);
|
|
21
18
|
}
|
|
22
|
-
|
|
19
|
+
AddProviderToArray(providerObject, providerArray, overwrite);
|
|
23
20
|
}
|
|
24
|
-
exports.AddVariableProvider = AddVariableProvider;
|
|
25
21
|
//# sourceMappingURL=add-variable-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-variable-provider.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-variable-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-variable-provider.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-variable-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,GAIvB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,UAAU,mBAAmB,CACjC,UAAsB,EACtB,YAAoB,EACpB,cAAuC,EACvC,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,mBAAmB,GAAG,yBAAyB,CACnD,UAAU,EACV,YAAY,EACZ;QACE,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,YAAY;KACnB,CACF,CAAC;IAEF,aAAa,CAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,UAAU,CAAE;QAC5B,eAAe,EAAE,eAAe;KACjC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,mBAAmB,CAAC,cAAc,EAAE,CAAC;IAE3D,IAAI,CAAC,CAAC,aAAa,YAAY,sBAAsB,CAAC,EAAE;QACtD,MAAM,IAAI,KAAK,CAAC,iBAAkB,YAAa,kDAAkD,CAAC,CAAC;KACpG;IAED,kBAAkB,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAE/D,CAAC"}
|
|
@@ -1,19 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const get_component_options_object_1 = require("./get-component-options-object");
|
|
7
|
-
function AddComponentAnimations(sourceFile, namedImport, moduleSpecifier) {
|
|
8
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
1
|
+
import { GetCoerceArrayLiteralFromObjectLiteral } from '../get-coerce-array-literal-form-object-literal';
|
|
2
|
+
import { CoerceImports } from '../ts-morph/coerce-imports';
|
|
3
|
+
import { GetComponentOptionsObject } from './get-component-options-object';
|
|
4
|
+
export function AddComponentAnimations(sourceFile, namedImport, moduleSpecifier) {
|
|
5
|
+
CoerceImports(sourceFile, {
|
|
9
6
|
moduleSpecifier,
|
|
10
7
|
namedImports: [namedImport],
|
|
11
8
|
});
|
|
12
|
-
const componentOptions =
|
|
13
|
-
const importsArray =
|
|
9
|
+
const componentOptions = GetComponentOptionsObject(sourceFile);
|
|
10
|
+
const importsArray = GetCoerceArrayLiteralFromObjectLiteral(componentOptions, 'animations');
|
|
14
11
|
if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
|
|
15
12
|
importsArray.addElement(namedImport);
|
|
16
13
|
}
|
|
17
14
|
}
|
|
18
|
-
exports.AddComponentAnimations = AddComponentAnimations;
|
|
19
15
|
//# sourceMappingURL=add-component-animations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-component-animations.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-animations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-component-animations.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-animations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,iDAAiD,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,UAAU,sBAAsB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAuB;IAEzG,aAAa,CAAC,UAAU,EAAE;QACxB,eAAe;QACf,YAAY,EAAE,CAAE,WAAW,CAAE;KAC9B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,sCAAsC,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAE5F,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QAC7F,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
function AddComponentFakeProvider(sourceFile, fakeProviderObject, realProviderObject, fakeName, structures = [], overwrite = false) {
|
|
7
|
-
(0, add_component_provider_1.AddComponentProvider)(sourceFile, 'FAKE_PROVIDER_FACTORY', structures, overwrite);
|
|
8
|
-
(0, add_fake_provider_1.AddFakeProvider)(sourceFile, fakeProviderObject, realProviderObject, fakeName, overwrite);
|
|
1
|
+
import { AddFakeProvider } from '../add-fake-provider';
|
|
2
|
+
import { AddComponentProvider } from './add-component-provider';
|
|
3
|
+
export function AddComponentFakeProvider(sourceFile, fakeProviderObject, realProviderObject, fakeName, structures = [], overwrite = false) {
|
|
4
|
+
AddComponentProvider(sourceFile, 'FAKE_PROVIDER_FACTORY', structures, overwrite);
|
|
5
|
+
AddFakeProvider(sourceFile, fakeProviderObject, realProviderObject, fakeName, overwrite);
|
|
9
6
|
}
|
|
10
|
-
exports.AddComponentFakeProvider = AddComponentFakeProvider;
|
|
11
7
|
/*
|
|
12
8
|
|
|
13
9
|
const FAKE_PROVIDERS = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-component-fake-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-fake-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-component-fake-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-fake-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,MAAM,UAAU,wBAAwB,CACtC,UAAsB,EACtB,kBAAuD,EACvD,kBAAuD,EACvD,QAAgB,EAChB,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,oBAAoB,CAClB,UAAU,EACV,uBAAuB,EACvB,UAAU,EACV,SAAS,CACV,CAAC;IAEF,eAAe,CACb,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,SAAS,CACV,CAAC;AAEJ,CAAC;AAED;;;;;;;;;;;;GAYG"}
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
|
-
const get_component_options_object_1 = require("./get-component-options-object");
|
|
7
|
-
function AddComponentImport(sourceFile, namedImport, moduleSpecifier) {
|
|
1
|
+
import { GetCoerceArrayLiteralFromObjectLiteral } from '../get-coerce-array-literal-form-object-literal';
|
|
2
|
+
import { CoerceImports } from '../ts-morph/coerce-imports';
|
|
3
|
+
import { GetComponentOptionsObject } from './get-component-options-object';
|
|
4
|
+
export function AddComponentImport(sourceFile, namedImport, moduleSpecifier) {
|
|
8
5
|
if (moduleSpecifier) {
|
|
9
|
-
|
|
6
|
+
CoerceImports(sourceFile, {
|
|
10
7
|
moduleSpecifier,
|
|
11
8
|
namedImports: [namedImport],
|
|
12
9
|
});
|
|
13
10
|
}
|
|
14
|
-
const ngModuleOptions =
|
|
15
|
-
const importsArray =
|
|
11
|
+
const ngModuleOptions = GetComponentOptionsObject(sourceFile);
|
|
12
|
+
const importsArray = GetCoerceArrayLiteralFromObjectLiteral(ngModuleOptions, 'imports');
|
|
16
13
|
if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
|
|
17
14
|
importsArray.addElement(namedImport);
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
|
-
exports.AddComponentImport = AddComponentImport;
|
|
21
17
|
//# sourceMappingURL=add-component-import.js.map
|
|
@@ -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":"
|
|
1
|
+
{"version":3,"file":"add-component-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,iDAAiD,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,UAAU,kBAAkB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAEtG,IAAI,eAAe,EAAE;QACnB,aAAa,CAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,sCAAsC,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QAC7F,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const get_component_class_1 = require("./get-component-class");
|
|
7
|
-
function AddComponentInput(sourceFile, componentInputDefinition, structures = []) {
|
|
8
|
-
const componentClass = (0, get_component_class_1.GetComponentClass)(sourceFile);
|
|
1
|
+
import { Scope, } from 'ts-morph';
|
|
2
|
+
import { CoerceImports } from '../ts-morph/coerce-imports';
|
|
3
|
+
import { GetComponentClass } from './get-component-class';
|
|
4
|
+
export function AddComponentInput(sourceFile, componentInputDefinition, structures = []) {
|
|
5
|
+
const componentClass = GetComponentClass(sourceFile);
|
|
9
6
|
if (!componentClass.getConstructors().some(cotr => cotr.getParameters()
|
|
10
7
|
.some(param => !!param.getScope() &&
|
|
11
8
|
param.getName() ===
|
|
@@ -14,7 +11,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
14
11
|
if (!componentClass.getSetAccessor(componentInputDefinition.name)) {
|
|
15
12
|
componentClass.addSetAccessor({
|
|
16
13
|
name: componentInputDefinition.name,
|
|
17
|
-
scope:
|
|
14
|
+
scope: Scope.Public,
|
|
18
15
|
parameters: [
|
|
19
16
|
{
|
|
20
17
|
name: componentInputDefinition.name,
|
|
@@ -35,14 +32,14 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
35
32
|
if (!componentClass.getProperty('_' + componentInputDefinition.name)) {
|
|
36
33
|
componentClass.addProperty({
|
|
37
34
|
name: '_' + componentInputDefinition.name,
|
|
38
|
-
scope:
|
|
35
|
+
scope: Scope.Private,
|
|
39
36
|
type: componentInputDefinition.type,
|
|
40
37
|
initializer: componentInputDefinition.initializer,
|
|
41
38
|
hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
|
|
42
39
|
hasExclamationToken: !componentInputDefinition.initializer && componentInputDefinition.required,
|
|
43
40
|
});
|
|
44
41
|
}
|
|
45
|
-
|
|
42
|
+
CoerceImports(sourceFile, {
|
|
46
43
|
namedImports: ['Input'],
|
|
47
44
|
moduleSpecifier: '@angular/core',
|
|
48
45
|
});
|
|
@@ -52,7 +49,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
52
49
|
if (!componentClass.getProperty(componentInputDefinition.name)) {
|
|
53
50
|
componentClass.addProperty({
|
|
54
51
|
name: componentInputDefinition.name,
|
|
55
|
-
scope:
|
|
52
|
+
scope: Scope.Public,
|
|
56
53
|
type: componentInputDefinition.type,
|
|
57
54
|
initializer: componentInputDefinition.initializer,
|
|
58
55
|
hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
|
|
@@ -65,14 +62,13 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
|
|
|
65
62
|
},
|
|
66
63
|
],
|
|
67
64
|
});
|
|
68
|
-
|
|
65
|
+
CoerceImports(sourceFile, {
|
|
69
66
|
namedImports: ['Input'],
|
|
70
67
|
moduleSpecifier: '@angular/core',
|
|
71
68
|
});
|
|
72
69
|
}
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
|
-
|
|
72
|
+
CoerceImports(sourceFile, structures);
|
|
76
73
|
}
|
|
77
|
-
exports.AddComponentInput = AddComponentInput;
|
|
78
74
|
//# sourceMappingURL=add-component-input.js.map
|
|
@@ -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":"AAAA,OAAO,EAIL,KAAK,GAGN,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAY1D,MAAM,UAAU,iBAAiB,CAC/B,UAAsB,EACtB,wBAAkD,EAClD,aAAsE,EAAE;IAGxE,MAAM,cAAc,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAErD,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE;SACf,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;QAC/B,KAAK,CAAC,OAAO,EAAE;YACf,wBAAwB,CAAC,IAAI,CAAC,CAAC,EAAE;QAExF,IAAI,wBAAwB,CAAC,WAAW,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE;gBACjE,cAAc,CAAC,cAAc,CAAC;oBAC5B,IAAI,EAAE,wBAAwB,CAAC,IAAI;oBACnC,KAAK,EAAE,KAAK,CAAC,MAAM;oBACnB,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,wBAAwB,CAAC,IAAI;4BACnC,IAAI,EAAE,wBAAwB,CAAC,IAAI;yBACpC;qBACF;oBACD,IAAI,EAAE,wBAAwB,CAAC,IAAI;oBACnC,UAAU,EAAE;wBACV,SAAU,wBAAwB,CAAC,IAAK,MAAO,wBAAwB,CAAC,IAAK,GAAG;qBACjF;oBACD,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,OAAO;4BACb,SAAS,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,wBAAwB,CAAC,QAAQ,CAAE,CAAC,CAAC,CAAC,EAAE;yBAC1F;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,GAAG,wBAAwB,CAAC,IAAI,CAAC,EAAE;oBACpE,cAAc,CAAC,WAAW,CAAC;wBACzB,IAAI,EAAE,GAAG,GAAG,wBAAwB,CAAC,IAAI;wBACzC,KAAK,EAAE,KAAK,CAAC,OAAO;wBACpB,IAAI,EAAE,wBAAwB,CAAC,IAAI;wBACnC,WAAW,EAAE,wBAAwB,CAAC,WAAW;wBACjD,gBAAgB,EAAE,CAAC,wBAAwB,CAAC,WAAW,IAAI,CAAC,wBAAwB,CAAC,QAAQ;wBAC7F,mBAAmB,EAAE,CAAC,wBAAwB,CAAC,WAAW,IAAI,wBAAwB,CAAC,QAAQ;qBAChG,CAAC,CAAC;iBACJ;gBACD,aAAa,CAAC,UAAU,EAAE;oBACxB,YAAY,EAAE,CAAE,OAAO,CAAE;oBACzB,eAAe,EAAE,eAAe;iBACjC,CAAC,CAAC;aACJ;SACF;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE;gBAC9D,cAAc,CAAC,WAAW,CAAC;oBACzB,IAAI,EAAE,wBAAwB,CAAC,IAAI;oBACnC,KAAK,EAAE,KAAK,CAAC,MAAM;oBACnB,IAAI,EAAE,wBAAwB,CAAC,IAAI;oBACnC,WAAW,EAAE,wBAAwB,CAAC,WAAW;oBACjD,gBAAgB,EAAE,CAAC,wBAAwB,CAAC,WAAW,IAAI,CAAC,wBAAwB,CAAC,QAAQ;oBAC7F,mBAAmB,EAAE,CAAC,wBAAwB,CAAC,WAAW,IAAI,wBAAwB,CAAC,QAAQ;oBAC/F,IAAI,EAAE,wBAAwB,CAAC,IAAI;oBACnC,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,OAAO;4BACb,SAAS,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,wBAAwB,CAAC,QAAQ,CAAE,CAAC,CAAC,CAAC,EAAE;yBAC1F;qBACF;iBACF,CAAC,CAAC;gBACH,aAAa,CAAC,UAAU,EAAE;oBACxB,YAAY,EAAE,CAAE,OAAO,CAAE;oBACzB,eAAe,EAAE,eAAe;iBACjC,CAAC,CAAC;aACJ;SACF;KAEF;IACD,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAExC,CAAC"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
(
|
|
10
|
-
const componentOptions = (0, get_component_options_object_1.GetComponentOptionsObject)(sourceFile);
|
|
11
|
-
const providersArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(componentOptions, 'providers');
|
|
12
|
-
(0, add_provider_to_array_1.AddProviderToArray)(providerObject, providersArray, overwrite);
|
|
1
|
+
import { AddProviderToArray } from '../add-provider-to-array';
|
|
2
|
+
import { GetCoerceArrayLiteralFromObjectLiteral } from '../get-coerce-array-literal-form-object-literal';
|
|
3
|
+
import { CoerceImports } from '../ts-morph/coerce-imports';
|
|
4
|
+
import { GetComponentOptionsObject } from './get-component-options-object';
|
|
5
|
+
export function AddComponentProvider(sourceFile, providerObject, structures = [], overwrite = false) {
|
|
6
|
+
CoerceImports(sourceFile, structures);
|
|
7
|
+
const componentOptions = GetComponentOptionsObject(sourceFile);
|
|
8
|
+
const providersArray = GetCoerceArrayLiteralFromObjectLiteral(componentOptions, 'providers');
|
|
9
|
+
AddProviderToArray(providerObject, providersArray, overwrite);
|
|
13
10
|
}
|
|
14
|
-
exports.AddComponentProvider = AddComponentProvider;
|
|
15
11
|
//# sourceMappingURL=add-component-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-component-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-component-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,sCAAsC,EAAE,MAAM,iDAAiD,CAAC;AAEzG,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,UAAU,oBAAoB,CAClC,UAAsB,EACtB,cAAuC,EACvC,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAE/D,MAAM,cAAc,GAAG,sCAAsC,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAE7F,kBAAkB,CAAC,cAAc,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;AAEhE,CAAC"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.AddControlValidator = exports.DefaultAddControlValidatorCompare = void 0;
|
|
4
|
-
const ts_morph_1 = require("ts-morph");
|
|
5
|
-
function DefaultAddControlValidatorCompare(a, b) {
|
|
1
|
+
import { ArrayLiteralExpression, PropertyAssignment, } from 'ts-morph';
|
|
2
|
+
export function DefaultAddControlValidatorCompare(a, b) {
|
|
6
3
|
return a.trim().replace(/[\r\n\t]/g, '') === b.trim().replace(/[\r\n\t]/g, '');
|
|
7
4
|
}
|
|
8
|
-
|
|
9
|
-
function AddControlValidator(validator, controlOptions, compareFn = DefaultAddControlValidatorCompare) {
|
|
5
|
+
export function AddControlValidator(validator, controlOptions, compareFn = DefaultAddControlValidatorCompare) {
|
|
10
6
|
let validatorPropertyAssignment = controlOptions.getProperty('validators');
|
|
11
7
|
if (!validatorPropertyAssignment) {
|
|
12
8
|
validatorPropertyAssignment = controlOptions.addPropertyAssignment({
|
|
@@ -14,11 +10,11 @@ function AddControlValidator(validator, controlOptions, compareFn = DefaultAddCo
|
|
|
14
10
|
initializer: '[]',
|
|
15
11
|
});
|
|
16
12
|
}
|
|
17
|
-
if (!(validatorPropertyAssignment instanceof
|
|
13
|
+
if (!(validatorPropertyAssignment instanceof PropertyAssignment)) {
|
|
18
14
|
throw new Error('The validator property is not a assignment type!');
|
|
19
15
|
}
|
|
20
16
|
const validatorProperty = validatorPropertyAssignment.getInitializer();
|
|
21
|
-
if (validatorProperty instanceof
|
|
17
|
+
if (validatorProperty instanceof ArrayLiteralExpression) {
|
|
22
18
|
const index = validatorProperty
|
|
23
19
|
.getElements()
|
|
24
20
|
.findIndex(element => compareFn(element.getFullText(), validator));
|
|
@@ -31,5 +27,4 @@ function AddControlValidator(validator, controlOptions, compareFn = DefaultAddCo
|
|
|
31
27
|
}
|
|
32
28
|
}
|
|
33
29
|
}
|
|
34
|
-
exports.AddControlValidator = AddControlValidator;
|
|
35
30
|
//# sourceMappingURL=add-control-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-control-validator.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-control-validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-control-validator.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-control-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,kBAAkB,GACnB,MAAM,UAAU,CAAC;AAElB,MAAM,UAAU,iCAAiC,CAAC,CAAS,EAAE,CAAS;IACpE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,SAAiB,EACjB,cAAuC,EACvC,YAA+C,iCAAiC;IAGhF,IAAI,2BAA2B,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAE3E,IAAI,CAAC,2BAA2B,EAAE;QAChC,2BAA2B,GAAG,cAAc,CAAC,qBAAqB,CAAC;YACjE,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,CAAC,2BAA2B,YAAY,kBAAkB,CAAC,EAAE;QAChE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,cAAc,EAAE,CAAC;IAEvE,IAAI,iBAAiB,YAAY,sBAAsB,EAAE;QACvD,MAAM,KAAK,GAAG,iBAAiB;aAC5B,WAAW,EAAE;aACb,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SACzC;aAAM;YACL,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACvC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SACnD;KACF;AAEH,CAAC"}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const coerce_class_constructor_1 = require("../coerce-class-constructor");
|
|
6
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
7
|
-
var Module;
|
|
1
|
+
import { Scope, Writers, } from 'ts-morph';
|
|
2
|
+
import { CoerceClassConstructor } from '../coerce-class-constructor';
|
|
3
|
+
import { CoerceImports } from '../ts-morph/coerce-imports';
|
|
4
|
+
export var Module;
|
|
8
5
|
(function (Module) {
|
|
9
6
|
Module["ANGULAR"] = "@angular/core";
|
|
10
7
|
Module["NEST"] = "@nestjs/common";
|
|
11
|
-
})(Module || (
|
|
12
|
-
function AddDependencyInjection(sourceFile, definition, structures = []) {
|
|
13
|
-
var _a, _b, _c, _d;
|
|
8
|
+
})(Module || (Module = {}));
|
|
9
|
+
export function AddDependencyInjection(sourceFile, definition, structures = []) {
|
|
14
10
|
if (!definition.module) {
|
|
15
11
|
definition.module = Module.ANGULAR;
|
|
16
12
|
}
|
|
@@ -18,15 +14,15 @@ function AddDependencyInjection(sourceFile, definition, structures = []) {
|
|
|
18
14
|
if (!classDeclaration) {
|
|
19
15
|
throw new Error('Could not find class declaration');
|
|
20
16
|
}
|
|
21
|
-
const constructorDeclarations =
|
|
17
|
+
const constructorDeclarations = CoerceClassConstructor(classDeclaration);
|
|
22
18
|
const constructorDeclaration = constructorDeclarations[0];
|
|
23
19
|
if (constructorDeclaration.getParameter(definition.parameterName)) {
|
|
24
20
|
return;
|
|
25
21
|
}
|
|
26
22
|
const constructorParameter = {
|
|
27
23
|
name: definition.parameterName,
|
|
28
|
-
type:
|
|
29
|
-
scope:
|
|
24
|
+
type: definition.type ?? definition.injectionToken,
|
|
25
|
+
scope: definition.scope ?? Scope.Public,
|
|
30
26
|
isReadonly: true,
|
|
31
27
|
decorators: [
|
|
32
28
|
{
|
|
@@ -36,22 +32,21 @@ function AddDependencyInjection(sourceFile, definition, structures = []) {
|
|
|
36
32
|
],
|
|
37
33
|
};
|
|
38
34
|
if (definition.optional) {
|
|
39
|
-
|
|
35
|
+
constructorParameter.decorators?.unshift({
|
|
40
36
|
name: 'Optional',
|
|
41
37
|
arguments: [],
|
|
42
38
|
});
|
|
43
|
-
constructorParameter.type =
|
|
44
|
-
|
|
39
|
+
constructorParameter.type = Writers.intersectionType(definition.type ?? definition.injectionToken, 'null');
|
|
40
|
+
CoerceImports(sourceFile, {
|
|
45
41
|
namedImports: ['Optional'],
|
|
46
42
|
moduleSpecifier: definition.module,
|
|
47
43
|
});
|
|
48
44
|
}
|
|
49
45
|
constructorDeclaration.addParameter(constructorParameter);
|
|
50
|
-
|
|
46
|
+
CoerceImports(sourceFile, {
|
|
51
47
|
namedImports: ['Inject'],
|
|
52
48
|
moduleSpecifier: definition.module,
|
|
53
49
|
});
|
|
54
|
-
|
|
50
|
+
CoerceImports(sourceFile, structures);
|
|
55
51
|
}
|
|
56
|
-
exports.AddDependencyInjection = AddDependencyInjection;
|
|
57
52
|
//# sourceMappingURL=add-dependency-injection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dependency-injection.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-dependency-injection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-dependency-injection.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-dependency-injection.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,EAEL,OAAO,GACR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,MAAM,CAAN,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,mCAAyB,CAAA;IACzB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,KAAN,MAAM,QAGjB;AAWD,MAAM,UAAU,sBAAsB,CACpC,UAAsB,EACtB,UAA+B,EAC/B,aAAsE,EAAE;IAGxE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;KACpC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpD,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;IACzE,MAAM,sBAAsB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAE1D,IAAI,sBAAsB,CAAC,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjE,OAAO;KACR;IAED,MAAM,oBAAoB,GAAgD;QACxE,IAAI,EAAE,UAAU,CAAC,aAAa;QAC9B,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,cAAc;QAClD,KAAK,EAAE,UAAU,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM;QACvC,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,CAAE,UAAU,CAAC,cAAc,CAAE;aACzC;SACF;KACF,CAAC;IAEF,IAAI,UAAU,CAAC,QAAQ,EAAE;QACvB,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC;YACvC,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAClD,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,cAAc,EAC5C,MAAM,CACP,CAAC;QACF,aAAa,CAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,UAAU,CAAE;YAC5B,eAAe,EAAE,UAAU,CAAC,MAAM;SACnC,CAAC,CAAC;KACJ;IAED,sBAAsB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAE1D,aAAa,CAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,QAAQ,CAAE;QAC1B,eAAe,EAAE,UAAU,CAAC,MAAM;KACnC,CAAC,CAAC;IAEH,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACxC,CAAC"}
|