diff --git a/ets2panda/linter/src/lib/autofixes/Autofixer.ts b/ets2panda/linter/src/lib/autofixes/Autofixer.ts index c3cab4c0e3a2cf92b64c47f689fe98fcf4a64839..fbd69ec830e3219eba2ac9eac830e2cae59204ff 100644 --- a/ets2panda/linter/src/lib/autofixes/Autofixer.ts +++ b/ets2panda/linter/src/lib/autofixes/Autofixer.ts @@ -86,9 +86,6 @@ const GENERATED_DESTRUCT_OBJECT_TRESHOLD = 1000; const GENERATED_DESTRUCT_ARRAY_NAME = 'GeneratedDestructArray_'; const GENERATED_DESTRUCT_ARRAY_TRESHOLD = 1000; -const GENERATED_IMPORT_VARIABLE_NAME = 'GeneratedImportVar_'; -const GENERATED_IMPORT_VARIABLE_TRESHOLD = 1000; - const GENERATED_TMP_VARIABLE_NAME = 'tmp_'; const GENERATED_TMP_VARIABLE_TRESHOLD = 1000; @@ -151,17 +148,11 @@ export class Autofixer { GENERATED_OBJECT_LITERAL_INIT_INTERFACE_TRESHOLD ); - private readonly importVarNameGenerator = new NameGenerator( - GENERATED_IMPORT_VARIABLE_NAME, - GENERATED_IMPORT_VARIABLE_TRESHOLD - ); - private readonly tmpVariableNameGenerator = new NameGenerator( GENERATED_TMP_VARIABLE_NAME, GENERATED_TMP_VARIABLE_TRESHOLD ); - private modVarName: string = ''; private readonly lastImportEndMap = new Map(); private readonly symbolCache: SymbolCache; @@ -4208,27 +4199,19 @@ export class Autofixer { } private static createVariableForInteropImport( - newVarName: string, - interopObject: string, - interopMethod: string, - interopPropertyOrModule: string + interopProperty: string, + symbolName: string, + propertyName: string ): ts.VariableStatement { const newVarDecl = ts.factory.createVariableStatement( undefined, ts.factory.createVariableDeclarationList( [ ts.factory.createVariableDeclaration( - ts.factory.createIdentifier(newVarName), + ts.factory.createIdentifier(symbolName), undefined, undefined, - ts.factory.createCallExpression( - ts.factory.createPropertyAccessExpression( - ts.factory.createIdentifier(interopObject), - ts.factory.createIdentifier(interopMethod) - ), - undefined, - [ts.factory.createStringLiteral(interopPropertyOrModule)] - ) + this.createVariableInitialForInteropImport(propertyName, interopProperty) ) ], ts.NodeFlags.Let @@ -4237,6 +4220,25 @@ export class Autofixer { return newVarDecl; } + private static createVariableInitialForInteropImport(propertyName: string, interopProperty: string): ts.Expression { + const initializer = ts.factory.createCallExpression( + ts.factory.createPropertyAccessExpression( + ts.factory.createCallExpression( + ts.factory.createPropertyAccessExpression( + ts.factory.createIdentifier(ES_VALUE), + ts.factory.createIdentifier(LOAD) + ), + undefined, + [ts.factory.createStringLiteral(interopProperty)] + ), + ts.factory.createIdentifier(GET_PROPERTY) + ), + undefined, + [ts.factory.createStringLiteral(propertyName)] + ); + return initializer; + } + private static getOriginalNameAtSymbol(symbolName: string, symbol?: ts.Symbol): string { if (symbol) { const originalDeclaration = symbol.declarations?.[0]; @@ -4313,20 +4315,25 @@ export class Autofixer { defaultSymbol?: ts.Symbol ): Autofix[] | undefined { let statements: string[] = []; - statements = this.constructAndSaveimportDecl2Arrays(importDecl, moduleSpecifier, undefined, statements, true); if (importClause.name) { const symbolName = importClause.name.text; const originalName = Autofixer.getOriginalNameAtSymbol(symbolName, defaultSymbol); - statements = this.constructAndSaveimportDecl2Arrays(importDecl, symbolName, originalName, statements, false); + statements = this.constructAndSaveimportDecl2Arrays( + importDecl, + moduleSpecifier, + symbolName, + originalName, + statements + ); } const namedBindings = importClause.namedBindings; - if (namedBindings && ts.isNamedImports(namedBindings)) { - namedBindings.elements.map((element) => { - const symbolName = element.name.text; - const originalName = element.propertyName ? element.propertyName.text : symbolName; - statements = this.constructAndSaveimportDecl2Arrays(importDecl, symbolName, originalName, statements, false); - return statements; - }); + if (namedBindings) { + statements = this.getStatementForInterOpImportJsOnNamedBindings( + namedBindings, + importDecl, + moduleSpecifier, + statements + ); } if (statements.length <= 0) { return undefined; @@ -4346,30 +4353,48 @@ export class Autofixer { ]; } + private getStatementForInterOpImportJsOnNamedBindings( + namedBindings: ts.NamedImportBindings, + importDecl: ts.ImportDeclaration, + moduleSpecifier: string, + statements: string[] + ): string[] { + if (ts.isNamespaceImport(namedBindings)) { + const symbolName = namedBindings.name.text; + statements = this.constructAndSaveimportDecl2Arrays( + importDecl, + moduleSpecifier, + symbolName, + symbolName, + statements + ); + } + if (ts.isNamedImports(namedBindings)) { + namedBindings.elements.map((element) => { + const symbolName = element.name.text; + const originalName = element.propertyName ? element.propertyName.text : symbolName; + statements = this.constructAndSaveimportDecl2Arrays( + importDecl, + moduleSpecifier, + symbolName, + originalName, + statements + ); + return statements; + }); + } + return statements; + } + private constructAndSaveimportDecl2Arrays( importDecl: ts.ImportDeclaration, + moduleSpecifier: string, symbolName: string, originalName: string | undefined, - statements: string[], - isLoad: boolean + statements: string[] ): string[] { - if (isLoad) { - const newVarName = TsUtils.generateUniqueName(this.importVarNameGenerator, this.sourceFile); - if (!newVarName) { - return []; - } - this.modVarName = newVarName; - } const propertyName = originalName || symbolName; - const constructDeclInfo: string[] = isLoad ? - [this.modVarName, ES_VALUE, LOAD] : - [symbolName, this.modVarName, GET_PROPERTY]; - const newVarDecl = Autofixer.createVariableForInteropImport( - constructDeclInfo[0], - constructDeclInfo[1], - constructDeclInfo[2], - propertyName - ); + const newVarDecl = Autofixer.createVariableForInteropImport(moduleSpecifier, symbolName, propertyName); const text = this.printer.printNode(ts.EmitHint.Unspecified, newVarDecl, importDecl.getSourceFile()); statements.push(TsUtils.removeOrReplaceQuotes(text, true)); return statements; diff --git a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.autofix.json b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.autofix.json index 796dfbb772a4068a047047116df7245c1ec5ea44..7795884ac22abfdf7f90c5a93e3138411c8a596c 100644 --- a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.autofix.json +++ b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.autofix.json @@ -13,7 +13,7 @@ "See the License for the specific language governing permissions and", "limitations under the License." ], -"result": [ + "result": [ { "line": 15, "column": 1, @@ -33,7 +33,7 @@ { "start": 656, "end": 656, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./binary_operation_js_obj_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\nlet m = GeneratedImportVar_1.getProperty('m');\nlet n = GeneratedImportVar_1.getProperty('n');\n", + "replacementText": "let foo = ESValue.load('./binary_operation_js_obj_js').getProperty('foo');\nlet m = ESValue.load('./binary_operation_js_obj_js').getProperty('m');\nlet n = ESValue.load('./binary_operation_js_obj_js').getProperty('n');\n", "line": 15, "column": 1, "endLine": 15, diff --git a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.ets b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.ets index f71f2540b498b2c0e453cc82aaabbb508b1a8b5c..7a93ab3ecba4333743782320a30eabec62e44bc2 100644 --- a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.ets +++ b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.ets @@ -12,10 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./binary_operation_js_obj_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let m = GeneratedImportVar_1.getProperty('m'); -let n = GeneratedImportVar_1.getProperty('n'); +let foo = ESValue.load('./binary_operation_js_obj_js').getProperty('foo'); +let m = ESValue.load('./binary_operation_js_obj_js').getProperty('m'); +let n = ESValue.load('./binary_operation_js_obj_js').getProperty('n'); let a = foo.getProperty("a") let b = foo.getProperty("b") diff --git a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.json b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.json index 00ccbc39c61e627b937eae4dcd3b32d495906082..f0dfd043375ffecce257d2610defd361d1df6f34 100644 --- a/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.json +++ b/ets2panda/linter/test/interop/binary_operation_js_obj.ets.migrate.json @@ -18,7 +18,7 @@ "line": 15, "column": 5, "endLine": 15, - "endColumn": 72, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 50, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,17 +38,17 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 46, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 18, + "line": 19, "column": 5, - "endLine": 18, - "endColumn": 46, + "endLine": 19, + "endColumn": 29, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -65,19 +65,9 @@ "severity": "ERROR" }, { - "line": 21, - "column": 5, - "endLine": 21, - "endColumn": 29, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 27, + "line": 26, "column": 1, - "endLine": 27, + "endLine": 26, "endColumn": 15, "problem": "MathPow", "suggest": "", @@ -85,9 +75,9 @@ "severity": "ERROR" }, { - "line": 31, + "line": 30, "column": 1, - "endLine": 31, + "endLine": 30, "endColumn": 37, "problem": "MathPow", "suggest": "", @@ -95,9 +85,9 @@ "severity": "ERROR" }, { - "line": 37, + "line": 36, "column": 1, - "endLine": 37, + "endLine": 36, "endColumn": 15, "problem": "MathPow", "suggest": "", @@ -105,9 +95,9 @@ "severity": "ERROR" }, { - "line": 49, + "line": 48, "column": 1, - "endLine": 49, + "endLine": 48, "endColumn": 17, "problem": "MathPow", "suggest": "", diff --git a/ets2panda/linter/test/interop/call_object_methods.ets.autofix.json b/ets2panda/linter/test/interop/call_object_methods.ets.autofix.json index ca67f37978d18385d4c2b0877925b32652d6b317..0168feead4146a8ff3979eb4846aba20c577ec20 100644 --- a/ets2panda/linter/test/interop/call_object_methods.ets.autofix.json +++ b/ets2panda/linter/test/interop/call_object_methods.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 650, "end": 650, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./call_object_methods_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./call_object_methods_js').getProperty('foo');\n", "line": 15, "column": 1, "endLine": 15, diff --git a/ets2panda/linter/test/interop/call_object_methods.ets.migrate.ets b/ets2panda/linter/test/interop/call_object_methods.ets.migrate.ets index 600a9cadacf84ccc7a9cf27a38eb2731efe84d42..e9e2087b586717af5c059e9675bdb27e7179ed28 100644 --- a/ets2panda/linter/test/interop/call_object_methods.ets.migrate.ets +++ b/ets2panda/linter/test/interop/call_object_methods.ets.migrate.ets @@ -12,8 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./call_object_methods_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); +let foo = ESValue.load('./call_object_methods_js').getProperty('foo'); foo.invokeMethod("bar", ESValue.wrap(123.0)) diff --git a/ets2panda/linter/test/interop/call_object_methods.ets.migrate.json b/ets2panda/linter/test/interop/call_object_methods.ets.migrate.json index ccc6caf0a4f15dd1754ff45bd3e3c750d7c388a1..149a43f6f592beed295eb162f2eb5adb2f8c0e1c 100644 --- a/ets2panda/linter/test/interop/call_object_methods.ets.migrate.json +++ b/ets2panda/linter/test/interop/call_object_methods.ets.migrate.json @@ -18,17 +18,7 @@ "line": 15, "column": 5, "endLine": 15, - "endColumn": 68, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 16, - "column": 5, - "endLine": 16, - "endColumn": 50, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", diff --git a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.autofix.json b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.autofix.json index a0e63a21c5d46c4ca42f831c725824c226409396..f8d8a8cfdc1ba30ef321a989822442291959bd07 100644 --- a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.autofix.json +++ b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 655, "end": 655, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./increases_decreases_js_obj_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./increases_decreases_js_obj_js').getProperty('foo');\n", "line": 15, "column": 1, "endLine": 15, diff --git a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.ets b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.ets index 276cf1196d9e91bbafc575221cffbea97f376f0d..cf3c50c2c8a89af985acb0b136fe0c30360eac52 100644 --- a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.ets +++ b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.ets @@ -12,8 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./increases_decreases_js_obj_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); +let foo = ESValue.load('./increases_decreases_js_obj_js').getProperty('foo'); let a: number =0.0 a = foo.getProperty("num").toNumber() diff --git a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.json b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.json index 78b7199f4f1749dddbdfa9785fcb4c54cf2c4a5f..2d9436fba2c494e011863cffb8548f5f6d263639 100644 --- a/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.json +++ b/ets2panda/linter/test/interop/increases_decreases_js_obj.ets.migrate.json @@ -18,26 +18,16 @@ "line": 15, "column": 5, "endLine": 15, - "endColumn": 75, + "endColumn": 77, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 16, + "line": 35, "column": 5, - "endLine": 16, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 36, - "column": 5, - "endLine": 36, + "endLine": 35, "endColumn": 46, "problem": "AnyType", "suggest": "", @@ -45,9 +35,9 @@ "severity": "ERROR" }, { - "line": 40, + "line": 39, "column": 5, - "endLine": 40, + "endLine": 39, "endColumn": 46, "problem": "AnyType", "suggest": "", @@ -55,9 +45,9 @@ "severity": "ERROR" }, { - "line": 44, + "line": 43, "column": 5, - "endLine": 44, + "endLine": 43, "endColumn": 46, "problem": "AnyType", "suggest": "", @@ -65,9 +55,9 @@ "severity": "ERROR" }, { - "line": 48, + "line": 47, "column": 5, - "endLine": 48, + "endLine": 47, "endColumn": 46, "problem": "AnyType", "suggest": "", diff --git a/ets2panda/linter/test/interop/instantiated_js_obj.ets.autofix.json b/ets2panda/linter/test/interop/instantiated_js_obj.ets.autofix.json index c0509f85eaabe032baed6855e3652fddf5217db8..40daaaa99e5deaa49cd6d17eeb16b8db96f71b3f 100644 --- a/ets2panda/linter/test/interop/instantiated_js_obj.ets.autofix.json +++ b/ets2panda/linter/test/interop/instantiated_js_obj.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 655, "end": 655, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./instantiated_js_obj_js');\nlet Foo = GeneratedImportVar_1.getProperty('Foo');\nlet Foo1 = GeneratedImportVar_1.getProperty('Foo1');\n", + "replacementText": "let Foo = ESValue.load('./instantiated_js_obj_js').getProperty('Foo');\nlet Foo1 = ESValue.load('./instantiated_js_obj_js').getProperty('Foo1');\n", "line": 16, "column": 1, "endLine": 16, diff --git a/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.ets b/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.ets index 754fa9a041e6552057ee34ae4285012c4306f39f..9f8564ec60c420c654dce212ba8110f1a975cd17 100644 --- a/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.ets +++ b/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./instantiated_js_obj_js'); -let Foo = GeneratedImportVar_1.getProperty('Foo'); -let Foo1 = GeneratedImportVar_1.getProperty('Foo1'); +let Foo = ESValue.load('./instantiated_js_obj_js').getProperty('Foo'); +let Foo1 = ESValue.load('./instantiated_js_obj_js').getProperty('Foo1'); class A { num: number = 1.0; diff --git a/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.json b/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.json index 5c043e26be03b3860729c8b8cecc87b75ac03a96..a1be17f7a40899eb98b78b56687678a26cf3b3fd 100644 --- a/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.json +++ b/ets2panda/linter/test/interop/instantiated_js_obj.ets.migrate.json @@ -18,7 +18,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 68, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,17 +28,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 18, - "column": 5, - "endLine": 18, - "endColumn": 52, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", diff --git a/ets2panda/linter/test/interop/interop_convert_import.ets.autofix.json b/ets2panda/linter/test/interop/interop_convert_import.ets.autofix.json index f2a8c5c3a451b77e49bfb080be12c3406ef7a682..728ef37abc8c8fc19fc711e9b8947b4640fb45f7 100644 --- a/ets2panda/linter/test/interop/interop_convert_import.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_convert_import.ets.autofix.json @@ -43,7 +43,7 @@ { "start": 740, "end": 740, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_convert_import_js.js');\r\nlet foo = GeneratedImportVar_1.getProperty('foo');\r\nlet foo2 = GeneratedImportVar_1.getProperty('foo2');\r\nlet foo3 = GeneratedImportVar_1.getProperty('foo3');\r\nlet foo4 = GeneratedImportVar_1.getProperty('foo4');\r\nlet array_val = GeneratedImportVar_1.getProperty('array_val');\r\nlet null_val = GeneratedImportVar_1.getProperty('null_val');\r\nlet undefined_val = GeneratedImportVar_1.getProperty('undefined_val');\r\n", + "replacementText": "let foo = ESValue.load('./interop_convert_import_js.js').getProperty('foo');\r\nlet foo2 = ESValue.load('./interop_convert_import_js.js').getProperty('foo2');\r\nlet foo3 = ESValue.load('./interop_convert_import_js.js').getProperty('foo3');\r\nlet foo4 = ESValue.load('./interop_convert_import_js.js').getProperty('foo4');\r\nlet array_val = ESValue.load('./interop_convert_import_js.js').getProperty('array_val');\r\nlet null_val = ESValue.load('./interop_convert_import_js.js').getProperty('null_val');\r\nlet undefined_val = ESValue.load('./interop_convert_import_js.js').getProperty('undefined_val');\r\n", "line": 17, "column": 2, "endLine": 17, diff --git a/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.ets b/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.ets index 2c49f3dc58588df1ac4e9d19193f72806db3c1b4..b90e38880f2bf78c88e511682f3394ffc28975d4 100644 --- a/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.ets @@ -14,14 +14,13 @@ */ 'use static' - let GeneratedImportVar_1 = ESValue.load('./interop_convert_import_js.js'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let foo2 = GeneratedImportVar_1.getProperty('foo2'); -let foo3 = GeneratedImportVar_1.getProperty('foo3'); -let foo4 = GeneratedImportVar_1.getProperty('foo4'); -let array_val = GeneratedImportVar_1.getProperty('array_val'); -let null_val = GeneratedImportVar_1.getProperty('null_val'); -let undefined_val = GeneratedImportVar_1.getProperty('undefined_val'); + let foo = ESValue.load('./interop_convert_import_js.js').getProperty('foo'); +let foo2 = ESValue.load('./interop_convert_import_js.js').getProperty('foo2'); +let foo3 = ESValue.load('./interop_convert_import_js.js').getProperty('foo3'); +let foo4 = ESValue.load('./interop_convert_import_js.js').getProperty('foo4'); +let array_val = ESValue.load('./interop_convert_import_js.js').getProperty('array_val'); +let null_val = ESValue.load('./interop_convert_import_js.js').getProperty('null_val'); +let undefined_val = ESValue.load('./interop_convert_import_js.js').getProperty('undefined_val'); let a: number = foo.getProperty("num").toNumber() diff --git a/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.json b/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.json index 52e07c8a2b2155cbfa4823987cec21f7ebc72a28..e2860e27258d30de9de0d714726d7602804025d9 100644 --- a/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_convert_import.ets.migrate.json @@ -18,7 +18,7 @@ "line": 17, "column": 6, "endLine": 17, - "endColumn": 75, + "endColumn": 77, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 50, + "endColumn": 78, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 52, + "endColumn": 78, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,7 +48,7 @@ "line": 20, "column": 5, "endLine": 20, - "endColumn": 52, + "endColumn": 78, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,7 +58,7 @@ "line": 21, "column": 5, "endLine": 21, - "endColumn": 52, + "endColumn": 88, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -68,7 +68,7 @@ "line": 22, "column": 5, "endLine": 22, - "endColumn": 62, + "endColumn": 86, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -78,26 +78,16 @@ "line": 23, "column": 5, "endLine": 23, - "endColumn": 60, + "endColumn": 96, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 24, - "column": 5, - "endLine": 24, - "endColumn": 70, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 33, + "line": 32, "column": 44, - "endLine": 33, + "endLine": 32, "endColumn": 68, "problem": "GenericCallNoTypeArgs", "suggest": "", @@ -105,9 +95,9 @@ "severity": "ERROR" }, { - "line": 43, + "line": 42, "column": 8, - "endLine": 43, + "endLine": 42, "endColumn": 24, "problem": "InterOpConvertImport", "suggest": "", diff --git a/ets2panda/linter/test/interop/interop_equality_judgment.ets.autofix.json b/ets2panda/linter/test/interop/interop_equality_judgment.ets.autofix.json index 3f22cfc7bfc5c977002c7020265fcc1d1d2244d1..d38814d67ccf68720a9390399e58f98042c1e5f7 100644 --- a/ets2panda/linter/test/interop/interop_equality_judgment.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_equality_judgment.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 656, "end": 656, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_equality_judgment_js');\nlet a = GeneratedImportVar_1.getProperty('a');\nlet b = GeneratedImportVar_1.getProperty('b');\n", + "replacementText": "let a = ESValue.load('./interop_equality_judgment_js').getProperty('a');\nlet b = ESValue.load('./interop_equality_judgment_js').getProperty('b');\n", "line": 16, "column": 1, "endLine": 16, diff --git a/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.ets b/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.ets index 9a2c6e2cab1b6e41bfb576c33ace3cc323d60070..75dfa93e7094995f00a4ef31eb0bb9dca245afe1 100644 --- a/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./interop_equality_judgment_js'); -let a = GeneratedImportVar_1.getProperty('a'); -let b = GeneratedImportVar_1.getProperty('b'); +let a = ESValue.load('./interop_equality_judgment_js').getProperty('a'); +let b = ESValue.load('./interop_equality_judgment_js').getProperty('b'); a.areEqual(b) !a.areEqual(b) diff --git a/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.json b/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.json index 38e88ae0b6d395013b306d4101a0548f68fe6f3b..c8a37393a693d0cbeecc24da7889934ae686dc61 100644 --- a/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_equality_judgment.ets.migrate.json @@ -18,7 +18,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 74, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,17 +28,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 46, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 18, - "column": 5, - "endLine": 18, - "endColumn": 46, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", diff --git a/ets2panda/linter/test/interop/interop_import_js.ets b/ets2panda/linter/test/interop/interop_import_js.ets index 337d1600c68dd251a1f27b9d96ffb214dcfdf69f..a4c0b8fea69eeb2c1cb904f44aac79c764e47804 100644 --- a/ets2panda/linter/test/interop/interop_import_js.ets +++ b/ets2panda/linter/test/interop/interop_import_js.ets @@ -18,5 +18,5 @@ import { fjs } from '../main/js_lib'; import { CPreview,bar,foo } from "./jsfiles/preview_import_js"; import myAaa from "./interop_import_js_js"; import myAaa,{ClassA,Dog} from "./interop_import_js_js"; -import * as namespace from "./interop_import_js_js"; +import * as tjs from "./interop_import_js_js"; import { Wiki, Dog as Doge } from './interop_import_js_js' \ No newline at end of file diff --git a/ets2panda/linter/test/interop/interop_import_js.ets.arkts2.json b/ets2panda/linter/test/interop/interop_import_js.ets.arkts2.json index 7d56ee5afdf8f7d33dc5624dcf3c823daece3e83..f8dbfb7b6c507c635f7e41fd8c93a7b1ee20432a 100755 --- a/ets2panda/linter/test/interop/interop_import_js.ets.arkts2.json +++ b/ets2panda/linter/test/interop/interop_import_js.ets.arkts2.json @@ -68,7 +68,7 @@ "line": 21, "column": 1, "endLine": 21, - "endColumn": 53, + "endColumn": 47, "problem": "InterOpImportJs", "suggest": "", "rule": "Importing directly from \"JS\" module is not supported (arkts-interop-js2s-import-js)", diff --git a/ets2panda/linter/test/interop/interop_import_js.ets.autofix.json b/ets2panda/linter/test/interop/interop_import_js.ets.autofix.json index 2a3dec941aebfc7bfe13fa7c356e788e082c5b99..95ff8c7ad144fd1bbf3e921de6e130eb0251c586 100755 --- a/ets2panda/linter/test/interop/interop_import_js.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_import_js.ets.autofix.json @@ -31,9 +31,9 @@ "endColumn": 38 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('../main/js_lib');\nlet Cjs = GeneratedImportVar_1.getProperty('Cjs');\n", + "start": 952, + "end": 952, + "replacementText": "let Cjs = ESValue.load('../main/js_lib').getProperty('Cjs');\n", "line": 16, "column": 1, "endLine": 16, @@ -61,9 +61,9 @@ "endColumn": 38 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_2 = ESValue.load('../main/js_lib');\nlet fjs = GeneratedImportVar_2.getProperty('fjs');\n", + "start": 952, + "end": 952, + "replacementText": "let fjs = ESValue.load('../main/js_lib').getProperty('fjs');\n", "line": 17, "column": 1, "endLine": 17, @@ -91,9 +91,9 @@ "endColumn": 64 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_3 = ESValue.load('./jsfiles/preview_import_js');\nlet CPreview = GeneratedImportVar_3.getProperty('CPreview');\nlet bar = GeneratedImportVar_3.getProperty('bar');\nlet foo = GeneratedImportVar_3.getProperty('foo');\n", + "start": 952, + "end": 952, + "replacementText": "let CPreview = ESValue.load('./jsfiles/preview_import_js').getProperty('CPreview');\nlet bar = ESValue.load('./jsfiles/preview_import_js').getProperty('bar');\nlet foo = ESValue.load('./jsfiles/preview_import_js').getProperty('foo');\n", "line": 18, "column": 1, "endLine": 18, @@ -121,9 +121,9 @@ "endColumn": 44 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_4 = ESValue.load('./interop_import_js_js');\nlet myAaa = GeneratedImportVar_4.getProperty('aaa');\n", + "start": 952, + "end": 952, + "replacementText": "let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa');\n", "line": 19, "column": 1, "endLine": 19, @@ -151,9 +151,9 @@ "endColumn": 57 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_5 = ESValue.load('./interop_import_js_js');\nlet myAaa = GeneratedImportVar_5.getProperty('aaa');\nlet ClassA = GeneratedImportVar_5.getProperty('ClassA');\nlet Dog = GeneratedImportVar_5.getProperty('Dog');\n", + "start": 952, + "end": 952, + "replacementText": "let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa');\nlet ClassA = ESValue.load('./interop_import_js_js').getProperty('ClassA');\nlet Dog = ESValue.load('./interop_import_js_js').getProperty('Dog');\n", "line": 20, "column": 1, "endLine": 20, @@ -168,26 +168,26 @@ "line": 21, "column": 1, "endLine": 21, - "endColumn": 53, + "endColumn": 47, "problem": "InterOpImportJs", "autofix": [ { "start": 847, - "end": 899, + "end": 893, "replacementText": "", "line": 21, "column": 1, "endLine": 21, - "endColumn": 53 + "endColumn": 47 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_6 = ESValue.load('./interop_import_js_js');\n", + "start": 952, + "end": 952, + "replacementText": "let tjs = ESValue.load('./interop_import_js_js').getProperty('tjs');\n", "line": 21, "column": 1, "endLine": 21, - "endColumn": 53 + "endColumn": 47 } ], "suggest": "", @@ -202,8 +202,8 @@ "problem": "InterOpImportJs", "autofix": [ { - "start": 900, - "end": 958, + "start": 894, + "end": 952, "replacementText": "", "line": 22, "column": 1, @@ -211,9 +211,9 @@ "endColumn": 59 }, { - "start": 958, - "end": 958, - "replacementText": "let GeneratedImportVar_7 = ESValue.load('./interop_import_js_js');\nlet Wiki = GeneratedImportVar_7.getProperty('Wiki');\nlet Doge = GeneratedImportVar_7.getProperty('Dog');\n", + "start": 952, + "end": 952, + "replacementText": "let Wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki');\nlet Doge = ESValue.load('./interop_import_js_js').getProperty('Dog');\n", "line": 22, "column": 1, "endLine": 22, diff --git a/ets2panda/linter/test/interop/interop_import_js.ets.migrate.ets b/ets2panda/linter/test/interop/interop_import_js.ets.migrate.ets index 851b32fdc091ffac6f98ed97248f610c924736d5..4ac9329ef8aa702c969d0b66d3bf030d342fc626 100644 --- a/ets2panda/linter/test/interop/interop_import_js.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_import_js.ets.migrate.ets @@ -19,21 +19,15 @@ -let GeneratedImportVar_7 = ESValue.load('./interop_import_js_js'); -let Wiki = GeneratedImportVar_7.getProperty('Wiki'); -let Doge = GeneratedImportVar_7.getProperty('Dog'); -let GeneratedImportVar_6 = ESValue.load('./interop_import_js_js'); -let GeneratedImportVar_5 = ESValue.load('./interop_import_js_js'); -let myAaa = GeneratedImportVar_5.getProperty('aaa'); -let ClassA = GeneratedImportVar_5.getProperty('ClassA'); -let Dog = GeneratedImportVar_5.getProperty('Dog'); -let GeneratedImportVar_4 = ESValue.load('./interop_import_js_js'); -let myAaa = GeneratedImportVar_4.getProperty('aaa'); -let GeneratedImportVar_3 = ESValue.load('./jsfiles/preview_import_js'); -let CPreview = GeneratedImportVar_3.getProperty('CPreview'); -let bar = GeneratedImportVar_3.getProperty('bar'); -let foo = GeneratedImportVar_3.getProperty('foo'); -let GeneratedImportVar_2 = ESValue.load('../main/js_lib'); -let fjs = GeneratedImportVar_2.getProperty('fjs'); -let GeneratedImportVar_1 = ESValue.load('../main/js_lib'); -let Cjs = GeneratedImportVar_1.getProperty('Cjs'); +let Wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki'); +let Doge = ESValue.load('./interop_import_js_js').getProperty('Dog'); +let tjs = ESValue.load('./interop_import_js_js').getProperty('tjs'); +let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa'); +let ClassA = ESValue.load('./interop_import_js_js').getProperty('ClassA'); +let Dog = ESValue.load('./interop_import_js_js').getProperty('Dog'); +let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa'); +let CPreview = ESValue.load('./jsfiles/preview_import_js').getProperty('CPreview'); +let bar = ESValue.load('./jsfiles/preview_import_js').getProperty('bar'); +let foo = ESValue.load('./jsfiles/preview_import_js').getProperty('foo'); +let fjs = ESValue.load('../main/js_lib').getProperty('fjs'); +let Cjs = ESValue.load('../main/js_lib').getProperty('Cjs'); diff --git a/ets2panda/linter/test/interop/interop_import_js.ets.migrate.json b/ets2panda/linter/test/interop/interop_import_js.ets.migrate.json index d46fff44eed9303ef9110bdcacdb9a2ff61a0684..b401dd1af61260112e1f58f838d259e0d8fc0397 100644 --- a/ets2panda/linter/test/interop/interop_import_js.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_import_js.ets.migrate.json @@ -18,7 +18,7 @@ "line": 22, "column": 5, "endLine": 22, - "endColumn": 66, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 23, "column": 5, "endLine": 23, - "endColumn": 52, + "endColumn": 69, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 24, "column": 5, "endLine": 24, - "endColumn": 51, + "endColumn": 68, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,7 +48,7 @@ "line": 25, "column": 5, "endLine": 25, - "endColumn": 66, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,7 +58,7 @@ "line": 26, "column": 5, "endLine": 26, - "endColumn": 66, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -68,7 +68,7 @@ "line": 27, "column": 5, "endLine": 27, - "endColumn": 52, + "endColumn": 68, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -78,7 +78,7 @@ "line": 28, "column": 5, "endLine": 28, - "endColumn": 56, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -88,7 +88,7 @@ "line": 29, "column": 5, "endLine": 29, - "endColumn": 50, + "endColumn": 83, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -98,7 +98,7 @@ "line": 30, "column": 5, "endLine": 30, - "endColumn": 66, + "endColumn": 73, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -108,7 +108,7 @@ "line": 31, "column": 5, "endLine": 31, - "endColumn": 52, + "endColumn": 73, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -118,7 +118,7 @@ "line": 32, "column": 5, "endLine": 32, - "endColumn": 71, + "endColumn": 60, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -133,66 +133,6 @@ "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" - }, - { - "line": 34, - "column": 5, - "endLine": 34, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 35, - "column": 5, - "endLine": 35, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 36, - "column": 5, - "endLine": 36, - "endColumn": 58, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 37, - "column": 5, - "endLine": 37, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 38, - "column": 5, - "endLine": 38, - "endColumn": 58, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 39, - "column": 5, - "endLine": 39, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" } ] } \ No newline at end of file diff --git a/ets2panda/linter/test/interop/interop_import_js_compare.ets.autofix.json b/ets2panda/linter/test/interop/interop_import_js_compare.ets.autofix.json index baf465561b539d1b6bd2bd6ca6ff850e97c933ef..069c2730b0bf41cb95c272d3e7df974d866ccd2d 100644 --- a/ets2panda/linter/test/interop/interop_import_js_compare.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_import_js_compare.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 663, "end": 663, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_import_js_compare_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\nlet m = GeneratedImportVar_1.getProperty('m');\nlet n = GeneratedImportVar_1.getProperty('n');\n", + "replacementText": "let foo = ESValue.load('./interop_import_js_compare_js').getProperty('foo');\nlet m = ESValue.load('./interop_import_js_compare_js').getProperty('m');\nlet n = ESValue.load('./interop_import_js_compare_js').getProperty('n');\n", "line": 17, "column": 1, "endLine": 17, diff --git a/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.ets b/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.ets index 3e99265ba814b5f1d3cfddda1175c672fd65a5d0..a95b861772eda6a44fce54e779ec10ee6f350566 100644 --- a/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.ets @@ -14,10 +14,9 @@ */ -let GeneratedImportVar_1 = ESValue.load('./interop_import_js_compare_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let m = GeneratedImportVar_1.getProperty('m'); -let n = GeneratedImportVar_1.getProperty('n'); +let foo = ESValue.load('./interop_import_js_compare_js').getProperty('foo'); +let m = ESValue.load('./interop_import_js_compare_js').getProperty('m'); +let n = ESValue.load('./interop_import_js_compare_js').getProperty('n'); let a = foo.getProperty("a") let b = foo.getProperty("b") diff --git a/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.json b/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.json index 680e681f8883502ebd575b0812d7d0ebd96057b7..b425bd1e5ac7fb8023a82667b073b90995e83676 100644 --- a/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_import_js_compare.ets.migrate.json @@ -18,7 +18,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 74, + "endColumn": 76, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 50, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,17 +38,17 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 46, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 20, + "line": 21, "column": 5, - "endLine": 20, - "endColumn": 46, + "endLine": 21, + "endColumn": 29, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -63,16 +63,6 @@ "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" - }, - { - "line": 23, - "column": 5, - "endLine": 23, - "endColumn": 29, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" } ] } \ No newline at end of file diff --git a/ets2panda/linter/test/interop/interop_import_js_index.ets.autofix.json b/ets2panda/linter/test/interop/interop_import_js_index.ets.autofix.json index 7e7407ab2d8666a49b0be63baf97f3151ab08bba..8b38c2c03fe78137b0636a10d3c6c8d9d9f850b2 100644 --- a/ets2panda/linter/test/interop/interop_import_js_index.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_import_js_index.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 703, "end": 703, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_import_js_rules_js');\nlet ff3 = GeneratedImportVar_1.getProperty('ff3');\n", + "replacementText": "let ff3 = ESValue.load('./interop_import_js_rules_js').getProperty('ff3');\n", "line": 15, "column": 1, "endLine": 15, @@ -63,7 +63,7 @@ { "start": 703, "end": 703, - "replacementText": "let GeneratedImportVar_2 = ESValue.load('./interop_import_js_index_js');\nlet foo = GeneratedImportVar_2.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./interop_import_js_index_js').getProperty('foo');\n", "line": 16, "column": 1, "endLine": 16, diff --git a/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.ets b/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.ets index d26adb726fa91f8068bd8e47e7a2d48b8328b3d4..7cac462bbc2b818778b2d8594616fcf129a11c74 100644 --- a/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.ets @@ -13,10 +13,8 @@ * limitations under the License. */ -let GeneratedImportVar_2 = ESValue.load('./interop_import_js_index_js'); -let foo = GeneratedImportVar_2.getProperty('foo'); -let GeneratedImportVar_1 = ESValue.load('./interop_import_js_rules_js'); -let ff3 = GeneratedImportVar_1.getProperty('ff3'); +let foo = ESValue.load('./interop_import_js_index_js').getProperty('foo'); +let ff3 = ESValue.load('./interop_import_js_rules_js').getProperty('ff3'); let arr = foo.getProperty("arr") arr.getProperty(1.0) diff --git a/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.json b/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.json index f816c83809d067482f730fe1a6e8f213f631445e..bc80aa171a2ec94d9fe1aa56f0cbc3c468d1c296 100644 --- a/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_import_js_index.ets.migrate.json @@ -18,7 +18,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 72, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,17 +28,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 18, - "column": 5, - "endLine": 18, - "endColumn": 72, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,16 +38,6 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 21, - "column": 5, - "endLine": 21, "endColumn": 33, "problem": "AnyType", "suggest": "", @@ -65,9 +45,9 @@ "severity": "ERROR" }, { - "line": 25, + "line": 23, "column": 5, - "endLine": 25, + "endLine": 23, "endColumn": 34, "problem": "AnyType", "suggest": "", @@ -75,9 +55,9 @@ "severity": "ERROR" }, { - "line": 29, + "line": 27, "column": 9, - "endLine": 29, + "endLine": 27, "endColumn": 43, "problem": "AnyType", "suggest": "", @@ -85,9 +65,9 @@ "severity": "ERROR" }, { - "line": 35, + "line": 33, "column": 10, - "endLine": 35, + "endLine": 33, "endColumn": 17, "problem": "AnyType", "suggest": "", diff --git a/ets2panda/linter/test/interop/interop_import_js_rules.ets.autofix.json b/ets2panda/linter/test/interop/interop_import_js_rules.ets.autofix.json index 58320d2ba512dc7e92878880a09d11690ff59917..e160d4c3d08b3ae890c11d606050da565d1f123a 100644 --- a/ets2panda/linter/test/interop/interop_import_js_rules.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_import_js_rules.ets.autofix.json @@ -43,7 +43,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_import_js_rules_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./interop_import_js_rules_js').getProperty('foo');\n", "line": 17, "column": 1, "endLine": 17, @@ -83,7 +83,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_2 = ESValue.load('./interop_import_js_rules_js');\nlet ff1 = GeneratedImportVar_2.getProperty('ff1');\nlet ff2 = GeneratedImportVar_2.getProperty('ff2');\n", + "replacementText": "let ff1 = ESValue.load('./interop_import_js_rules_js').getProperty('ff1');\nlet ff2 = ESValue.load('./interop_import_js_rules_js').getProperty('ff2');\n", "line": 18, "column": 1, "endLine": 18, @@ -123,7 +123,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_3 = ESValue.load('./interop_import_js_rules_js');\nlet A = GeneratedImportVar_3.getProperty('A');\n", + "replacementText": "let A = ESValue.load('./interop_import_js_rules_js').getProperty('A');\n", "line": 20, "column": 1, "endLine": 20, @@ -163,7 +163,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_4 = ESValue.load('./interop_import_js_rules_js');\nlet C = GeneratedImportVar_4.getProperty('C');\n", + "replacementText": "let C = ESValue.load('./interop_import_js_rules_js').getProperty('C');\n", "line": 21, "column": 1, "endLine": 21, @@ -203,7 +203,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_5 = ESValue.load('./interop_import_js_rules_js');\nlet ff3 = GeneratedImportVar_5.getProperty('ff3');\n", + "replacementText": "let ff3 = ESValue.load('./interop_import_js_rules_js').getProperty('ff3');\n", "line": 23, "column": 1, "endLine": 23, @@ -243,7 +243,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_6 = ESValue.load('./interop_import_js_rules_js');\nlet ff4 = GeneratedImportVar_6.getProperty('ff4');\n", + "replacementText": "let ff4 = ESValue.load('./interop_import_js_rules_js').getProperty('ff4');\n", "line": 25, "column": 1, "endLine": 25, @@ -283,7 +283,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_7 = ESValue.load('./interop_import_js_rules_js');\nlet handle = GeneratedImportVar_7.getProperty('handle');\n", + "replacementText": "let handle = ESValue.load('./interop_import_js_rules_js').getProperty('handle');\n", "line": 27, "column": 1, "endLine": 27, @@ -323,7 +323,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_8 = ESValue.load('./interop_import_js_rules_js');\nlet expand = GeneratedImportVar_8.getProperty('expand');\n", + "replacementText": "let expand = ESValue.load('./interop_import_js_rules_js').getProperty('expand');\n", "line": 29, "column": 1, "endLine": 29, @@ -363,7 +363,7 @@ { "start": 1092, "end": 1092, - "replacementText": "let GeneratedImportVar_9 = ESValue.load('./interop_import_js_rules_js');\nlet orange = GeneratedImportVar_9.getProperty('orange');\n", + "replacementText": "let orange = ESValue.load('./interop_import_js_rules_js').getProperty('orange');\n", "line": 30, "column": 1, "endLine": 30, diff --git a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.autofix.json b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.autofix.json index 9481ffc18afd1228da236ac44066200edc7f80a7..cfe6324f31b9569623dcf5cff392d058c33e4fbd 100644 --- a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 783, "end": 783, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_import_js_js');\nlet myAaa = GeneratedImportVar_1.getProperty('aaa');\nlet ClassA = GeneratedImportVar_1.getProperty('ClassA');\nlet Dog = GeneratedImportVar_1.getProperty('Dog');\nlet Person = GeneratedImportVar_1.getProperty('Person');\nlet Wiki = GeneratedImportVar_1.getProperty('Wiki');\n", + "replacementText": "let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa');\nlet ClassA = ESValue.load('./interop_import_js_js').getProperty('ClassA');\nlet Dog = ESValue.load('./interop_import_js_js').getProperty('Dog');\nlet Person = ESValue.load('./interop_import_js_js').getProperty('Person');\nlet Wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki');\n", "line": 16, "column": 1, "endLine": 16, @@ -63,7 +63,7 @@ { "start": 783, "end": 783, - "replacementText": "let GeneratedImportVar_2 = ESValue.load('./interop_import_js_js');\nlet Doge = GeneratedImportVar_2.getProperty('Dog');\n", + "replacementText": "let Doge = ESValue.load('./interop_import_js_js').getProperty('Dog');\n", "line": 17, "column": 1, "endLine": 17, @@ -93,7 +93,7 @@ { "start": 783, "end": 783, - "replacementText": "let GeneratedImportVar_3 = ESValue.load('./interop_import_js_js');\nlet wiki = GeneratedImportVar_3.getProperty('Wiki');\n", + "replacementText": "let wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki');\n", "line": 18, "column": 1, "endLine": 18, diff --git a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.ets b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.ets index ec79bd0e7e86af7ce0f1f796f5b5bca1b38ae1bd..f7cde32163d4c0c4031ce29b783bcaf61fa964b0 100644 --- a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.ets @@ -15,16 +15,13 @@ -let GeneratedImportVar_3 = ESValue.load('./interop_import_js_js'); -let wiki = GeneratedImportVar_3.getProperty('Wiki'); -let GeneratedImportVar_2 = ESValue.load('./interop_import_js_js'); -let Doge = GeneratedImportVar_2.getProperty('Dog'); -let GeneratedImportVar_1 = ESValue.load('./interop_import_js_js'); -let myAaa = GeneratedImportVar_1.getProperty('aaa'); -let ClassA = GeneratedImportVar_1.getProperty('ClassA'); -let Dog = GeneratedImportVar_1.getProperty('Dog'); -let Person = GeneratedImportVar_1.getProperty('Person'); -let Wiki = GeneratedImportVar_1.getProperty('Wiki'); +let wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki'); +let Doge = ESValue.load('./interop_import_js_js').getProperty('Dog'); +let myAaa = ESValue.load('./interop_import_js_js').getProperty('aaa'); +let ClassA = ESValue.load('./interop_import_js_js').getProperty('ClassA'); +let Dog = ESValue.load('./interop_import_js_js').getProperty('Dog'); +let Person = ESValue.load('./interop_import_js_js').getProperty('Person'); +let Wiki = ESValue.load('./interop_import_js_js').getProperty('Wiki'); myAaa.invoke().typeOf(); //error diff --git a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.json b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.json index af67e13229a87bffab292ff2617cf434410703a5..fadac292b142e8d2c1b87a492ad418d41482c1a0 100644 --- a/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_import_typeof_js.ets.migrate.json @@ -18,7 +18,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 66, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 52, + "endColumn": 69, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 20, "column": 5, "endLine": 20, - "endColumn": 66, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,7 +48,7 @@ "line": 21, "column": 5, "endLine": 21, - "endColumn": 51, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,7 +58,7 @@ "line": 22, "column": 5, "endLine": 22, - "endColumn": 66, + "endColumn": 68, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -68,7 +68,7 @@ "line": 23, "column": 5, "endLine": 23, - "endColumn": 52, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -78,46 +78,16 @@ "line": 24, "column": 5, "endLine": 24, - "endColumn": 56, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 25, + "line": 28, "column": 5, - "endLine": 25, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 26, - "column": 5, - "endLine": 26, - "endColumn": 56, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 27, - "column": 5, - "endLine": 27, - "endColumn": 52, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 31, - "column": 5, - "endLine": 31, + "endLine": 28, "endColumn": 25, "problem": "AnyType", "suggest": "", @@ -125,9 +95,9 @@ "severity": "ERROR" }, { - "line": 39, + "line": 36, "column": 5, - "endLine": 39, + "endLine": 36, "endColumn": 35, "problem": "AnyType", "suggest": "", @@ -135,9 +105,9 @@ "severity": "ERROR" }, { - "line": 45, + "line": 42, "column": 5, - "endLine": 45, + "endLine": 42, "endColumn": 37, "problem": "AnyType", "suggest": "", @@ -145,9 +115,9 @@ "severity": "ERROR" }, { - "line": 46, + "line": 43, "column": 5, - "endLine": 46, + "endLine": 43, "endColumn": 42, "problem": "AnyType", "suggest": "", @@ -155,9 +125,9 @@ "severity": "ERROR" }, { - "line": 59, + "line": 56, "column": 7, - "endLine": 59, + "endLine": 56, "endColumn": 13, "problem": "InvalidIdentifier", "suggest": "", diff --git a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.autofix.json b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.autofix.json index f2e4507626e53be1c3f4253b95f4c5e13c3916f2..a4046013b93e430245d0721aa7819fa408f81b59 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.autofix.json @@ -43,7 +43,7 @@ { "start": 723, "end": 723, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_not_have_property_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\nlet person = GeneratedImportVar_1.getProperty('person');\nlet TestHelper = GeneratedImportVar_1.getProperty('TestHelper');\nlet Machine = GeneratedImportVar_1.getProperty('Machine');\nlet User = GeneratedImportVar_1.getProperty('User');\nlet Person = GeneratedImportVar_1.getProperty('Person');\nlet Employee = GeneratedImportVar_1.getProperty('Employee');\n", + "replacementText": "let foo = ESValue.load('./interop_not_have_property_js').getProperty('foo');\nlet person = ESValue.load('./interop_not_have_property_js').getProperty('person');\nlet TestHelper = ESValue.load('./interop_not_have_property_js').getProperty('TestHelper');\nlet Machine = ESValue.load('./interop_not_have_property_js').getProperty('Machine');\nlet User = ESValue.load('./interop_not_have_property_js').getProperty('User');\nlet Person = ESValue.load('./interop_not_have_property_js').getProperty('Person');\nlet Employee = ESValue.load('./interop_not_have_property_js').getProperty('Employee');\n", "line": 17, "column": 1, "endLine": 17, diff --git a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.ets b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.ets index ff4cf81936ebdd39e59dd966a33d10b676111432..3a19e5d1511c66c75b76ff0903e5120d555ac0f3 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.ets @@ -14,14 +14,13 @@ */ 'use static' -let GeneratedImportVar_1 = ESValue.load('./interop_not_have_property_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let person = GeneratedImportVar_1.getProperty('person'); -let TestHelper = GeneratedImportVar_1.getProperty('TestHelper'); -let Machine = GeneratedImportVar_1.getProperty('Machine'); -let User = GeneratedImportVar_1.getProperty('User'); -let Person = GeneratedImportVar_1.getProperty('Person'); -let Employee = GeneratedImportVar_1.getProperty('Employee'); +let foo = ESValue.load('./interop_not_have_property_js').getProperty('foo'); +let person = ESValue.load('./interop_not_have_property_js').getProperty('person'); +let TestHelper = ESValue.load('./interop_not_have_property_js').getProperty('TestHelper'); +let Machine = ESValue.load('./interop_not_have_property_js').getProperty('Machine'); +let User = ESValue.load('./interop_not_have_property_js').getProperty('User'); +let Person = ESValue.load('./interop_not_have_property_js').getProperty('Person'); +let Employee = ESValue.load('./interop_not_have_property_js').getProperty('Employee'); foo.getProperty("name") diff --git a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.json b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.json index 258a8601a043792f7922dfed5652c009e0c0fd43..b8e566357c116732b2dc8a4c11f7e2deceea02af 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_not_have_property_arkts2.ets.migrate.json @@ -18,7 +18,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 74, + "endColumn": 76, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 50, + "endColumn": 82, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 56, + "endColumn": 90, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,7 +48,7 @@ "line": 20, "column": 5, "endLine": 20, - "endColumn": 64, + "endColumn": 84, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,7 +58,7 @@ "line": 21, "column": 5, "endLine": 21, - "endColumn": 58, + "endColumn": 78, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -68,7 +68,7 @@ "line": 22, "column": 5, "endLine": 22, - "endColumn": 52, + "endColumn": 82, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -78,26 +78,16 @@ "line": 23, "column": 5, "endLine": 23, - "endColumn": 56, + "endColumn": 86, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 24, + "line": 33, "column": 5, - "endLine": 24, - "endColumn": 60, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 34, - "column": 5, - "endLine": 34, + "endLine": 33, "endColumn": 26, "problem": "AnyType", "suggest": "", @@ -105,9 +95,9 @@ "severity": "ERROR" }, { - "line": 37, + "line": 36, "column": 5, - "endLine": 37, + "endLine": 36, "endColumn": 85, "problem": "AnyType", "suggest": "", @@ -115,9 +105,9 @@ "severity": "ERROR" }, { - "line": 39, + "line": 38, "column": 9, - "endLine": 39, + "endLine": 38, "endColumn": 32, "problem": "AnyType", "suggest": "", @@ -125,9 +115,9 @@ "severity": "ERROR" }, { - "line": 39, + "line": 38, "column": 23, - "endLine": 39, + "endLine": 38, "endColumn": 30, "problem": "DynamicCtorCall", "suggest": "", @@ -135,9 +125,9 @@ "severity": "ERROR" }, { - "line": 44, + "line": 43, "column": 9, - "endLine": 44, + "endLine": 43, "endColumn": 31, "problem": "AnyType", "suggest": "", @@ -145,9 +135,9 @@ "severity": "ERROR" }, { - "line": 44, + "line": 43, "column": 20, - "endLine": 44, + "endLine": 43, "endColumn": 24, "problem": "DynamicCtorCall", "suggest": "", @@ -155,9 +145,9 @@ "severity": "ERROR" }, { - "line": 49, + "line": 48, "column": 5, - "endLine": 49, + "endLine": 48, "endColumn": 26, "problem": "AnyType", "suggest": "", @@ -165,9 +155,9 @@ "severity": "ERROR" }, { - "line": 49, + "line": 48, "column": 16, - "endLine": 49, + "endLine": 48, "endColumn": 20, "problem": "DynamicCtorCall", "suggest": "", @@ -175,9 +165,9 @@ "severity": "ERROR" }, { - "line": 54, + "line": 53, "column": 9, - "endLine": 54, + "endLine": 53, "endColumn": 30, "problem": "AnyType", "suggest": "", @@ -185,9 +175,9 @@ "severity": "ERROR" }, { - "line": 54, + "line": 53, "column": 20, - "endLine": 54, + "endLine": 53, "endColumn": 24, "problem": "DynamicCtorCall", "suggest": "", @@ -195,9 +185,9 @@ "severity": "ERROR" }, { - "line": 59, + "line": 58, "column": 9, - "endLine": 59, + "endLine": 58, "endColumn": 30, "problem": "AnyType", "suggest": "", @@ -205,9 +195,9 @@ "severity": "ERROR" }, { - "line": 59, + "line": 58, "column": 20, - "endLine": 59, + "endLine": 58, "endColumn": 24, "problem": "DynamicCtorCall", "suggest": "", @@ -215,9 +205,9 @@ "severity": "ERROR" }, { - "line": 64, + "line": 63, "column": 9, - "endLine": 64, + "endLine": 63, "endColumn": 43, "problem": "AnyType", "suggest": "", @@ -225,9 +215,9 @@ "severity": "ERROR" }, { - "line": 64, + "line": 63, "column": 23, - "endLine": 64, + "endLine": 63, "endColumn": 29, "problem": "DynamicCtorCall", "suggest": "", @@ -235,9 +225,9 @@ "severity": "ERROR" }, { - "line": 69, + "line": 68, "column": 9, - "endLine": 69, + "endLine": 68, "endColumn": 34, "problem": "AnyType", "suggest": "", @@ -245,9 +235,9 @@ "severity": "ERROR" }, { - "line": 69, + "line": 68, "column": 24, - "endLine": 69, + "endLine": 68, "endColumn": 32, "problem": "DynamicCtorCall", "suggest": "", diff --git a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.autofix.json b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.autofix.json index 402aa07005ff9d15b19ea0c1f4ba183637bcbf70..e2cc9e5d4c304a7e81e9f0161e212837f15bf57f 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.autofix.json +++ b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 650, "end": 650, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./interop_property_num_js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./interop_property_num_js').getProperty('foo');\n", "line": 16, "column": 1, "endLine": 16, diff --git a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.ets b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.ets index 97d25fc2388df29ee0d3c7380ff33cd343a10cb5..b67f968b2194a5096ebe9bbeb12b2b56d3755b3c 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.ets +++ b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.ets @@ -13,8 +13,7 @@ * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./interop_property_num_js'); -let foo = GeneratedImportVar_1.getProperty('foo'); +let foo = ESValue.load('./interop_property_num_js').getProperty('foo'); +foo.getProperty("num").toNumber(); diff --git a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.json b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.json index 9ada1a9ba2be361f5a43b0e4103448d741b96a95..5c300a0f06e69097793e229c1c3690f080cc48ef 100644 --- a/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.json +++ b/ets2panda/linter/test/interop/interop_not_have_property_num_arkts2.ets.migrate.json @@ -18,20 +18,20 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 69, + "endColumn": 71, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 17, - "column": 5, - "endLine": 17, - "endColumn": 50, - "problem": "AnyType", + "line": 19, + "column": 1, + "endLine": 19, + "endColumn": 35, + "problem": "UnaryArithmNotNumber", "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", + "rule": "Unary operators \"+\", \"-\" and \"~\" work only on numbers (arkts-no-polymorphic-unops)", "severity": "ERROR" }, { @@ -45,9 +45,9 @@ "severity": "ERROR" }, { - "line": 21, + "line": 22, "column": 1, - "endLine": 21, + "endLine": 22, "endColumn": 35, "problem": "UnaryArithmNotNumber", "suggest": "", @@ -58,7 +58,7 @@ "line": 23, "column": 1, "endLine": 23, - "endColumn": 35, + "endColumn": 37, "problem": "UnaryArithmNotNumber", "suggest": "", "rule": "Unary operators \"+\", \"-\" and \"~\" work only on numbers (arkts-no-polymorphic-unops)", @@ -75,19 +75,9 @@ "severity": "ERROR" }, { - "line": 25, - "column": 1, - "endLine": 25, - "endColumn": 37, - "problem": "UnaryArithmNotNumber", - "suggest": "", - "rule": "Unary operators \"+\", \"-\" and \"~\" work only on numbers (arkts-no-polymorphic-unops)", - "severity": "ERROR" - }, - { - "line": 27, + "line": 26, "column": 1, - "endLine": 27, + "endLine": 26, "endColumn": 37, "problem": "UnaryArithmNotNumber", "suggest": "", diff --git a/ets2panda/linter/test/interop/no_await_js_promise.ets.autofix.json b/ets2panda/linter/test/interop/no_await_js_promise.ets.autofix.json index 3803d40f1aa0a14150b68e0abda2f8cc2ab47d82..196e9489ea59563866b74d541eaf24afc2c81604 100644 --- a/ets2panda/linter/test/interop/no_await_js_promise.ets.autofix.json +++ b/ets2panda/linter/test/interop/no_await_js_promise.ets.autofix.json @@ -1,18 +1,18 @@ { - "copyright": [ - "Copyright (c) 2025 Huawei Device Co., Ltd.", - "Licensed under the Apache License, Version 2.0 (the 'License');", - "you may not use this file except in compliance with the License.", - "You may obtain a copy of the License at", - "", - "http://www.apache.org/licenses/LICENSE-2.0", - "", - "Unless required by applicable law or agreed to in writing, software", - "distributed under the License is distributed on an 'AS IS' BASIS,", - "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.", - "See the License for the specific language governing permissions and", - "limitations under the License." - ], + "copyright": [ + "Copyright (c) 2025 Huawei Device Co., Ltd.", + "Licensed under the Apache License, Version 2.0 (the 'License');", + "you may not use this file except in compliance with the License.", + "You may obtain a copy of the License at", + "", + "http://www.apache.org/licenses/LICENSE-2.0", + "", + "Unless required by applicable law or agreed to in writing, software", + "distributed under the License is distributed on an 'AS IS' BASIS,", + "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.", + "See the License for the specific language governing permissions and", + "limitations under the License." + ], "result": [ { "line": 16, @@ -33,7 +33,7 @@ { "start": 693, "end": 693, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./no_await_js_promise_export');\nlet p = GeneratedImportVar_1.getProperty('p');\nlet foo = GeneratedImportVar_1.getProperty('foo');\nlet pFuncCall = GeneratedImportVar_1.getProperty('pFuncCall');\nlet arrowFunc = GeneratedImportVar_1.getProperty('arrowFunc');\nlet pArrowCall = GeneratedImportVar_1.getProperty('pArrowCall');\n", + "replacementText": "let p = ESValue.load('./no_await_js_promise_export').getProperty('p');\nlet foo = ESValue.load('./no_await_js_promise_export').getProperty('foo');\nlet pFuncCall = ESValue.load('./no_await_js_promise_export').getProperty('pFuncCall');\nlet arrowFunc = ESValue.load('./no_await_js_promise_export').getProperty('arrowFunc');\nlet pArrowCall = ESValue.load('./no_await_js_promise_export').getProperty('pArrowCall');\n", "line": 16, "column": 1, "endLine": 16, @@ -275,4 +275,4 @@ "severity": "ERROR" } ] -} +} \ No newline at end of file diff --git a/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.ets b/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.ets index a1e4ff667cb9045b9cb98514836430c9ec8c07d9..7729b47d7a6cd5c444ef70ccab73a8c18dce3602 100644 --- a/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.ets +++ b/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.ets @@ -13,12 +13,11 @@ * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./no_await_js_promise_export'); -let p = GeneratedImportVar_1.getProperty('p'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let pFuncCall = GeneratedImportVar_1.getProperty('pFuncCall'); -let arrowFunc = GeneratedImportVar_1.getProperty('arrowFunc'); -let pArrowCall = GeneratedImportVar_1.getProperty('pArrowCall'); +let p = ESValue.load('./no_await_js_promise_export').getProperty('p'); +let foo = ESValue.load('./no_await_js_promise_export').getProperty('foo'); +let pFuncCall = ESValue.load('./no_await_js_promise_export').getProperty('pFuncCall'); +let arrowFunc = ESValue.load('./no_await_js_promise_export').getProperty('arrowFunc'); +let pArrowCall = ESValue.load('./no_await_js_promise_export').getProperty('pArrowCall'); async function awaitPromise() { diff --git a/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.json b/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.json index 4aebfd2473d2a4e49ba14ac9827cf14d869e4987..0b6e2511ceacaa613c5a0fe7631766f9321db601 100644 --- a/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.json +++ b/ets2panda/linter/test/interop/no_await_js_promise.ets.migrate.json @@ -18,7 +18,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 72, + "endColumn": 70, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 46, + "endColumn": 74, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 50, + "endColumn": 86, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -48,7 +48,7 @@ "line": 19, "column": 5, "endLine": 19, - "endColumn": 62, + "endColumn": 86, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,26 +58,16 @@ "line": 20, "column": 5, "endLine": 20, - "endColumn": 62, + "endColumn": 88, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 21, - "column": 5, - "endLine": 21, - "endColumn": 64, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 24, + "line": 23, "column": 16, - "endLine": 24, + "endLine": 23, "endColumn": 28, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -85,9 +75,9 @@ "severity": "ERROR" }, { - "line": 28, + "line": 27, "column": 16, - "endLine": 28, + "endLine": 27, "endColumn": 33, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -95,9 +85,9 @@ "severity": "ERROR" }, { - "line": 32, + "line": 31, "column": 16, - "endLine": 32, + "endLine": 31, "endColumn": 31, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -105,9 +95,9 @@ "severity": "ERROR" }, { - "line": 36, + "line": 35, "column": 16, - "endLine": 36, + "endLine": 35, "endColumn": 30, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -115,9 +105,9 @@ "severity": "ERROR" }, { - "line": 40, + "line": 39, "column": 16, - "endLine": 40, + "endLine": 39, "endColumn": 32, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -125,9 +115,9 @@ "severity": "ERROR" }, { - "line": 45, + "line": 44, "column": 9, - "endLine": 45, + "endLine": 44, "endColumn": 20, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -135,9 +125,9 @@ "severity": "ERROR" }, { - "line": 49, + "line": 48, "column": 13, - "endLine": 51, + "endLine": 50, "endColumn": 4, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -145,9 +135,9 @@ "severity": "ERROR" }, { - "line": 54, + "line": 53, "column": 20, - "endLine": 54, + "endLine": 53, "endColumn": 21, "problem": "ObjectLiteralNoContextType", "suggest": "", @@ -155,9 +145,9 @@ "severity": "ERROR" }, { - "line": 55, + "line": 54, "column": 3, - "endLine": 57, + "endLine": 56, "endColumn": 4, "problem": "ObjectLiteralProperty", "suggest": "", @@ -165,9 +155,9 @@ "severity": "ERROR" }, { - "line": 55, + "line": 54, "column": 9, - "endLine": 55, + "endLine": 54, "endColumn": 18, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -175,9 +165,9 @@ "severity": "ERROR" }, { - "line": 59, + "line": 58, "column": 17, - "endLine": 61, + "endLine": 60, "endColumn": 4, "problem": "LimitedReturnTypeInference", "suggest": "", @@ -185,4 +175,4 @@ "severity": "ERROR" } ] -} +} \ No newline at end of file diff --git a/ets2panda/linter/test/interop/no_js_instanceof.ets.autofix.json b/ets2panda/linter/test/interop/no_js_instanceof.ets.autofix.json index bf8dcb076db649446070bb78539ab6a3d9d971c5..653a902126e27bc67f81ab01aaccf13af138d7ce 100644 --- a/ets2panda/linter/test/interop/no_js_instanceof.ets.autofix.json +++ b/ets2panda/linter/test/interop/no_js_instanceof.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 692, "end": 692, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./no_js_instanceof_file.js');\nlet Foo = GeneratedImportVar_1.getProperty('Foo');\nlet foo = GeneratedImportVar_1.getProperty('foo');\nlet CreatePerson = GeneratedImportVar_1.getProperty('CreatePerson');\nlet a = GeneratedImportVar_1.getProperty('a');\nlet b = GeneratedImportVar_1.getProperty('b');\nlet MyNamespace = GeneratedImportVar_1.getProperty('MyNamespace');\n", + "replacementText": "let Foo = ESValue.load('./no_js_instanceof_file.js').getProperty('Foo');\nlet foo = ESValue.load('./no_js_instanceof_file.js').getProperty('foo');\nlet CreatePerson = ESValue.load('./no_js_instanceof_file.js').getProperty('CreatePerson');\nlet a = ESValue.load('./no_js_instanceof_file.js').getProperty('a');\nlet b = ESValue.load('./no_js_instanceof_file.js').getProperty('b');\nlet MyNamespace = ESValue.load('./no_js_instanceof_file.js').getProperty('MyNamespace');\n", "line": 16, "column": 1, "endLine": 16, diff --git a/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.ets b/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.ets index 89f487d233c9b2f73dc37c03c42c3598840dfa89..619b63d4659038a813e10087178256f80689a392 100644 --- a/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.ets +++ b/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.ets @@ -13,13 +13,12 @@ * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./no_js_instanceof_file.js'); -let Foo = GeneratedImportVar_1.getProperty('Foo'); -let foo = GeneratedImportVar_1.getProperty('foo'); -let CreatePerson = GeneratedImportVar_1.getProperty('CreatePerson'); -let a = GeneratedImportVar_1.getProperty('a'); -let b = GeneratedImportVar_1.getProperty('b'); -let MyNamespace = GeneratedImportVar_1.getProperty('MyNamespace'); +let Foo = ESValue.load('./no_js_instanceof_file.js').getProperty('Foo'); +let foo = ESValue.load('./no_js_instanceof_file.js').getProperty('foo'); +let CreatePerson = ESValue.load('./no_js_instanceof_file.js').getProperty('CreatePerson'); +let a = ESValue.load('./no_js_instanceof_file.js').getProperty('a'); +let b = ESValue.load('./no_js_instanceof_file.js').getProperty('b'); +let MyNamespace = ESValue.load('./no_js_instanceof_file.js').getProperty('MyNamespace'); class Foo1 {} diff --git a/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.json b/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.json index 4a61cb89de2f281130496aa8ca549b14447de3f7..7833e5b9a6ab314cc65509d10791e321d4eebf47 100644 --- a/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.json +++ b/ets2panda/linter/test/interop/no_js_instanceof.ets.migrate.json @@ -18,7 +18,7 @@ "line": 16, "column": 5, "endLine": 16, - "endColumn": 70, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -28,7 +28,7 @@ "line": 17, "column": 5, "endLine": 17, - "endColumn": 50, + "endColumn": 72, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -38,7 +38,7 @@ "line": 18, "column": 5, "endLine": 18, - "endColumn": 50, + "endColumn": 90, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -58,7 +58,7 @@ "line": 20, "column": 5, "endLine": 20, - "endColumn": 46, + "endColumn": 68, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", @@ -68,26 +68,16 @@ "line": 21, "column": 5, "endLine": 21, - "endColumn": 46, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 22, - "column": 5, - "endLine": 22, - "endColumn": 66, + "endColumn": 88, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 71, + "line": 70, "column": 19, - "endLine": 71, + "endLine": 70, "endColumn": 24, "problem": "ClassAsObjectError", "suggest": "", @@ -95,9 +85,9 @@ "severity": "ERROR" }, { - "line": 75, + "line": 74, "column": 21, - "endLine": 75, + "endLine": 74, "endColumn": 26, "problem": "ClassAsObjectError", "suggest": "", @@ -105,9 +95,9 @@ "severity": "ERROR" }, { - "line": 79, + "line": 78, "column": 36, - "endLine": 79, + "endLine": 78, "endColumn": 59, "problem": "DynamicCtorCall", "suggest": "", diff --git a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.autofix.json b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.autofix.json index b3d6f3508f100fd5f64015b32f9a3110d4964fee..855bd5e9a2c3b9bc81eb5ff2062c5e5f36b6b445 100644 --- a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.autofix.json +++ b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.autofix.json @@ -33,7 +33,7 @@ { "start": 654, "end": 654, - "replacementText": "let GeneratedImportVar_1 = ESValue.load('./unary_operation_js_obj_js.js');\nlet foo = GeneratedImportVar_1.getProperty('foo');\n", + "replacementText": "let foo = ESValue.load('./unary_operation_js_obj_js.js').getProperty('foo');\n", "line": 15, "column": 1, "endLine": 15, diff --git a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.ets b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.ets index d0a648c942aab4bb54bab28ba519e595b173ab4d..2cdab6f2ed8d1721df7d852f267de441a29f8765 100644 --- a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.ets +++ b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.ets @@ -12,8 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let GeneratedImportVar_1 = ESValue.load('./unary_operation_js_obj_js.js'); -let foo = GeneratedImportVar_1.getProperty('foo'); +let foo = ESValue.load('./unary_operation_js_obj_js.js').getProperty('foo'); +foo.getProperty("num").toNumber(); diff --git a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.json b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.json index 8fbd5964c45c2a91433eeca3b4174df58eeda273..cb1d1f02e88ce65beb43b91ed8e53709c9bc7eb2 100644 --- a/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.json +++ b/ets2panda/linter/test/interop/unary_operation_js_obj.ets.migrate.json @@ -18,26 +18,16 @@ "line": 15, "column": 5, "endLine": 15, - "endColumn": 74, + "endColumn": 76, "problem": "AnyType", "suggest": "", "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", "severity": "ERROR" }, { - "line": 16, - "column": 5, - "endLine": 16, - "endColumn": 50, - "problem": "AnyType", - "suggest": "", - "rule": "Use explicit types instead of \"any\", \"unknown\" (arkts-no-any-unknown)", - "severity": "ERROR" - }, - { - "line": 19, + "line": 18, "column": 1, - "endLine": 19, + "endLine": 18, "endColumn": 35, "problem": "UnaryArithmNotNumber", "suggest": "", @@ -45,9 +35,9 @@ "severity": "ERROR" }, { - "line": 20, + "line": 19, "column": 1, - "endLine": 20, + "endLine": 19, "endColumn": 35, "problem": "UnaryArithmNotNumber", "suggest": "", @@ -55,9 +45,9 @@ "severity": "ERROR" }, { - "line": 22, + "line": 21, "column": 1, - "endLine": 22, + "endLine": 21, "endColumn": 35, "problem": "UnaryArithmNotNumber", "suggest": "",