@abaplint/transpiler 2.11.68 → 2.11.70

package/build/src/expressions/compare.js

@@ -6,7 +6,7 @@ const chunk_1 = require("../chunk");
 class CompareTranspiler {
     transpile(node, traversal) {
         // todo, this is not correct
-        const concat = node.concatTokens().toUpperCase();
+        let concat = node.concatTokens().toUpperCase();
         let pre = concat.startsWith("NOT ") ? "!" : "";
         const sources = node.findDirectExpressionsMulti([core_1.Expressions.Source, core_1.Expressions.SourceFieldSymbolChain, core_1.Expressions.SourceFieldSymbol]);
         if (sources.length === 1) {
@@ -36,7 +36,10 @@ class CompareTranspiler {
                 return new chunk_1.Chunk().appendString("abap.compare.assigned(").appendChunk(s0).appendString(")");
             }
             if (concat.endsWith(" IS SUPPLIED")) {
-                return new chunk_1.Chunk().appendString(pre + "INPUT && INPUT." + concat.replace(" IS SUPPLIED", "").toLowerCase());
+                if (concat.startsWith("NOT ")) {
+                    concat = concat.replace("NOT ", "");
+                }
+                return new chunk_1.Chunk().appendString(pre + "(INPUT && INPUT." + concat.replace(" IS SUPPLIED", "" + ")").toLowerCase());
             }
             else if (concat.endsWith(" IS NOT SUPPLIED")) {
                 return new chunk_1.Chunk().appendString(pre + "INPUT && INPUT." + concat.replace(" IS NOT SUPPLIED", "").toLowerCase() + " === undefined");

package/build/src/expressions/corresponding_body.js

@@ -5,6 +5,8 @@ const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const type_name_or_infer_1 = require("./type_name_or_infer");
 const transpile_types_1 = require("../transpile_types");
+const component_chain_1 = require("./component_chain");
+const unique_identifier_1 = require("../unique_identifier");
 class CorrespondingBodyTranspiler {
     transpile(typ, body, traversal) {
         if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
@@ -13,6 +15,8 @@ class CorrespondingBodyTranspiler {
         const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
         let target = transpile_types_1.TranspileTypes.toType(type);
         let source;
+        const mapping = [];
+        const mappingRow = { componentName: undefined, componentChain: undefined };
         for (const child of body.getChildren()) {
             const c = child.get();
             if (c instanceof core_1.Expressions.Source && child instanceof core_1.Nodes.ExpressionNode) {
@@ -22,12 +26,33 @@ class CorrespondingBodyTranspiler {
                 source = traversal.traverse(child?.findDirectExpression(core_1.Expressions.Source));
                 target = `abap.statements.moveCorresponding(${source.getCode()}, ${target})`;
             }
+            else if (c instanceof core_1.Expressions.CorrespondingBodyMapping && child instanceof core_1.Nodes.ExpressionNode) {
+                for (const cc of child.getChildren()) {
+                    if (cc.get() instanceof core_1.Expressions.ComponentName) {
+                        mappingRow.componentName = cc;
+                    }
+                    else if (cc.get() instanceof core_1.Expressions.ComponentChain) {
+                        mappingRow.componentChain = cc;
+                        mapping.push(mappingRow);
+                    }
+                }
+            }
             else {
-                throw new Error("CorrespondingBodyTranspiler, todo, " + c.constructor.name);
+                throw new Error("CorrespondingBodyTranspiler, todo, " + c.constructor.name + ", " + body.concatTokens());
             }
         }
         const ret = new chunk_1.Chunk();
-        ret.appendString(`abap.statements.moveCorresponding(${source.getCode()}, ${target})`);
+        const id = unique_identifier_1.UniqueIdentifier.get();
+        ret.appendString("(await (async () => {\n");
+        ret.appendString(`const ${id} = ${target};\n`);
+        ret.appendString(`abap.statements.moveCorresponding(${source.getCode()}, ${id});\n`);
+        for (const map of mapping) {
+            const componentName = map.componentName.concatTokens().toLowerCase();
+            const chain = new component_chain_1.ComponentChainTranspiler().transpile(map.componentChain, traversal).getCode();
+            ret.appendString(`${id}.get().${componentName}.set(${source.getCode()}.get().${chain});\n`);
+        }
+        ret.appendString("return " + id + ";\n");
+        ret.appendString("})())");
         return ret;
     }
 }

package/build/src/expressions/filter_body.d.ts

@@ -0,0 +1,6 @@
+import { Nodes } from "@abaplint/core";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class FilterBodyTranspiler {
+    transpile(typ: Nodes.ExpressionNode, body: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/filter_body.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterBodyTranspiler = void 0;
+const core_1 = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const type_name_or_infer_1 = require("./type_name_or_infer");
+const transpile_types_1 = require("../transpile_types");
+const unique_identifier_1 = require("../unique_identifier");
+class FilterBodyTranspiler {
+    transpile(typ, body, traversal) {
+        if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
+            throw new Error("FilterBodyTranspiler, Expected TypeNameOrInfer");
+        }
+        else if (body.findDirectTokenByText("EXCEPT")) {
+            return new chunk_1.Chunk(`(() => { throw new Error("FilterBodyTranspiler EXCEPT in, not supported, transpiler"); })()`);
+        }
+        const source = traversal.traverse(body.findDirectExpression(core_1.Expressions.Source)).getCode();
+        const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
+        const target = transpile_types_1.TranspileTypes.toType(type);
+        const ret = new chunk_1.Chunk();
+        ret.appendString("(await (async () => {\n");
+        let loopWhere = "";
+        const whereNode = body.findDirectExpression(core_1.Expressions.ComponentCond);
+        if (whereNode) {
+            const where = traversal.traverse(whereNode).getCode();
+            loopWhere = `, {"where": async ` + where + `}`;
+        }
+        const id = unique_identifier_1.UniqueIdentifier.get();
+        const loop = unique_identifier_1.UniqueIdentifier.get();
+        ret.appendString(`const ${id} = ${target};\n`);
+        ret.appendString(`for await (const ${loop} of abap.statements.loop(${source}${loopWhere})) {\n`);
+        ret.appendString(`abap.statements.insertInternal({"table": ${id}, "data": ${loop}});\n`);
+        ret.appendString(`}\n`);
+        ret.appendString(`return ${id};\n`);
+        ret.appendString("})())");
+        return ret;
+    }
+}
+exports.FilterBodyTranspiler = FilterBodyTranspiler;
+//# sourceMappingURL=filter_body.js.map

package/build/src/expressions/source.js

@@ -8,6 +8,7 @@ const chunk_1 = require("../chunk");
 const transpile_types_1 = require("../transpile_types");
 const value_body_1 = require("./value_body");
 const corresponding_body_1 = require("./corresponding_body");
+const filter_body_1 = require("./filter_body");
 class SourceTranspiler {
     addGet;
     constructor(addGet = false) {
@@ -99,6 +100,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.SwitchBody) {
                     continue;
                 }
+                else if (c.get() instanceof core_1.Expressions.FilterBody) {
+                    continue;
+                }
                 else {
                     ret.appendString("SourceUnknown$" + c.get().constructor.name);
                 }
@@ -165,6 +169,17 @@ class SourceTranspiler {
                 }
                 ret.appendChunk(new _1.SwitchBodyTranspiler().transpile(typ, switchBody, traversal));
             }
+            else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "FILTER") {
+                const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+                if (typ === undefined) {
+                    throw new Error("TypeNameOrInfer not found in FilterBody");
+                }
+                const filterBody = node.findDirectExpression(core_1.Expressions.FilterBody);
+                if (filterBody === undefined) {
+                    throw new Error("FilterBody not found");
+                }
+                ret.appendChunk(new filter_body_1.FilterBodyTranspiler().transpile(typ, filterBody, traversal));
+            }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "REF") {
                 const infer = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
                 if (infer?.concatTokens() !== "#") {

package/build/src/statements/index.d.ts

@@ -20,6 +20,7 @@ export * from "./class_definition_load";
 export * from "./class_implementation";
 export * from "./class_local_friends";
 export * from "./clear";
+export * from "./static";
 export * from "./close_cursor";
 export * from "./close_dataset";
 export * from "./collect";

package/build/src/statements/index.js

@@ -36,6 +36,7 @@ __exportStar(require("./class_definition_load"), exports);
 __exportStar(require("./class_implementation"), exports);
 __exportStar(require("./class_local_friends"), exports);
 __exportStar(require("./clear"), exports);
+__exportStar(require("./static"), exports);
 __exportStar(require("./close_cursor"), exports);
 __exportStar(require("./close_dataset"), exports);
 __exportStar(require("./collect"), exports);

package/build/src/statements/static.d.ts

@@ -0,0 +1,7 @@
+import * as abaplint from "@abaplint/core";
+import { IStatementTranspiler } from "./_statement_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class StaticTranspiler implements IStatementTranspiler {
+    transpile(_node: abaplint.Nodes.StatementNode, _traversal: Traversal): Chunk;
+}

package/build/src/statements/static.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StaticTranspiler = void 0;
+const chunk_1 = require("../chunk");
+class StaticTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("Statics, not supported, transpiler");`);
+    }
+}
+exports.StaticTranspiler = StaticTranspiler;
+//# sourceMappingURL=static.js.map

package/build/src/validation.js

@@ -19,7 +19,7 @@ exports.config = {
             "communication": true,
             "systemCall": true,
             "break": false,
-            "statics": true,
+            "statics": false,
             "endselect": false,
             "defaultKey": false,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.68",
+  "version": "2.11.70",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.193",
+    "@abaplint/core": "^2.113.195",
     "source-map": "^0.7.6"
   },
   "devDependencies": {