@abaplint/transpiler-cli 2.5.30 → 2.5.32

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();
                 }
@@ -33364,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");
         }
@@ -37585,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");
@@ -37681,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
 
 /***/ }),
@@ -44889,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;
@@ -45695,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;
     }
@@ -45703,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;
@@ -46202,7 +46208,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.39";
+        return "2.95.42";
     }
     getDDICReferences() {
         return this.references;
@@ -50764,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 {
@@ -50920,6 +50927,19 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         }
         return this.graph.listMainForInclude(filename);
     }
+    containsError(highObj) {
+        for (const file of highObj.getABAPFiles()) {
+            for (const statement of file.getStatements()) {
+                if (statement.get() instanceof _statement_1.Unknown) {
+                    return true; // contains parser errors
+                }
+            }
+            if (file.getStructure() === undefined) {
+                return true;
+            }
+        }
+        return false;
+    }
     run(lowObj) {
         var _a;
         const ret = [];
@@ -50936,6 +50956,9 @@ Only one transformation is applied to a statement at a time, so multiple steps m
             return ret;
         }
         let highSyntaxObj = highObj;
+        if (this.containsError(highObj)) {
+            return ret;
+        }
         // for includes do the syntax check via a main program
         if (lowObj instanceof objects_1.Program && lowObj.isInclude()) {
             const mains = this.listMainForInclude((_a = lowObj.getMainABAPFile()) === null || _a === void 0 ? void 0 : _a.getFilename());
@@ -51169,7 +51192,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;
         }
@@ -53133,6 +53156,11 @@ ${indentation}    output = ${topTarget}.`;
             if (chain === undefined) {
                 continue;
             }
+            const concat = chain.concatTokens().toUpperCase();
+            if (concat.startsWith("LINE_EXISTS( ") || concat.startsWith("LINE_INDEX( ")) {
+                // these are handled separately
+                continue;
+            }
             let predicate = false;
             const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
             for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
@@ -53210,7 +53238,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) || []) {
@@ -53245,12 +53273,31 @@ ${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) {
+        const structure = highFile.getStructure();
+        for (const c of (structure === null || structure === void 0 ? void 0 : structure.findAllStructuresRecursive(Structures.If)) || []) {
+            for (const ei of c.findDirectStructures(Structures.ElseIf)) {
+                if (ei.getFirstStatement() === node) {
+                    return c.getFirstToken().getStart();
+                }
             }
         }
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.30",
+  "version": "2.5.32",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.30",
+    "@abaplint/transpiler": "^2.5.32",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.39",
+    "@abaplint/core": "^2.95.42",
     "progress": "^2.0.3",
     "webpack": "^5.76.1",
     "webpack-cli": "^5.0.1",