@abaplint/transpiler-cli 2.5.75 → 2.5.77

package/build/bundle.js

@@ -8581,7 +8581,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class CallFunction {
     getMatcher() {
-        const starting = (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2);
+        const starting = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2));
         const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
@@ -19434,6 +19434,18 @@ class CurrentScope {
         (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().references.push({ position, resolved: referencing, referenceType: type, extra });
     }
     ///////////////////////////
+    findFunctionModule(name) {
+        if (name === undefined) {
+            return undefined;
+        }
+        for (const fugr of this.reg.getObjectsByType("FUGR")) {
+            const func = fugr.getModule(name);
+            if (func !== undefined) {
+                return func;
+            }
+        }
+        return undefined;
+    }
     findObjectDefinition(name) {
         if (name === undefined) {
             return undefined;
@@ -25598,6 +25610,7 @@ const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_module
 const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
 const field_chain_1 = __webpack_require__(/*! ../expressions/field_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/field_chain.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class CallFunction {
     runSyntax(node, scope, filename) {
         // todo, lots of work here, similar to receive.ts
@@ -25606,6 +25619,13 @@ class CallFunction {
         if (chain) {
             new field_chain_1.FieldChain().runSyntax(chain, scope, filename, _reference_1.ReferenceType.DataReadReference);
         }
+        else if (scope.getVersion() === version_1.Version.Cloud
+            && node.findDirectExpression(Expressions.Destination) === undefined) {
+            const functionName = name === null || name === void 0 ? void 0 : name.concatTokens().replace(/'/, "");
+            if (scope.findFunctionModule(functionName) === undefined) {
+                throw new Error(`Function module "${functionName}" not found/released`);
+            }
+        }
         // just recurse
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
@@ -39166,10 +39186,15 @@ class LanguageServer {
         }
         const text = new pretty_printer_1.PrettyPrinter(file, this.reg.getConfig()).run();
         const rows = file.getRawRows();
-        return [{
-                range: LServer.Range.create(0, 0, rows.length, rows[rows.length - 1].length + 1),
-                newText: text,
-            }];
+        if (text === file.getRaw()) {
+            return [];
+        }
+        else {
+            return [{
+                    range: LServer.Range.create(0, 0, rows.length, rows[rows.length - 1].length + 1),
+                    newText: text,
+                }];
+        }
     }
     // https://microsoft.github.io/language-server-protocol/specifications/specification-3-14/#textDocument_publishDiagnostics
     diagnostics(textDocument) {
@@ -46079,7 +46104,6 @@ exports.PrettyPrinter = void 0;
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const fix_keyword_case_1 = __webpack_require__(/*! ./fix_keyword_case */ "./node_modules/@abaplint/core/build/src/pretty_printer/fix_keyword_case.js");
 const indent_1 = __webpack_require__(/*! ./indent */ "./node_modules/@abaplint/core/build/src/pretty_printer/indent.js");
-const remove_sequential_blanks_1 = __webpack_require__(/*! ./remove_sequential_blanks */ "./node_modules/@abaplint/core/build/src/pretty_printer/remove_sequential_blanks.js");
 const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
 const indentation_1 = __webpack_require__(/*! ../rules/indentation */ "./node_modules/@abaplint/core/build/src/rules/indentation.js");
 class PrettyPrinter {
@@ -46109,8 +46133,6 @@ class PrettyPrinter {
         }
         const indentation = new indent_1.Indent(this.options);
         this.result = indentation.execute(this.file, this.result);
-        const removeBlanks = new remove_sequential_blanks_1.RemoveSequentialBlanks(this.config);
-        this.result = removeBlanks.execute(this.file, this.result);
         return this.result;
     }
 }
@@ -46119,66 +46141,6 @@ exports.PrettyPrinter = PrettyPrinter;
 
 /***/ }),
 
