@abaplint/transpiler-cli 2.5.29 → 2.5.31

package/build/bundle.js

@@ -444,7 +444,10 @@ class Lexer {
             const ahead = this.stream.nextChar();
             const aahead = this.stream.nextNextChar();
             if (this.m === this.ModeNormal) {
-                if (ahead === "'") {
+                if (splits[ahead]) {
+                    this.add();
+                }
+                else if (ahead === "'") {
                     // start string
                     this.add();
                     this.m = this.ModeStr;
@@ -470,9 +473,6 @@ class Lexer {
                     this.add();
                     this.m = this.ModeComment;
                 }
-                else if (splits[ahead]) {
-                    this.add();
-                }
                 else if (ahead === "@" && buf.trim().length === 0) {
                     this.add();
                 }
@@ -21642,6 +21642,9 @@ const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@a
 const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 class ComponentChain {
     runSyntax(context, node, scope, filename) {
+        if (context === undefined) {
+            return undefined;
+        }
         const children = node.getChildren();
         for (let i = 0; i < children.length; i++) {
             if (context instanceof void_type_1.VoidType || context instanceof basic_1.UnknownType) {
@@ -21704,7 +21707,7 @@ class ComponentChain {
                     }
                 }
                 else {
-                    throw new Error("ComponentChain, not a structure");
+                    throw new Error("ComponentChain, not a structure, " + (context === null || context === void 0 ? void 0 : context.constructor.name));
                 }
             }
         }
@@ -21727,7 +21730,7 @@ exports.ComponentChain = ComponentChain;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentCompare = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 class ComponentCompare {
     runSyntax(node, scope, filename, type) {
@@ -21735,23 +21738,7 @@ class ComponentCompare {
         if (chain === undefined) {
             throw new Error("ComponentCompare, chain not found");
         }
-        // todo, handle deep chain
-        if (chain.getChildren().length === 1
-            && type !== undefined
-            && !(type instanceof basic_1.VoidType)
-            && !(type instanceof basic_1.UnknownType)
-            && !(type instanceof basic_1.AnyType)) {
-            const fieldName = chain.concatTokens();
-            if (fieldName.toLowerCase() !== "table_line") {
-                if (!(type instanceof basic_1.StructureType)) {
-                    throw new Error("ComponentCompare, source not structured");
-                }
-                if (type.getComponentByName(fieldName) === undefined) {
-                    throw new Error("Component \"" + fieldName + "\" not part of structure");
-                }
-                // todo, check type compatibility
-            }
-        }
+        new component_chain_1.ComponentChain().runSyntax(type, chain, scope, filename);
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
@@ -26571,12 +26558,14 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const component_compare_1 = __webpack_require__(/*! ../expressions/component_compare */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_compare.js");
 const component_cond_1 = __webpack_require__(/*! ../expressions/component_cond */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_cond.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class DeleteInternal {
     runSyntax(node, scope, filename) {
         var _a;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        let targetType = undefined;
         const target = node.findDirectExpression(Expressions.Target);
         if (target) {
             let tabl = undefined;
@@ -26588,14 +26577,17 @@ class DeleteInternal {
                 }
             }
             if (tabl === undefined) {
-                new target_1.Target().runSyntax(target, scope, filename);
+                targetType = new target_1.Target().runSyntax(target, scope, filename);
+                if (targetType instanceof basic_1.TableType) {
+                    targetType = targetType.getRowType();
+                }
             }
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
-            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
+            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename, targetType);
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            new component_cond_1.ComponentCond().runSyntax(t, scope, filename);
+            new component_cond_1.ComponentCond().runSyntax(t, scope, filename, targetType);
         }
     }
 }
@@ -33372,8 +33364,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.StructureType = void 0;
 const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js");
 class StructureType extends _abstract_type_1.AbstractType {
-    constructor(components, qualifiedName) {
-        super({ qualifiedName: qualifiedName });
+    constructor(components, qualifiedName, ddicName) {
+        super({
+            qualifiedName: qualifiedName,
+            ddicName: ddicName,
+        });
         if (components.length === 0) {
             throw new Error("Structure does not contain any components");
         }
@@ -37593,7 +37588,8 @@ exports.MemoryFile = MemoryFile;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.RuleTag = void 0;
 const issue_1 = __webpack_require__(/*! ./issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 Object.defineProperty(exports, "Issue", ({ enumerable: true, get: function () { return issue_1.Issue; } }));
 const config_1 = __webpack_require__(/*! ./config */ "./node_modules/@abaplint/core/build/src/config.js");
@@ -37689,6 +37685,8 @@ const rules_runner_1 = __webpack_require__(/*! ./rules_runner */ "./node_modules
 Object.defineProperty(exports, "RulesRunner", ({ enumerable: true, get: function () { return rules_runner_1.RulesRunner; } }));
 const _irule_1 = __webpack_require__(/*! ./rules/_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 Object.defineProperty(exports, "RuleTag", ({ enumerable: true, get: function () { return _irule_1.RuleTag; } }));
+const cyclomatic_complexity_stats_1 = __webpack_require__(/*! ./utils/cyclomatic_complexity_stats */ "./node_modules/@abaplint/core/build/src/utils/cyclomatic_complexity_stats.js");
+Object.defineProperty(exports, "CyclomaticComplexityStats", ({ enumerable: true, get: function () { return cyclomatic_complexity_stats_1.CyclomaticComplexityStats; } }));
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -44897,7 +44895,7 @@ class Table extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Table/Structure " + this.getName() + " does not contain any components");
         }
         reg.getDDICReferences().setUsing(this, references);
-        return new Types.StructureType(components, this.getName());
+        return new Types.StructureType(components, this.getName(), this.getName());
     }
     getTableCategory() {
         var _a;
@@ -45703,7 +45701,6 @@ exports.Position = Position;
 class VirtualPosition extends Position {
     constructor(virtual, row, col) {
         super(virtual.getRow(), virtual.getCol());
-        //    this.virtual = virtual;
         this.vrow = row;
         this.vcol = col;
     }
@@ -45711,7 +45708,8 @@ class VirtualPosition extends Position {
         if (!(p instanceof VirtualPosition)) {
             return false;
         }
-        return super.equals(this) && this.vrow === p.vrow && this.vcol === p.vcol;
+        const casted = p;
+        return super.equals(this) && this.vrow === casted.vrow && this.vcol === casted.vcol;
     }
 }
 exports.VirtualPosition = VirtualPosition;
@@ -46210,7 +46208,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.38";
+        return "2.95.41";
     }
     getDDICReferences() {
         return this.references;
@@ -50772,6 +50770,7 @@ const include_graph_1 = __webpack_require__(/*! ../utils/include_graph */ "./nod
 const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const _builtin_1 = __webpack_require__(/*! ../abap/5_syntax/_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
 const _scope_type_1 = __webpack_require__(/*! ../abap/5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
+const statements_1 = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -51177,7 +51176,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceLineFunctions(high, lowFile, highSyntax);
+        found = this.replaceLineFunctions(high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -53218,7 +53217,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceLineFunctions(node, lowFile, highSyntax) {
+    replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
@@ -53253,12 +53252,30 @@ ${indentation}    output = ${topTarget}.`;
                     indentation + `READ TABLE ${tableName} ${condition}TRANSPORTING NO FIELDS.\n` +
                     indentation + uniqueName + ` = ${sy}.\n` +
                     indentation;
-                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+                let insertAt = node.getFirstToken().getStart();
+                if (node.get() instanceof statements_1.ElseIf) {
+                    // assumption: no side effects in IF conditions
+                    insertAt = this.findStartOfIf(node, highFile);
+                    if (insertAt === undefined) {
+                        continue;
+                    }
+                }
+                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, insertAt, code);
                 const start = expression.getFirstToken().getStart();
                 const end = expression.getLastToken().getEnd();
                 const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + (func === "LINE_EXISTS" ? " = 0" : ""));
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-                return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
+                return issue_1.Issue.atToken(lowFile, token, "Replace line function", this.getMetadata().key, this.conf.severity, fix);
+            }
+        }
+        return undefined;
+    }
+    findStartOfIf(node, highFile) {
+        var _a;
+        const structure = highFile.getStructure();
+        for (const c of (structure === null || structure === void 0 ? void 0 : structure.findAllStructuresRecursive(Structures.If)) || []) {
+            if (((_a = c.findDirectStructure(Structures.ElseIf)) === null || _a === void 0 ? void 0 : _a.getFirstStatement()) === node) {
+                return c.getFirstToken().getStart();
             }
         }
         return undefined;
@@ -73994,7 +74011,7 @@ class PerformTranspiler {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler FormName not found");`);
         }
         // todo, parameters
-        if (node.concatTokens().includes(" IN PROGRAM ")) {
+        if (node.concatTokens().toUpperCase().includes(" IN PROGRAM ")) {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler IN PROGRAM, transpiler todo");`);
         }
         return new chunk_1.Chunk("await " + formName.concatTokens() + "();");
@@ -76748,6 +76765,12 @@ class TranspileTypes {
             if (type.getQualifiedName() !== undefined) {
                 extra += ", \"" + type.getQualifiedName() + "\"";
             }
+            else {
+                extra += ", undefined";
+            }
+            if (type.getDDICName() !== undefined) {
+                extra += ", \"" + type.getQualifiedName() + "\"";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.CLikeType
             || type instanceof abaplint.BasicTypes.CSequenceType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.29",
+  "version": "2.5.31",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,13 +25,13 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.29",
+    "@abaplint/transpiler": "^2.5.31",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.38",
+    "@abaplint/core": "^2.95.41",
     "progress": "^2.0.3",
-    "webpack": "^5.76.0",
+    "webpack": "^5.76.1",
     "webpack-cli": "^5.0.1",
     "typescript": "=4.8.4"
   }