@openrewrite/recipes-angular 1.1.2 → 1.1.4

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.
@@ -1 +1 @@
1
- {"version":3,"file":"explicit-standalone-flag.d.ts","sourceRoot":"","sources":["../../src/migration/explicit-standalone-flag.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAQ3E,qBAAa,sBAAuB,SAAQ,MAAM;IAC9C,QAAQ,CAAC,IAAI,gEAAgE;IAC7E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAmC;IAC/D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA+K;IAErM,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAoE9D"}
1
+ {"version":3,"file":"explicit-standalone-flag.d.ts","sourceRoot":"","sources":["../../src/migration/explicit-standalone-flag.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAQ3E,qBAAa,sBAAuB,SAAQ,MAAM;IAC9C,QAAQ,CAAC,IAAI,gEAAgE;IAC7E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAmC;IAC/D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA+K;IAErM,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CA0E9D"}
@@ -55,17 +55,22 @@ class ExplicitStandaloneFlag extends rewrite_1.Recipe {
55
55
  return a;
56
56
  let standaloneIndex = -1;
57
57
  let standaloneValue = null;
58
+ let hasImplicitStandaloneProp = false;
58
59
  for (let i = 0; i < newClass.body.statements.length; i++) {
59
60
  const stmt = newClass.body.statements[i].element;
60
61
  if (stmt.kind === javascript_1.JS.Kind.PropertyAssignment) {
61
62
  const prop = stmt;
62
63
  const nameExpr = prop.name.element;
63
- if ((0, java_1.isIdentifier)(nameExpr) && nameExpr.simpleName === 'standalone') {
64
- standaloneIndex = i;
65
- if (prop.initializer && (0, java_1.isLiteral)(prop.initializer)) {
66
- standaloneValue = prop.initializer.value;
64
+ if ((0, java_1.isIdentifier)(nameExpr)) {
65
+ if (nameExpr.simpleName === 'standalone') {
66
+ standaloneIndex = i;
67
+ if (prop.initializer && (0, java_1.isLiteral)(prop.initializer)) {
68
+ standaloneValue = prop.initializer.value;
69
+ }
70
+ }
71
+ else if (annotType.simpleName === 'Component' && nameExpr.simpleName === 'imports') {
72
+ hasImplicitStandaloneProp = true;
67
73
  }
68
- break;
69
74
  }
70
75
  }
71
76
  }
@@ -76,6 +81,8 @@ class ExplicitStandaloneFlag extends rewrite_1.Recipe {
76
81
  });
77
82
  }
78
83
  if (standaloneIndex === -1) {
84
+ if (hasImplicitStandaloneProp)
85
+ return a;
79
86
  const existingStmts = newClass.body.statements;
80
87
  if (existingStmts.length === 0)
81
88
  return a;
@@ -1 +1 @@
1
- {"version":3,"file":"explicit-standalone-flag.js","sourceRoot":"","sources":["../../src/migration/explicit-standalone-flag.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"explicit-standalone-flag.js","sourceRoot":"","sources":["../../src/migration/explicit-standalone-flag.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openrewrite/recipes-angular",
3
- "version": "1.1.2",
3
+ "version": "1.1.4",
4
4
  "license": "Moderne Proprietary",
5
5
  "description": "OpenRewrite recipes for Angular.",
6
6
  "homepage": "https://github.com/openrewrite/rewrite",
@@ -35,18 +35,22 @@ export class ExplicitStandaloneFlag extends Recipe {
35
35
 
36
36
  let standaloneIndex = -1;
37
37
  let standaloneValue: boolean | null = null;
38
+ let hasImplicitStandaloneProp = false;
38
39
 
39
40
  for (let i = 0; i < newClass.body.statements.length; i++) {
40
41
  const stmt = newClass.body.statements[i].element;
41
42
  if (stmt.kind === JS.Kind.PropertyAssignment) {
42
43
  const prop = stmt as JS.PropertyAssignment;
43
44
  const nameExpr = prop.name.element;
44
- if (isIdentifier(nameExpr) && nameExpr.simpleName === 'standalone') {
45
- standaloneIndex = i;
46
- if (prop.initializer && isLiteral(prop.initializer)) {
47
- standaloneValue = prop.initializer.value as boolean;
45
+ if (isIdentifier(nameExpr)) {
46
+ if (nameExpr.simpleName === 'standalone') {
47
+ standaloneIndex = i;
48
+ if (prop.initializer && isLiteral(prop.initializer)) {
49
+ standaloneValue = prop.initializer.value as boolean;
50
+ }
51
+ } else if (annotType.simpleName === 'Component' && nameExpr.simpleName === 'imports') {
52
+ hasImplicitStandaloneProp = true;
48
53
  }
49
- break;
50
54
  }
51
55
  }
52
56
  }
@@ -59,6 +63,8 @@ export class ExplicitStandaloneFlag extends Recipe {
59
63
  }
60
64
 
61
65
  if (standaloneIndex === -1) {
66
+ if (hasImplicitStandaloneProp) return a;
67
+
62
68
  const existingStmts = newClass.body.statements;
63
69
  if (existingStmts.length === 0) return a;
64
70