@abaplint/transpiler 1.7.25 → 1.7.29

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/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/handle_data_element.d.ts

@@ -0,0 +1,5 @@
+import * as abaplint from "@abaplint/core";
+import { IOutputFile } from "./types";
+export declare class HandleDataElement {
+    runObject(obj: abaplint.Objects.DataElement, reg: abaplint.IRegistry): IOutputFile[];
+}

package/build/src/handle_data_element.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleDataElement = void 0;
+const chunk_1 = require("./chunk");
+const transpile_types_1 = require("./transpile_types");
+class HandleDataElement {
+    runObject(obj, reg) {
+        var _a;
+        const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
+        if (filename === undefined) {
+            return [];
+        }
+        const type = obj.parseType(reg);
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+};`);
+        const output = {
+            object: {
+                name: obj.getName(),
+                type: obj.getType(),
+            },
+            filename: filename,
+            chunk: chunk,
+            requires: [],
+            exports: [],
+        };
+        return [output];
+    }
+}
+exports.HandleDataElement = HandleDataElement;
+//# sourceMappingURL=handle_data_element.js.map

package/build/src/handle_table_type.d.ts

@@ -0,0 +1,5 @@
+import * as abaplint from "@abaplint/core";
+import { IOutputFile } from "./types";
+export declare class HandleTableType {
+    runObject(obj: abaplint.Objects.TableType, reg: abaplint.IRegistry): IOutputFile[];
+}

package/build/src/handle_table_type.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleTableType = void 0;
+const chunk_1 = require("./chunk");
+const transpile_types_1 = require("./transpile_types");
+class HandleTableType {
+    runObject(obj, reg) {
+        var _a;
+        const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
+        if (filename === undefined) {
+            return [];
+        }
+        const type = obj.parseType(reg);
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+};`);
+        const output = {
+            object: {
+                name: obj.getName(),
+                type: obj.getType(),
+            },
+            filename: filename,
+            chunk: chunk,
+            requires: [],
+            exports: [],
+        };
+        return [output];
+    }
+}
+exports.HandleTableType = HandleTableType;
+//# sourceMappingURL=handle_table_type.js.map

package/build/src/index.js

@@ -9,6 +9,8 @@ const keywords_1 = require("./keywords");
 const database_setup_1 = require("./database_setup");
 const handle_table_1 = require("./handle_table");
 const handle_abap_1 = require("./handle_abap");
+const handle_data_element_1 = require("./handle_data_element");
+const handle_table_type_1 = require("./handle_table_type");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -55,6 +57,12 @@ class Transpiler {
             else if (obj instanceof abaplint.Objects.Table) {
                 output.objects.push(...new handle_table_1.HandleTable().runObject(obj, reg));
             }
+            else if (obj instanceof abaplint.Objects.DataElement) {
+                output.objects.push(...new handle_data_element_1.HandleDataElement().runObject(obj, reg));
+            }
+            else if (obj instanceof abaplint.Objects.TableType) {
+                output.objects.push(...new handle_table_type_1.HandleTableType().runObject(obj, reg));
+            }
         }
         return output;
     }

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

@@ -4,9 +4,10 @@ exports.CreateDataTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const expressions_1 = require("../expressions");
+const transpile_types_1 = require("../transpile_types");
 class CreateDataTranspiler {
     transpile(node, traversal) {
-        var _a, _b;
+        var _a, _b, _c;
         const targetNode = node.findDirectExpression(abaplint.Expressions.Target);
         const target = traversal.traverse(targetNode);
         const options = [];
@@ -20,6 +21,13 @@ class CreateDataTranspiler {
                 options.push(`"name": ` + new expressions_1.FieldChainTranspiler(true).transpile(dynamic, traversal).getCode());
             }
         }
+        const typeNameNode = node.findDirectExpression(abaplint.Expressions.TypeName);
+        if (typeNameNode) {
+            const id = (_c = traversal.findCurrentScopeByToken(typeNameNode.getFirstToken())) === null || _c === void 0 ? void 0 : _c.findType(typeNameNode.concatTokens());
+            if (id) {
+                options.push(`"type": ` + new transpile_types_1.TranspileTypes().toType(id.getType()));
+            }
+        }
         if (node.findDirectTokenByText("TABLE")) {
             options.push(`"table": true`);
         }

package/build/src/unit_test.js

@@ -106,6 +106,12 @@ run().then(() => {
             if (obj instanceof abaplint.Objects.Table) {
                 list.push(`await import("./${obj.getName().toLowerCase()}.tabl.mjs");`);
             }
+            else if (obj instanceof abaplint.Objects.DataElement) {
+                list.push(`await import("./${obj.getName().toLowerCase()}.dtel.mjs");`);
+            }
+            else if (obj instanceof abaplint.Objects.TableType) {
+                list.push(`await import("./${obj.getName().toLowerCase()}.ttyp.mjs");`);
+            }
         }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.FunctionGroup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.25",
+  "version": "1.7.29",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -34,7 +34,7 @@
     "@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"
   }