@rxap/schematics-ts-morph 16.0.0-dev.19 → 16.0.0-dev.20

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 CHANGED
@@ -3,6 +3,12 @@
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.20](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.19...@rxap/schematics-ts-morph@16.0.0-dev.20) (2023-09-19)
7
+
8
+ ### Bug Fixes
9
+
10
+ - add deprecation comment ([53ffdcb](https://gitlab.com/rxap/packages/commit/53ffdcbba41a6afec8e4bd6ef472fcb5dcd27457))
11
+
6
12
  # [16.0.0-dev.19](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.18...@rxap/schematics-ts-morph@16.0.0-dev.19) (2023-09-12)
7
13
 
8
14
  ### Bug Fixes
package/README.md CHANGED
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
17
17
  ```
18
18
  **Install peer dependencies:**
19
19
  ```bash
20
- yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@* @rxap/utilities@* @rxap/workspace-ts-morph@* ts-morph@^18.0.0 tslib@2.6.2
20
+ yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0-dev.16 @rxap/utilities@^16.0.0-dev.17 @rxap/workspace-ts-morph@^0.1.0-dev.8 ts-morph@^18.0.0 tslib@2.6.2
21
21
  ```
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.0.0-dev.19",
2
+ "version": "16.0.0-dev.20",
3
3
  "name": "@rxap/schematics-ts-morph",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -11,13 +11,13 @@
11
11
  "peerDependencies": {
12
12
  "@angular-devkit/core": "^16.1.4",
13
13
  "@angular-devkit/schematics": "^16.1.4",
14
- "@rxap/schematics-utilities": "*",
15
- "@rxap/utilities": "*",
16
- "@rxap/workspace-ts-morph": "*",
14
+ "@rxap/schematics-utilities": "^16.0.0-dev.16",
15
+ "@rxap/utilities": "^16.0.0-dev.17",
16
+ "@rxap/workspace-ts-morph": "^0.1.0-dev.8",
17
17
  "ts-morph": "^18.0.0",
18
18
  "tslib": "2.6.2",
19
19
  "@rxap/node-utilities": "1.1.0-dev.9",
20
- "@rxap/workspace-utilities": "0.1.0-dev.13"
20
+ "@rxap/workspace-utilities": "0.1.0-dev.16"
21
21
  },
22
22
  "author": {
23
23
  "name": "Merzough Münker",
@@ -39,7 +39,7 @@
39
39
  "packageGroup": [
40
40
  {
41
41
  "package": "@rxap/schematics-utilities",
42
- "version": "16.0.0-dev.15"
42
+ "version": "16.0.0-dev.16"
43
43
  },
44
44
  {
45
45
  "package": "@rxap/utilities",
@@ -47,7 +47,7 @@
47
47
  },
48
48
  {
49
49
  "package": "@rxap/workspace-ts-morph",
50
- "version": "0.1.0-dev.7"
50
+ "version": "0.1.0-dev.8"
51
51
  }
52
52
  ]
53
53
  },
@@ -61,7 +61,7 @@
61
61
  "directory": "packages/schematic/ts-morph"
62
62
  },
63
63
  "type": "commonjs",
64
- "gitHead": "db8e53ef6cfd297abb6f8c4fb54f289f9c971fe4",
64
+ "gitHead": "6a958a387cec832040a4a32aa4fd0f52fa5e5e00",
65
65
  "main": "./src/index.js",
66
66
  "types": "./src/index.d.ts"
67
67
  }
@@ -1,3 +1,6 @@
1
- import { ArrayLiteralExpression, ObjectLiteralExpression } from 'ts-morph';
1
+ import { ArrayLiteralExpression, Expression, ObjectLiteralExpression } from 'ts-morph';
2
2
  import { ProviderObject } from './provider-object';
3
- export declare function AddProviderToArray(providerObject: ProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean, compare?: (ole: ObjectLiteralExpression, po: ProviderObject) => boolean): void;
3
+ /**
4
+ * @deprecated import from @rxap/ts-morph
5
+ */
6
+ export declare function AddProviderToArray(providerObject: ProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean, compare?: (ole: ObjectLiteralExpression, po: ProviderObject) => boolean): Expression;
@@ -1,8 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AddProviderToArray = void 0;
4
- const schematics_utilities_1 = require("@rxap/schematics-utilities");
4
+ const utilities_1 = require("@rxap/utilities");
5
5
  const ts_morph_1 = require("ts-morph");
6
+ /**
7
+ * @deprecated import from @rxap/ts-morph
8
+ */
6
9
  function AddProviderToArray(providerObject, providerArray, overwrite = false, compare = (ole, po) => {
7
10
  var _a;
8
11
  const provideProperty = ole.getProperty('provide');
@@ -11,9 +14,27 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
11
14
  }
12
15
  return false;
13
16
  }) {
17
+ let expression;
14
18
  if (typeof providerObject === 'string') {
15
- if (!providerArray.getElements().some(element => element.getFullText().trim() === providerObject)) {
16
- providerArray.addElement(providerObject);
19
+ const index = providerArray.getElements().findIndex(element => {
20
+ if (element.getFullText().trim() === providerObject) {
21
+ return true;
22
+ }
23
+ const match = providerObject.match(/^[a-zA-Z0-9]+?\(/);
24
+ if (match) {
25
+ return element.getFullText().trim().startsWith(match[0]);
26
+ }
27
+ return false;
28
+ });
29
+ if (index === -1) {
30
+ expression = providerArray.addElement(providerObject);
31
+ }
32
+ else if (overwrite) {
33
+ providerArray.removeElement(index);
34
+ expression = providerArray.insertElement(index, providerObject);
35
+ }
36
+ else {
37
+ expression = providerArray.getElements()[index];
17
38
  }
18
39
  }
19
40
  else {
@@ -27,7 +48,7 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
27
48
  providerArray.removeElement(index);
28
49
  }
29
50
  if (overwrite || index === -1) {
30
- providerArray.addElement(ts_morph_1.Writers.object((0, schematics_utilities_1.DeleteUndefinedProperties)({
51
+ expression = providerArray.addElement(ts_morph_1.Writers.object((0, utilities_1.DeleteUndefinedProperties)({
31
52
  provide: providerObject.provide,
32
53
  useClass: providerObject.useClass,
33
54
  useFactory: providerObject.useFactory,
@@ -41,7 +62,11 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
41
62
  providerObject.multi === false ? w => w.write('false') : undefined,
42
63
  })));
43
64
  }
65
+ else {
66
+ expression = providerArray.getElements()[index];
67
+ }
44
68
  }
69
+ return expression;
45
70
  }
46
71
  exports.AddProviderToArray = AddProviderToArray;
47
72
  //# 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":";;;AAAA,qEAAuE;AACvE,uCAKkB;AAGlB,SAAgB,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,6BAAkB,EAAE;QAEjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,WAAW,GAAG,IAAI,EAAE,MAAK,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,kCAAuB,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,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,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;AAxDD,gDAwDC"}
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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"}
@@ -1,4 +1,7 @@
1
1
  import { WriterFunction } from 'ts-morph';
2
+ /**
3
+ * @deprecated import from @rxap/ts-morph
4
+ */
2
5
  export interface ProviderObject {
3
6
  provide: string | WriterFunction;
4
7
  useClass?: string | WriterFunction;