-/***/ "./node_modules/@abaplint/core/build/src/pretty_printer/remove_sequential_blanks.js":
-/*!******************************************************************************************!*\
-  !*** ./node_modules/@abaplint/core/build/src/pretty_printer/remove_sequential_blanks.js ***!
-  \******************************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RemoveSequentialBlanks = void 0;
-const rules_1 = __webpack_require__(/*! ../rules */ "./node_modules/@abaplint/core/build/src/rules/index.js");
-class RemoveSequentialBlanks {
-    constructor(config) {
-        this.config = config;
-    }
-    execute(file, modified) {
-        const sequentialBlankConfig = this.getSequentialBlankConfig();
-        if (sequentialBlankConfig) {
-            return this.withoutSequentialBlanks(file, modified, sequentialBlankConfig.lines);
-        }
-        return modified;
-    }
-    withoutSequentialBlanks(file, modified, threshold) {
-        const rows = file.getRawRows();
-        let blanks = 0;
-        const rowsToRemove = [];
-        const newBlankCount = (current, row) => {
-            return rules_1.SequentialBlank.isBlankOrWhitespace(row) ? current + 1 : 0;
-        };
-        for (let i = 0; i < rows.length; i++) {
-            blanks = newBlankCount(blanks, rows[i]);
-            if (blanks === threshold) {
-                // count additional blanks
-                for (let j = i; j < rows.length; j++) {
-                    if (rules_1.SequentialBlank.isBlankOrWhitespace(rows[j])) {
-                        rowsToRemove.push(j);
-                    }
-                    else {
-                        break;
-                    }
-                }
-            }
-        }
-        return this.removeRows(modified.split("\n"), rowsToRemove);
-    }
-    removeRows(lines, rowsToRemove) {
-        const withoutRemoved = lines.filter((_, idx) => {
-            return rowsToRemove.indexOf(idx) === -1;
-        });
-        return withoutRemoved.join("\n").trim();
-    }
-    getSequentialBlankConfig() {
-        return this.config.readByRule(new rules_1.SequentialBlank().getMetadata().key);
-    }
-}
-exports.RemoveSequentialBlanks = RemoveSequentialBlanks;
-//# sourceMappingURL=remove_sequential_blanks.js.map
-
-/***/ }),
-
 /***/ "./node_modules/@abaplint/core/build/src/registry.js":
 /*!***********************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/registry.js ***!
@@ -46251,7 +46213,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.4";
+        return "2.97.5";
     }
     getDDICReferences() {
         return this.references;
@@ -71307,7 +71269,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 class CallTranspiler {
     transpile(node, traversal) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const chain = node.findDirectExpression(abaplint.Expressions.MethodCallChain);
         if (chain) {
             let pre = "";
@@ -71317,34 +71279,12 @@ class CallTranspiler {
                 pre = traversal.traverse(receiving).getCode() + ".set(";
                 post = ")";
             }
-            const exceptions = node.findFirstExpression(abaplint.Expressions.ParameterListExceptions);
-            if (exceptions) {
-                pre = "try {\n" + pre;
-            }
             post += ";";
+            const exceptions = node.findFirstExpression(abaplint.Expressions.ParameterListExceptions);
             if (exceptions) {
-                post += `\nabap.builtin.sy.get().subrc.set(0);
-} catch (e) {
-if (e.classic) {
-  switch (e.classic.toUpperCase()) {\n`;
-                for (const e of exceptions.findAllExpressions(abaplint.Expressions.ParameterException)) {
-                    const name = e.getFirstToken().getStr().toUpperCase();
-                    const value = (_c = e.findFirstExpression(abaplint.Expressions.SimpleName)) === null || _c === void 0 ? void 0 : _c.getFirstToken().getStr().toUpperCase();
-                    if (value === undefined) {
-                        continue;
-                    }
-                    if (name === "OTHERS") {
-                        post += `default: abap.builtin.sy.get().subrc.set(${value}); break;\n`;
-                    }
-                    else {
-                        post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
-                    }
-                }
-                post += `  }
-} else {
-  throw e;
-}
-}`;
+                const build = this.buildExceptions(exceptions);
+                pre = build.pre + pre;
+                post += build.post;
             }
             const chainChunk = traversal.traverse(chain);
             let chainCode = chainChunk.getCode();
@@ -71360,7 +71300,7 @@ if (e.classic) {
         const methodSource = node.findDirectExpression(abaplint.Expressions.MethodSource);
         if (methodSource) {
             let body = "";
-            const nameToken = (_d = methodSource.getLastChild()) === null || _d === void 0 ? void 0 : _d.getFirstToken();
+            const nameToken = (_c = methodSource.getLastChild()) === null || _c === void 0 ? void 0 : _c.getFirstToken();
             const m = nameToken ? traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken)) : undefined;
             const methodCallBody = node.findDirectExpression(abaplint.Expressions.MethodCallBody);
             if (methodCallBody) {
@@ -71368,12 +71308,18 @@ if (e.classic) {
             }
             let pre = "";
             let post = "";
-            const receiving = (_e = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _e === void 0 ? void 0 : _e.findExpressionAfterToken("RECEIVING");
+            const receiving = (_d = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _d === void 0 ? void 0 : _d.findExpressionAfterToken("RECEIVING");
             if (receiving) {
                 const target = traversal.traverse(receiving.findDirectExpression(abaplint.Expressions.Target));
                 pre = target.getCode() + ".set(";
                 post = ")";
             }
+            const exceptions = node.findFirstExpression(abaplint.Expressions.ParameterListExceptions);
+            if (exceptions) {
+                const build = this.buildExceptions(exceptions);
+                pre = build.pre + pre;
+                post += build.post;
+            }
             let ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal).getCode();
             if (ms === "await super.get().constructor") {
                 // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
@@ -71386,6 +71332,35 @@ if (e.classic) {
         }
         throw new Error("CallTranspiler, todo");
     }
+    buildExceptions(node) {
+        var _a;
+        let pre = "";
+        let post = "";
+        pre = "try {\n" + pre;
+        post += `\nabap.builtin.sy.get().subrc.set(0);
+} catch (e) {
+if (e.classic) {
+  switch (e.classic.toUpperCase()) {\n`;
+        for (const e of node.findAllExpressions(abaplint.Expressions.ParameterException)) {
+            const name = e.getFirstToken().getStr().toUpperCase();
+            const value = (_a = e.findFirstExpression(abaplint.Expressions.SimpleName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase();
+            if (value === undefined) {
+                continue;
+            }
+            if (name === "OTHERS") {
+                post += `default: abap.builtin.sy.get().subrc.set(${value}); break;\n`;
+            }
+            else {
+                post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
+            }
+        }
+        post += `  }
+} else {
+  throw e;
+}
+}`;
+        return { pre, post };
+    }
 }
 exports.CallTranspiler = CallTranspiler;
 //# sourceMappingURL=call.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.75",
+  "version": "2.5.77",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,14 +25,14 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.75",
+    "@abaplint/transpiler": "^2.5.77",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.11",
-    "@abaplint/core": "^2.97.4",
+    "@abaplint/core": "^2.97.5",
     "progress": "^2.0.3",
-    "webpack": "^5.77.0",
+    "webpack": "^5.78.0",
     "webpack-cli": "^5.0.1",
     "typescript": "^5.0.3"
   }