ember-codemod-remove-inject-as-service 3.0.2 → 3.1.1

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.
@@ -18,7 +18,8 @@ function updateImportStatement(file, data) {
18
18
  return false;
19
19
  }
20
20
  path.node.specifiers = specifiers.map((specifier) => {
21
- // @ts-expect-error: 'specifier.importKind' exists
21
+ // @ts-expect-error: Incorrect type
22
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
22
23
  if (!isValueImport(specifier.importKind)) {
23
24
  return specifier;
24
25
  }
@@ -43,28 +44,30 @@ function updateImportStatement(file, data) {
43
44
  function updateServiceDecorators(file, data) {
44
45
  const traverse = AST.traverse(data.isTypeScript);
45
46
  const ast = traverse(file, {
46
- visitCallExpression(node) {
47
- this.traverse(node);
48
- switch (node.value.callee.type) {
47
+ visitCallExpression(path) {
48
+ this.traverse(path);
49
+ switch (path.node.callee.type) {
49
50
  case 'Identifier': {
50
- if (node.value.callee.name === data.localName) {
51
- node.value.callee.name = 'service';
51
+ if (path.node.callee.name === data.localName) {
52
+ path.node.callee.name = 'service';
52
53
  }
53
54
  break;
54
55
  }
55
56
  }
56
57
  return false;
57
58
  },
58
- visitClassProperty(node) {
59
- if (!Array.isArray(node.value.decorators) ||
60
- node.value.decorators.length !== 1) {
59
+ visitClassProperty(path) {
60
+ // @ts-expect-error: Incorrect type
61
+ const decorators = path.node.decorators;
62
+ if (!Array.isArray(decorators) || decorators.length !== 1) {
61
63
  return false;
62
64
  }
63
- const decorator = node.value.decorators[0];
65
+ const decorator = decorators[0];
64
66
  let isMatch = false;
65
67
  switch (decorator.expression.type) {
66
68
  case 'CallExpression': {
67
- if (decorator.expression.callee.name === data.localName) {
69
+ if (decorator.expression.callee.type === 'Identifier' &&
70
+ decorator.expression.callee.name === data.localName) {
68
71
  decorator.expression.callee.name = 'service';
69
72
  isMatch = true;
70
73
  }
@@ -78,15 +81,20 @@ function updateServiceDecorators(file, data) {
78
81
  break;
79
82
  }
80
83
  }
81
- if (!isMatch || !data.isTypeScript) {
84
+ if (!isMatch) {
82
85
  return false;
83
86
  }
84
87
  // Stylistic choices
85
- if (!decorator.trailingComments) {
86
- node.value.accessibility = null;
87
- node.value.declare = true;
88
- node.value.definite = null;
89
- node.value.readonly = null;
88
+ // @ts-expect-error: Incorrect type
89
+ if (data.isTypeScript && !decorator.trailingComments) {
90
+ // @ts-expect-error: Incorrect type
91
+ path.node.accessibility = null;
92
+ // @ts-expect-error: Incorrect type
93
+ path.node.declare = true;
94
+ // @ts-expect-error: Incorrect type
95
+ path.node.definite = null;
96
+ // @ts-expect-error: Incorrect type
97
+ path.node.readonly = null;
90
98
  }
91
99
  return false;
92
100
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ember-codemod-remove-inject-as-service",
3
- "version": "3.0.2",
3
+ "version": "3.1.1",
4
4
  "description": "Codemod to remove `inject as service`",
5
5
  "keywords": [
6
6
  "codemod",
@@ -20,25 +20,25 @@
20
20
  "dist"
21
21
  ],
22
22
  "dependencies": {
23
- "@codemod-utils/ast-javascript": "^3.0.1",
24
- "@codemod-utils/ast-template-tag": "^2.1.0",
23
+ "@codemod-utils/ast-javascript": "^3.0.2",
24
+ "@codemod-utils/ast-template-tag": "^2.3.0",
25
25
  "@codemod-utils/files": "^4.0.1",
26
26
  "yargs": "^18.0.0"
27
27
  },
28
28
  "devDependencies": {
29
- "@changesets/cli": "^2.30.0",
30
- "@codemod-utils/tests": "^3.0.1",
31
- "@ijlee2-frontend-configs/changesets": "^2.1.0",
32
- "@ijlee2-frontend-configs/eslint-config-node": "^3.1.1",
33
- "@ijlee2-frontend-configs/prettier": "^3.0.1",
29
+ "@changesets/cli": "^2.31.0",
30
+ "@codemod-utils/tests": "^3.0.2",
31
+ "@ijlee2-frontend-configs/changesets": "^2.1.1",
32
+ "@ijlee2-frontend-configs/eslint-config-node": "^3.3.0",
33
+ "@ijlee2-frontend-configs/prettier": "^3.1.0",
34
34
  "@sondr3/minitest": "^0.1.2",
35
35
  "@tsconfig/node22": "^22.0.5",
36
36
  "@tsconfig/strictest": "^2.0.8",
37
- "@types/node": "^22.19.15",
37
+ "@types/node": "^22.19.17",
38
38
  "@types/yargs": "^17.0.35",
39
39
  "concurrently": "^9.2.1",
40
40
  "eslint": "^9.39.4",
41
- "prettier": "^3.8.1",
41
+ "prettier": "^3.8.3",
42
42
  "typescript": "^5.9.3"
43
43
  },
44
44
  "engines": {