@abaplint/transpiler 2.11.69 → 2.11.71

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.js

@@ -12,7 +12,7 @@ class FilterBodyTranspiler {
             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");`);
+            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);

package/build/src/validation.js

@@ -97,7 +97,6 @@ exports.config = {
         "begin_end_names": true,
         "check_syntax": true,
         "form_no_dash": true,
-        "omit_preceding_zeros": true,
         "obsolete_statement": {
             "setExtended": true,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.69",
+  "version": "2.11.71",
   "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.194",
+    "@abaplint/core": "^2.113.195",
     "source-map": "^0.7.6"
   },
   "devDependencies": {