@abaplint/transpiler-cli 2.6.42 → 2.6.44

package/build/bundle.js

@@ -21625,7 +21625,23 @@ class BasicTypes {
         }
         const constant = val.findFirstExpression(Expressions.Constant);
         if (constant) {
-            return constant.concatTokens();
+            const conc = val.findFirstExpression(Expressions.ConcatenatedConstant);
+            if (conc) {
+                const first = conc.getFirstToken().getStr().substring(0, 1);
+                let result = "";
+                for (const token of conc.getAllTokens()) {
+                    if (token.getStr() === "&") {
+                        continue;
+                    }
+                    else {
+                        result += token.getStr().substring(1, token.getStr().length - 1);
+                    }
+                }
+                return first + result + first;
+            }
+            else {
+                return constant.concatTokens();
+            }
         }
         const chain = val.findFirstExpression(Expressions.SimpleFieldChain);
         if (chain) {
@@ -29756,7 +29772,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Tables = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
-const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const unknown_type_1 = __webpack_require__(/*! ../../types/basic/unknown_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/unknown_type.js");
 class Tables {
     runSyntax(node, scope, filename) {
         var _a, _b;
@@ -29768,13 +29784,15 @@ class Tables {
         if (name.startsWith("*")) {
             name = name.substr(1);
         }
+        // lookupTableOrView will also give Unknown and Void
         const found = (_b = scope.getDDIC()) === null || _b === void 0 ? void 0 : _b.lookupTableOrView(name);
         if (found) {
             scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found.object, filename: filename, token: nameToken });
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, found.type));
             return;
         }
-        scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new basic_1.UnknownType("Tables, fallback")));
+        // this should never happen,
+        scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new unknown_type_1.UnknownType("Tables, fallback")));
     }
 }
 exports.Tables = Tables;
@@ -38419,21 +38437,27 @@ class LSPLookup {
             const hover = "Method Definition \"" + method.getName() + "\"";
             return { hover, definition: found, definitionId: method, scope: bottomScope };
         }
+        let hoverValue = "";
+        const ddicRefs = reg.getDDICReferences().listByFilename(cursor.identifier.getFilename(), cursor.identifier.getStart().getRow());
+        for (const d of ddicRefs) {
+            if (d.object && d.token && d.token.getStart().equals(cursor.identifier.getStart())) {
+                hoverValue += `DDIC: ${d.object.getType()} ${d.object.getName()}`;
+            }
+        }
         const variable = bottomScope.findVariable(cursor.token.getStr());
         if (variable !== undefined && variable.getStart().equals(cursor.token.getStart())) {
             const hover = "Variable Definition\n\n" + this.dumpType(variable);
+            if (hoverValue !== "") {
+                hoverValue = hover + "\n_________________\n" + hoverValue;
+            }
+            else {
+                hoverValue = hover;
+            }
             let location = undefined;
             if (variable.getMeta().includes("built-in" /* IdentifierMeta.BuiltIn */) === false) {
                 location = _lsp_utils_1.LSPUtils.identiferToLocation(variable);
             }
