@abaplint/transpiler 1.7.26 → 1.7.30

package/build/src/database_setup.js

@@ -66,8 +66,14 @@ class DatabaseSetup {
         if (type instanceof abaplint.BasicTypes.CharacterType) {
             return `NCHAR(${type.getLength()})`;
         }
+        else if (type instanceof abaplint.BasicTypes.StringType) {
+            return `TEXT`;
+        }
+        else if (type instanceof abaplint.BasicTypes.IntegerType) {
+            return `INT`;
+        }
         else {
-            throw "transpiler todo, database_setup";
+            throw "database_setup, todo toType handle: " + type.constructor.name;
         }
     }
 }

package/build/src/expressions/call_transformation_parameters.js

@@ -18,7 +18,7 @@ class CallTransformationParametersTranspiler {
                     }
                     res.appendString(c.concatTokens());
                 }
-                else if (c.get() instanceof abaplint.Expressions.Source) {
+                else if (c.get() instanceof abaplint.Expressions.SimpleSource3) {
                     res.appendChunk(traversal.traverse(c));
                 }
                 else if (c.concatTokens() === "=") {

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

@@ -19,8 +19,11 @@ export * from "./field_offset";
 export * from "./field_symbol";
 export * from "./function_exporting";
 export * from "./function_parameters";
+export * from "./method_call_body";
 export * from "./method_call_chain";
+export * from "./method_call_param";
 export * from "./method_call";
+export * from "./method_parameters";
 export * from "./method_source";
 export * from "./parameter_list_s";
 export * from "./parameter_list_t";

package/build/src/expressions/index.js

@@ -31,8 +31,11 @@ __exportStar(require("./field_offset"), exports);
 __exportStar(require("./field_symbol"), exports);
 __exportStar(require("./function_exporting"), exports);
 __exportStar(require("./function_parameters"), exports);
+__exportStar(require("./method_call_body"), exports);
 __exportStar(require("./method_call_chain"), exports);
+__exportStar(require("./method_call_param"), exports);
 __exportStar(require("./method_call"), exports);
+__exportStar(require("./method_parameters"), exports);
 __exportStar(require("./method_source"), exports);
 __exportStar(require("./parameter_list_s"), exports);
 __exportStar(require("./parameter_list_t"), exports);

package/build/src/expressions/method_call.js

@@ -28,7 +28,7 @@ class MethodCallTranspiler {
         }
         const ret = new chunk_1.Chunk();
         ret.append(name.replace("~", "$"), nameToken, traversal);
-        ret.appendChunk(new method_call_param_1.MethodCallParam(m === null || m === void 0 ? void 0 : m.def).transpile(step, traversal));
+        ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(m === null || m === void 0 ? void 0 : m.def).transpile(step, traversal));
         ret.appendString(")");
         return ret;
     }

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

@@ -0,0 +1,7 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class MethodCallBodyTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/method_call_body.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MethodCallBodyTranspiler = void 0;
+const chunk_1 = require("../chunk");
+class MethodCallBodyTranspiler {
+    transpile(node, traversal) {
+        const ret = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            ret.appendChunk(traversal.traverse(c));
+        }
+        return ret;
+    }
+}
+exports.MethodCallBodyTranspiler = MethodCallBodyTranspiler;
+//# sourceMappingURL=method_call_body.js.map

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

@@ -3,7 +3,7 @@ import { Nodes } from "@abaplint/core";
 import { Chunk } from "../chunk";
 import { Traversal } from "../traversal";
 import { IExpressionTranspiler } from "./_expression_transpiler";