-            return { hover, definition: location, implementation: location, definitionId: variable, scope: bottomScope };
-        }
-        let hoverValue = "";
-        const ddicRefs = reg.getDDICReferences().listByFilename(cursor.identifier.getFilename(), cursor.identifier.getStart().getRow());
-        for (const d of ddicRefs) {
-            if (d.object && d.token && d.token.getStart().equals(cursor.identifier.getStart())) {
-                hoverValue += `DDIC: ${d.object.getType()} ${d.object.getName()}`;
-            }
+            return { hover: hoverValue, definition: location, implementation: location, definitionId: variable, scope: bottomScope };
         }
         const refs = this.searchReferences(bottomScope, cursor.token);
         if (refs.length > 0) {
@@ -44021,10 +44045,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Program = void 0;
 const _abap_object_1 = __webpack_require__(/*! ./_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 class Program extends _abap_object_1.ABAPObject {
-    constructor() {
-        super(...arguments);
-        this.isIncludeValue = undefined;
-    }
     getType() {
         return "PROG";
     }
@@ -44046,15 +44066,25 @@ class Program extends _abap_object_1.ABAPObject {
         };
     }
     setDirty() {
-        this.isIncludeValue = undefined;
+        this.parsedXML = undefined;
         super.setDirty();
     }
     isInclude() {
-        if (this.isIncludeValue === undefined) {
+        this.parseXML();
+        return this.parsedXML.isInclude;
+    }
+    isModulePool() {
+        this.parseXML();
+        return this.parsedXML.isModulePool;
+    }
+    parseXML() {
+        if (this.parsedXML === undefined) {
             const file = this.getXMLFile();
-            this.isIncludeValue = file ? file.getRaw().includes("<SUBC>I</SUBC>") : false;
+            this.parsedXML = {
+                isInclude: file ? file.getRaw().includes("<SUBC>I</SUBC>") : false,
+                isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,
+            };
         }
-        return this.isIncludeValue;
     }
 }
 exports.Program = Program;
@@ -46629,7 +46659,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.99.6";
+        return "2.99.9";
     }
     getDDICReferences() {
         return this.references;
@@ -57942,7 +57972,9 @@ class MainFileContents {
         if (stru === undefined) {
             return [];
         }
-        if (obj instanceof Objects.Program && obj.isInclude() === false) {
+        if (obj instanceof Objects.Program
+            && obj.isInclude() === false
+            && obj.isModulePool() === false) {
             let count = 0;
             let first = main.getStatements()[count];
             while (first !== undefined && first.get() instanceof _statement_1.Comment) {
@@ -63954,7 +63986,7 @@ https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abenopensql_strict_mo
 Also see separate rule sql_escape_host_variables
 
 Activates from v750 and up`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix],
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Quickfix],
         };
     }
     getConfig() {
@@ -63997,7 +64029,6 @@ Activates from v750 and up`,
                 const message = "INTO/APPENDING must be last in strict SQL";
                 const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
-                break;
             }
         }
         return issues;
@@ -68700,14 +68731,14 @@ class ConstantTranspiler {
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
             else if (res.startsWith("`") && this.addGet === false) {
-                const code = "new abap.types.String().set(" + this.escape(res) + ")";
+                const code = "new abap.types.String().set(" + ConstantTranspiler.escape(res) + ")";
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
             else {
                 if (res.startsWith("'")) {
                     res = "'" + res.substring(1, res.length - 1).trimEnd() + "'";
                 }
-                const code = this.escape(res);
+                const code = ConstantTranspiler.escape(res);
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
         }
@@ -68728,7 +68759,7 @@ class ConstantTranspiler {
                     chunk.append(code, node, traversal);
                 }
                 else if (res.startsWith("`") && this.addGet === false) {
-                    const code = "new abap.types.String().set(" + this.escape(res) + ")";
+                    const code = "new abap.types.String().set(" + ConstantTranspiler.escape(res) + ")";
                     chunk.append(code, node, traversal);
                 }
             }
@@ -68744,10 +68775,10 @@ class ConstantTranspiler {
             // note: Characters cannot have length = zero, 1 is minimum
             length = 1;
         }
-        const code = "new abap.types.Character(" + length + ").set(" + this.escape(res) + ")";
+        const code = "new abap.types.Character(" + length + ").set(" + ConstantTranspiler.escape(res) + ")";
         return code;
     }
-    escape(str) {
+    static escape(str) {
         str = str.replace(/\\/g, "\\\\");
         if (str.startsWith("'")) {
             const reg = new RegExp(/(.+)''(.+)/g);
@@ -71872,6 +71903,27 @@ exports.AtTranspiler = AtTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js":
+/*!***************************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js ***!
+  \***************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AtSelectionScreenTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class AtSelectionScreenTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("AtSelectionScreen, not supported, transpiler");`);
+    }
+}
+exports.AtSelectionScreenTranspiler = AtSelectionScreenTranspiler;
+//# sourceMappingURL=at_selection_screen.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js":
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js ***!
@@ -72900,7 +72952,13 @@ class DataTranspiler {
         if (found === undefined) {
             throw new Error("DataTranspiler, var not found, \"" + token.getStr() + "\"");
         }
-        const value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        let value = "";
+        if (found.getValue() !== undefined && node.concatTokens().includes(" & ")) {
+            value = "\n" + traversal.setValues(found, found.getName());
+        }
+        else {
+            value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        }
         const ret = new chunk_1.Chunk()
             .appendString("let ")
             .append(found.getName().toLowerCase(), token, traversal)
@@ -72918,7 +72976,7 @@ class DataTranspiler {
                 int = val.findFirstExpression(abaplint.Expressions.ConstantString);
             }
             if (int) {
-                const escaped = new constant_1.ConstantTranspiler().escape(int.concatTokens());
+                const escaped = constant_1.ConstantTranspiler.escape(int.concatTokens());
                 value = "\n" + name + ".set(" + escaped + ");";
             }
             else if (val.getChildren()[1].get() instanceof abaplint.Expressions.SimpleFieldChain) {
@@ -74114,6 +74172,7 @@ __exportStar(__webpack_require__(/*! ./add */ "./node_modules/@abaplint/transpil
 __exportStar(__webpack_require__(/*! ./append */ "./node_modules/@abaplint/transpiler/build/src/statements/append.js"), exports);
 __exportStar(__webpack_require__(/*! ./assert */ "./node_modules/@abaplint/transpiler/build/src/statements/assert.js"), exports);
 __exportStar(__webpack_require__(/*! ./assign */ "./node_modules/@abaplint/transpiler/build/src/statements/assign.js"), exports);
+__exportStar(__webpack_require__(/*! ./at_selection_screen */ "./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js"), exports);
 __exportStar(__webpack_require__(/*! ./at */ "./node_modules/@abaplint/transpiler/build/src/statements/at.js"), exports);
 __exportStar(__webpack_require__(/*! ./authority_check */ "./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js"), exports);
 __exportStar(__webpack_require__(/*! ./break_id */ "./node_modules/@abaplint/transpiler/build/src/statements/break_id.js"), exports);
@@ -77560,7 +77619,7 @@ class InterfaceTranspiler {
             const valExpression = constantStatement === null || constantStatement === void 0 ? void 0 : constantStatement.findFirstExpression(abaplint.Expressions.Value);
             if ((valExpression === null || valExpression === void 0 ? void 0 : valExpression.getChildren()[1].get()) instanceof abaplint.Expressions.SimpleFieldChain) {
                 const s = new expressions_1.FieldChainTranspiler().transpile(valExpression.getChildren()[1], traversal, false).getCode();
-                const e = new expressions_1.ConstantTranspiler().escape(s);
+                const e = expressions_1.ConstantTranspiler.escape(s);
                 ret += name + ".set(" + e + ");\n";
                 continue;
             }
@@ -78593,7 +78652,7 @@ class Traversal {
         let ret = "";
         const handle = (val, name) => {
             if (typeof val === "string") {
-                const e = new expressions_1.ConstantTranspiler().escape(val);
+                const e = expressions_1.ConstantTranspiler.escape(val);
                 ret += name + ".set(" + e + ");\n";
             }
             else if (typeof val === "object") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.6.42",
+  "version": "2.6.44",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,15 +25,15 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.42",
+    "@abaplint/transpiler": "^2.6.44",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.0.0",
-    "@abaplint/core": "^2.99.6",
+    "@types/node": "^20.1.2",
+    "@abaplint/core": "^2.99.9",
     "progress": "^2.0.3",
-    "webpack": "^5.82.0",
-    "webpack-cli": "^5.0.2",
+    "webpack": "^5.82.1",
+    "webpack-cli": "^5.1.1",
     "typescript": "^5.0.4"
   }
 }