-export declare class MethodCallParam implements IExpressionTranspiler {
+export declare class MethodCallParamTranspiler implements IExpressionTranspiler {
     private readonly m;
     constructor(m?: abaplint.Types.MethodDefinition);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;

package/build/src/expressions/method_call_param.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MethodCallParam = void 0;
+exports.MethodCallParamTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
-class MethodCallParam {
+class MethodCallParamTranspiler {
     constructor(m) {
         this.m = m;
     }
@@ -46,5 +46,5 @@ class MethodCallParam {
         return new chunk_1.Chunk(name);
     }
 }
-exports.MethodCallParam = MethodCallParam;
+exports.MethodCallParamTranspiler = MethodCallParamTranspiler;
 //# sourceMappingURL=method_call_param.js.map

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

@@ -0,0 +1,7 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class MethodParametersTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/method_parameters.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MethodParametersTranspiler = void 0;
+const core_1 = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+class MethodParametersTranspiler {
+    transpile(node, traversal) {
+        const ret = new chunk_1.Chunk("{");
+        for (const s of node.findAllExpressions(core_1.Expressions.ParameterS)) {
+            if (ret.getCode() !== "{") {
+                ret.appendString(",");
+            }
+            ret.appendChunk(traversal.traverse(s));
+        }
+        const receiving = node.findExpressionAfterToken("RECEIVING");
+        for (const t of node.findAllExpressions(core_1.Expressions.ParameterT)) {
+            if (t === receiving) {
+                continue;
+            }
+            if (ret.getCode() !== "{") {
+                ret.appendString(",");
+            }
+            ret.appendChunk(traversal.traverse(t));
+        }
+        ret.appendString("}");
+        if (ret.getCode() === "{}") {
+            return new chunk_1.Chunk();
+        }
+        else {
+            return ret;
+        }
+    }
+}
+exports.MethodParametersTranspiler = MethodParametersTranspiler;
+//# sourceMappingURL=method_parameters.js.map

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

@@ -3,5 +3,7 @@ import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class MethodSourceTranspiler implements IExpressionTranspiler {
+    private readonly prepend;
+    constructor(prepend?: string);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/method_source.js

@@ -4,6 +4,9 @@ exports.MethodSourceTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class MethodSourceTranspiler {
+    constructor(prepend) {
+        this.prepend = (prepend || "") + "await ";
+    }
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         const children = node.getChildren();
@@ -24,6 +27,9 @@ class MethodSourceTranspiler {
                     // eslint-disable-next-line max-len
                     ret.appendString(`if (${lookup} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
                     ret.appendString(`if (${lookup} === undefined) { throw new ${lookupException}(); }\n`);
+                    if (i === 0) {
+                        ret.appendString(this.prepend);
+                    }
                     ret.appendString(lookup);
                 }
                 else {
@@ -43,6 +49,9 @@ class MethodSourceTranspiler {
                 }
             }
             else if (child.get() instanceof core_1.Expressions.MethodName) {
+                if (i === 0) {
+                    ret.appendString(this.prepend + "this.");
+                }
                 const methodName = child.concatTokens().toLowerCase().replace("~", "$");
                 ret.append(methodName, child.getFirstToken().getStart(), traversal);
             }
@@ -58,6 +67,9 @@ class MethodSourceTranspiler {
                 }
             }
             else if (child.get() instanceof core_1.Expressions.FieldChain) {
+                if (i === 0) {
+                    ret.appendString(this.prepend);
+                }
                 ret.appendChunk(traversal.traverse(child));
             }
             else {

package/build/src/statements/call.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class CallTranspiler {
     transpile(node, traversal) {
+        var _a;
         if (node.concatTokens().toLowerCase().includes("super->constructor")) {
             // todo, https://github.com/abaplint/transpiler/issues/133
             return new chunk_1.Chunk("");
@@ -19,10 +21,19 @@ class CallTranspiler {
         if (methodSource) {
             let body = "";
             const methodCallBody = node.findDirectExpression(abaplint.Expressions.MethodCallBody);
-            if (methodCallBody && 1 === 1 + 2) { // todo
-                body += traversal.traverse(methodCallBody).getCode();
+            if (methodCallBody) {
+                body = traversal.traverse(methodCallBody).getCode();
             }
-            return new chunk_1.Chunk().appendChunk(traversal.traverse(methodSource)).appendString("(" + body + ");");
+            let pre = "";
+            let post = "";
+            const receiving = (_a = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _a === void 0 ? void 0 : _a.findExpressionAfterToken("RECEIVING");
+            if (receiving) {
+                const target = traversal.traverse(receiving.findDirectExpression(abaplint.Expressions.Target));
+                pre = target.getCode() + ".set(";
+                post = ")";
+            }
+            const ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal);
+            return new chunk_1.Chunk().appendChunk(ms).appendString("(" + body + ")" + post + ";");
         }
         throw new Error("CallTranspiler, todo");
     }

package/build/src/statements/call_function.js

@@ -5,7 +5,7 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class CallFunctionTranspiler {
     transpile(node, traversal) {
-        var _a;
+        var _a, _b;
         const fmname = (_a = node.findDirectExpression(abaplint.Expressions.FunctionName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
         if (fmname === undefined) {
             throw "CallFunctionTranspilerNameNotFound";
@@ -15,8 +15,16 @@ class CallFunctionTranspiler {
         if (fmp) {
             param = traversal.traverse(fmp).getCode();
         }
-        const ret = `abap.FunctionModules[${fmname}](${param});`;
-        return new chunk_1.Chunk(ret);
+        const ret = new chunk_1.Chunk();
+        const dest = (_b = node.findDirectExpression(abaplint.Expressions.Destination)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(abaplint.Expressions.Source);
+        if (dest) {
+            param = param.replace("{", ",").replace(/}$/, "");
+            ret.appendString(`abap.statements.callFunction({name:${fmname},destination:${dest.concatTokens()}${param}});`);
+        }
+        else {
+            ret.appendString(`abap.FunctionModules[${fmname}](${param});`);
+        }
+        return ret;
     }
 }
 exports.CallFunctionTranspiler = CallFunctionTranspiler;

package/build/src/statements/call_transformation.js

@@ -10,7 +10,7 @@ class CallTransformationTranspiler {
         const options = [];
         const name = (_a = node.findDirectExpression(abaplint.Expressions.NamespaceSimpleName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
         options.push("name: \"" + name + "\"");
-        const sourceXML = node.findDirectExpression(abaplint.Expressions.Source);
+        const sourceXML = node.findDirectExpression(abaplint.Expressions.SimpleSource3);
         if (sourceXML) {
             options.push("sourceXML: " + traversal.traverse(sourceXML).getCode());
         }

package/build/src/unit_test.js

@@ -19,27 +19,28 @@ export async function initializeABAP(settings) {\n`;
         return ret;
     }
     unitTestScript(reg, skip, _only) {
-        let ret = `import fs from "fs";
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
 import path from "path";
-import {dirname} from 'path';
-import {fileURLToPath} from 'url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
+import {fileURLToPath} from "url";
 import {initializeABAP} from "./init.mjs";
 import runtime from "@abaplint/runtime";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 async function run() {
   await initializeABAP();
   const unit = new runtime.UnitTestResult();
   let clas;
   let locl;
   let meth;
-try {\n`;
+  try {\n`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
                 continue;
             }
             ret += `// --------------------------------------------\n`;
-            ret += `clas = unit.addObject("${obj.getName()}");\n`;
+            ret += `    clas = unit.addObject("${obj.getName()}");\n`;
             for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
                     if (def.isForTesting === false
@@ -47,10 +48,10 @@ try {\n`;
                         || def.methods.length === 0) {
                         continue;
                     }
-                    ret += `{
-const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
-locl = clas.addTestClass("${def.name}");\n`;
-                    ret += `if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
+                    ret += `    {
+      const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
+      locl = clas.addTestClass("${def.name}");
+      if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
                     for (const m of def.methods) {
                         if (m.isForTesting === false) {
                             continue;
@@ -62,31 +63,31 @@ locl = clas.addTestClass("${def.name}");\n`;
                             ret += `  meth.skip();\n`;
                             continue;
                         }
-                        ret += `{\n  const test = await (new ${def.name}()).constructor_();\n`;
-                        ret += `  if (test.setup) await test.setup();\n`;
-                        ret += `  console.log('${obj.getName()}: running ${def.name}->${m.name}');\n`;
-                        ret += `  meth = locl.addMethod("${m.name}");\n`;
-                        ret += `  await test.${m.name}();\n`;
-                        ret += `  meth.pass();\n`;
-                        ret += `  if (test.teardown) await test.teardown();\n`;
-                        ret += `}\n`;
+                        ret += `      {\n        const test = await (new ${def.name}()).constructor_();\n`;
+                        ret += `        if (test.setup) await test.setup();\n`;
+                        ret += `        console.log("${obj.getName()}: running ${def.name}->${m.name}");\n`;
+                        ret += `        meth = locl.addMethod("${m.name}");\n`;
+                        ret += `        await test.${m.name}();\n`;
+                        ret += `        meth.pass();\n`;
+                        ret += `        if (test.teardown) await test.teardown();\n`;
+                        ret += `      }\n`;
                     }
-                    ret += `if (${def.name}.class_teardown) await ${def.name}.class_teardown();\n`;
-                    ret += `}\n`;
+                    ret += `      if (${def.name}.class_teardown) await ${def.name}.class_teardown();\n`;
+                    ret += `    }\n`;
                 }
             }
         }
         ret += `// -------------------END-------------------
-console.log(abap.console.get());
-fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
-} catch (e) {
-  if (meth) {
-    meth.fail();
+    console.log(abap.console.get());
+    fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+  } catch (e) {
+    if (meth) {
+      meth.fail();
+    }
+    console.log(abap.console.get());
+    fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+    throw e;
   }
-  console.log(abap.console.get());
-  fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
-  throw e;
-}
 }
 
 run().then(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.26",
+  "version": "1.7.30",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -27,14 +27,14 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.84.3",
+    "@abaplint/core": "^2.84.4",
     "source-map": "^0.7.3"
   },
   "devDependencies": {
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.0",
     "chai": "^4.3.4",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.0",
     "source-map-support": "^0.5.21",
     "typescript": "^4.5.5"
   }