@abaplint/transpiler 1.7.14 → 1.7.18

package/build/src/expressions/constant.js

@@ -10,8 +10,9 @@ class ConstantTranspiler {
     transpile(node, traversal) {
         const int = node.findFirstExpression(core_1.Expressions.Integer);
         if (int) {
-            const val = parseInt(int.concatTokens(), 10);
-            let ret = "constant_" + (val < 0 ? "minus_" : "") + Math.abs(val);
+            const concat = int.concatTokens().trim();
+            const post = concat.startsWith("-") ? "minus_" : "";
+            let ret = "constant_" + post + int.getLastToken().getStr();
             if (this.addGet === true) {
                 ret += ".get()";
             }

package/build/src/handle_abap.d.ts

@@ -0,0 +1,14 @@
+import * as abaplint from "@abaplint/core";
+import { IOutputFile, ITranspilerOptions } from "./types";
+import { Chunk } from "./chunk";
+export declare class HandleABAP {
+    private readonly options;
+    constructor(options?: ITranspilerOptions);
+    runObject(obj: abaplint.ABAPObject, reg: abaplint.IRegistry): IOutputFile[];
+    /** merges the locals def and imp into one mjs file */
+    private rearrangeClassLocals;
+    protected addImportsAndExports(output: IOutputFile): Chunk;
+    protected findExports(node: abaplint.Nodes.StructureNode | undefined): string[];
+    protected handleConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): string;
+    protected findConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): Set<string>;
+}

package/build/src/handle_abap.js

@@ -0,0 +1,173 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleABAP = void 0;
+const abaplint = require("@abaplint/core");
+const traversal_1 = require("./traversal");
+const requires_1 = require("./requires");
+const rearranger_1 = require("./rearranger");
+const chunk_1 = require("./chunk");
+class HandleABAP {
+    constructor(options) {
+        this.options = options;
+    }
+    runObject(obj, reg) {
+        var _a, _b, _c;
+        const spaghetti = new abaplint.SyntaxLogic(reg, obj).run().spaghetti;
+        let ret = [];
+        for (const file of obj.getSequencedFiles()) {
+            const chunk = new chunk_1.Chunk();
+            if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.addFilenames) === true) {
+                chunk.appendString("// " + file.getFilename() + "\n");
+            }
+            chunk.appendString(this.handleConstants(obj, file, reg));
+            const rearranged = new rearranger_1.Rearranger().run(obj.getType(), file.getStructure());
+            const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.unknownTypes) === "runtimeError").traverse(rearranged);
+            chunk.appendChunk(contents);
+            chunk.stripLastNewline();
+            chunk.runIndentationLogic();
+            const exports = this.findExports(file.getStructure());
+            const filename = file.getFilename().replace(".abap", ".mjs").toLowerCase();
+            const output = {
+                object: {
+                    name: obj.getName(),
+                    type: obj.getType(),
+                },
+                filename: filename,
+                chunk: chunk,
+                requires: new requires_1.Requires(reg).find(obj, spaghetti.getTop(), file.getFilename()),
+                exports: exports,
+            };
+            ret.push(output);
+        }
+        ret = this.rearrangeClassLocals(obj, ret);
+        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.addCommonJS) === true) {
+            ret.map(output => output.chunk = this.addImportsAndExports(output));
+        }
+        return ret;
+    }
+    /** merges the locals def and imp into one mjs file */
+    rearrangeClassLocals(obj, output) {
+        const ret = [];
+        if (obj.getType() !== "CLAS") {
+            return output;
+        }
+        let imp = undefined;
+        let def = undefined;
+        for (const o of output) {
+            if (o.filename.endsWith(".clas.locals_imp.mjs")) {
+                imp = o;
+            }
+            else if (o.filename.endsWith(".clas.locals_def.mjs")) {
+                def = o;
+            }
+            else {
+                ret.push(o);
+            }
+        }
+        if (def) {
+            def.filename = def.filename.replace(".locals_def.mjs", ".locals.mjs");
+        }
+        if (imp) {
+            imp.filename = imp.filename.replace(".locals_imp.mjs", ".locals.mjs");
+        }
+        if (imp && def) {
+            // remove duplicates
+            const requires = [...def.requires];
+            for (const r of imp.requires) {
+                if (requires.find(a => a.filename === r.filename && a.name === r.name) === undefined) {
+                    requires.push(r);
+                }
+            }
+            const chunk = new chunk_1.Chunk().appendChunk(def.chunk).appendChunk(imp.chunk);
+            ret.push({
+                object: imp.object,
+                filename: imp.filename,
+                chunk: chunk,
+                requires: requires,
+                exports: def.exports.concat(imp.exports),
+            });
+        }
+        else if (imp) {
+            ret.push(imp);
+        }
+        else if (def) {
+            ret.push(def);
+        }
+        return ret;
+    }
+    addImportsAndExports(output) {
+        var _a;
+        const contents = new chunk_1.Chunk();
+        for (const r of output.requires) {
+            const name = (_a = r.name) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            const filename = r.filename.replace(".abap", ".mjs");
+            if (filename === output.filename) {
+                continue;
+            }
+            if (name) {
+                contents.appendString("const {" + name + "} = await import(\"./" + filename + "\");\n");
+            }
+            else {
+                contents.appendString("await import(\"./" + filename + "\");\n");
+            }
+        }
+        contents.appendChunk(output.chunk);
+        if (output.exports.length > 0) {
+            contents.appendString("\nexport {" + output.exports.join(", ") + "};");
+        }
+        return contents;
+    }
+    findExports(node) {
+        var _a, _b;
+        if (node === undefined) {
+            return [];
+        }
+        const res = [];
+        for (const c of node.findAllStatements(abaplint.Statements.ClassDefinition)) {
+            const e = (_a = c.findFirstExpression(abaplint.Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
+            if (e) {
+                res.push(e.toLowerCase());
+            }
+        }
+        for (const c of node.findAllStatements(abaplint.Statements.Interface)) {
+            const e = (_b = c.findFirstExpression(abaplint.Expressions.InterfaceName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            if (e) {
+                res.push(e.toLowerCase());
+            }
+        }
+        return res;
+    }
+    handleConstants(obj, file, reg) {
+        var _a, _b;
+        let result = "";
+        const constants = this.findConstants(obj, file, reg);
+        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.skipConstants) === false || ((_b = this.options) === null || _b === void 0 ? void 0 : _b.skipConstants) === undefined) {
+            for (const concat of Array.from(constants).sort()) {
+                const post = concat.startsWith("-") ? "minus_" : "";
+                result += `const constant_${post}${concat.replace("-", "")} = new abap.types.Integer().set(${concat});\n`;
+            }
+        }
+        return result;
+    }
+    findConstants(obj, file, reg) {
+        var _a, _b;
+        let constants = new Set();
+        for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(abaplint.Expressions.Integer)) || []) {
+            constants.add(i.concatTokens().replace(" ", ""));
+        }
+        // extra constants from interfaces, used for default values
+        if (obj.getType() === "CLAS") {
+            const clas = obj;
+            for (const i of ((_b = clas.getClassDefinition()) === null || _b === void 0 ? void 0 : _b.interfaces) || []) {
+                const intf = reg.getObject("INTF", i.name);
+                const main = intf === null || intf === void 0 ? void 0 : intf.getMainABAPFile();
+                if (intf && main) {
+                    constants = new Set([...constants, ...this.findConstants(intf, main, reg).values()]);
+                }
+            }
+        }
+        return constants;
+    }
+}
+exports.HandleABAP = HandleABAP;
+//# sourceMappingURL=handle_abap.js.map

package/build/src/handle_table.d.ts

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

package/build/src/handle_table.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleTable = void 0;
+const chunk_1 = require("./chunk");
+const transpile_types_1 = require("./transpile_types");
+// tables or structures
+class HandleTable {
+    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.HandleTable = HandleTable;
+//# sourceMappingURL=handle_table.js.map

package/build/src/index.d.ts

@@ -1,65 +1,11 @@
 import * as abaplint from "@abaplint/core";
 import { config } from "./validation";
-import { TestMethodList } from "./unit_test";
-import { Chunk } from "./chunk";
-export { config };
-export interface IFile {
-    filename: string;
-    relative?: string;
-    contents: string;
-}
-export interface IObjectIdentifier {
-    name: string;
-    type: string;
-}
-export interface IOutput {
-    objects: IOutputFile[];
-    reg: abaplint.IRegistry;
-    unitTestScript: string;
-    initializationScript: string;
-    databaseSetup: string;
-}
-export interface IRequire {
-    name: string | undefined;
-    filename: string;
-}
-export interface IProgress {
-    set(total: number, text: string): void;
-    tick(text: string): Promise<void>;
-}
-/** one javascript output file for each object */
-export interface IOutputFile {
-    object: IObjectIdentifier;
-    filename: string;
-    chunk: Chunk;
-    requires: readonly IRequire[];
-    exports: readonly string[];
-}
-export interface ITranspilerOptions {
-    /** ignore syntax check, used for internal testing */
-    ignoreSyntaxCheck?: boolean;
-    /** adds common js modules */
-    addCommonJS?: boolean;
-    /** adds filenames as comments in the output js */
-    addFilenames?: boolean;
-    /** skip outputing constants, used for internal testing */
-    skipConstants?: boolean;
-    /** sets behavior for unknown types, either fail at compile- or run-time */
-    unknownTypes?: "compileError" | "runtimeError";
-    skip?: TestMethodList;
-    only?: TestMethodList;
-}
+import { IFile, IOutput, IProgress, ITranspilerOptions, IOutputFile } from "./types";
+export { config, ITranspilerOptions, IFile, IProgress, IOutputFile };
 export declare class Transpiler {
     private readonly options;
     constructor(options?: ITranspilerOptions);
     runRaw(files: IFile[]): Promise<IOutput>;
     run(reg: abaplint.IRegistry, progress?: IProgress): Promise<IOutput>;
-    protected handleConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): string;
-    protected findConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): Set<number>;
-    protected runObject(obj: abaplint.ABAPObject, reg: abaplint.IRegistry): IOutputFile[];
-    /** merges the locals def and imp into one mjs file */
-    private rearrangeClassLocals;
-    protected addImportsAndExports(output: IOutputFile): Chunk;
-    protected findExports(node: abaplint.Nodes.StructureNode | undefined): string[];
     protected validate(reg: abaplint.IRegistry): void;
 }

package/build/src/index.js

@@ -4,13 +4,11 @@ exports.Transpiler = exports.config = void 0;
 const abaplint = require("@abaplint/core");
 const validation_1 = require("./validation");
 Object.defineProperty(exports, "config", { enumerable: true, get: function () { return validation_1.config; } });
-const traversal_1 = require("./traversal");
-const requires_1 = require("./requires");
 const unit_test_1 = require("./unit_test");
 const keywords_1 = require("./keywords");
 const database_setup_1 = require("./database_setup");
-const rearranger_1 = require("./rearranger");
-const chunk_1 = require("./chunk");
+const handle_table_1 = require("./handle_table");
+const handle_abap_1 = require("./handle_abap");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -44,6 +42,7 @@ class Transpiler {
         for (const obj of reg.getObjects()) {
             await (progress === null || progress === void 0 ? void 0 : progress.tick("Building, Syntax Logic, " + obj.getName()));
             if (obj instanceof abaplint.ABAPObject) {
+                // todo, this is already done inside reg.parse()?
                 new abaplint.SyntaxLogic(reg, obj).run();
             }
         }
@@ -51,171 +50,15 @@ class Transpiler {
         for (const obj of reg.getObjects()) {
             await (progress === null || progress === void 0 ? void 0 : progress.tick("Building, " + obj.getName()));
             if (obj instanceof abaplint.ABAPObject && !(obj instanceof abaplint.Objects.TypePool)) {
-                output.objects = output.objects.concat(this.runObject(obj, reg));
+                output.objects.push(...new handle_abap_1.HandleABAP(this.options).runObject(obj, reg));
+            }
+            else if (obj instanceof abaplint.Objects.Table) {
+                output.objects.push(...new handle_table_1.HandleTable().runObject(obj, reg));
             }
         }
         return output;
     }
     // ///////////////////////////////
-    handleConstants(obj, file, reg) {
-        var _a, _b;
-        let result = "";
-        const constants = this.findConstants(obj, file, reg);
-        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.skipConstants) === false || ((_b = this.options) === null || _b === void 0 ? void 0 : _b.skipConstants) === undefined) {
-            for (const c of Array.from(constants).sort()) {
-                const post = c < 0 ? "minus_" : "";
-                result += `const constant_${post}${Math.abs(c)} = new abap.types.Integer().set(${c});\n`;
-            }
-        }
-        return result;
-    }
-    findConstants(obj, file, reg) {
-        var _a, _b;
-        let constants = new Set();
-        for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(abaplint.Expressions.Integer)) || []) {
-            const j = parseInt(i.concatTokens(), 10);
-            constants.add(j);
-        }
-        // extra constants from interfaces, used for default values
-        if (obj.getType() === "CLAS") {
-            const clas = obj;
-            for (const i of ((_b = clas.getClassDefinition()) === null || _b === void 0 ? void 0 : _b.interfaces) || []) {
-                const intf = reg.getObject("INTF", i.name);
-                const main = intf === null || intf === void 0 ? void 0 : intf.getMainABAPFile();
-                if (intf && main) {
-                    constants = new Set([...constants, ...this.findConstants(intf, main, reg).values()]);
-                }
-            }
-        }
-        return constants;
-    }
-    runObject(obj, reg) {
-        var _a, _b, _c;
-        const spaghetti = new abaplint.SyntaxLogic(reg, obj).run().spaghetti;
-        let ret = [];
-        for (const file of obj.getSequencedFiles()) {
-            const chunk = new chunk_1.Chunk();
-            if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.addFilenames) === true) {
-                chunk.appendString("// " + file.getFilename() + "\n");
-            }
-            chunk.appendString(this.handleConstants(obj, file, reg));
-            const rearranged = new rearranger_1.Rearranger().run(obj.getType(), file.getStructure());
-            const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.unknownTypes) === "runtimeError").traverse(rearranged);
-            chunk.appendChunk(contents);
-            chunk.stripLastNewline();
-            chunk.runIndentationLogic();
-            const exports = this.findExports(file.getStructure());
-            const filename = file.getFilename().replace(".abap", ".mjs").toLowerCase();
-            const output = {
-                object: {
-                    name: obj.getName(),
-                    type: obj.getType(),
-                },
-                filename: filename,
-                chunk: chunk,
-                requires: new requires_1.Requires(reg).find(obj, spaghetti.getTop(), file.getFilename()),
-                exports: exports,
-            };
-            ret.push(output);
-        }
-        ret = this.rearrangeClassLocals(obj, ret);
-        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.addCommonJS) === true) {
-            ret.map(output => output.chunk = this.addImportsAndExports(output));
-        }
-        return ret;
-    }
-    /** merges the locals def and imp into one mjs file */
-    rearrangeClassLocals(obj, output) {
-        const ret = [];
-        if (obj.getType() !== "CLAS") {
-            return output;
-        }
-        let imp = undefined;
-        let def = undefined;
-        for (const o of output) {
-            if (o.filename.endsWith(".clas.locals_imp.mjs")) {
-                imp = o;
-            }
-            else if (o.filename.endsWith(".clas.locals_def.mjs")) {
-                def = o;
-            }
-            else {
-                ret.push(o);
-            }
-        }
-        if (def) {
-            def.filename = def.filename.replace(".locals_def.mjs", ".locals.mjs");
-        }
-        if (imp) {
-            imp.filename = imp.filename.replace(".locals_imp.mjs", ".locals.mjs");
-        }
-        if (imp && def) {
-            // remove duplicates
-            const requires = [...def.requires];
-            for (const r of imp.requires) {
-                if (requires.find(a => a.filename === r.filename && a.name === r.name) === undefined) {
-                    requires.push(r);
-                }
-            }
-            const chunk = new chunk_1.Chunk().appendChunk(def.chunk).appendChunk(imp.chunk);
-            ret.push({
-                object: imp.object,
-                filename: imp.filename,
-                chunk: chunk,
-                requires: requires,
-                exports: def.exports.concat(imp.exports),
-            });
-        }
-        else if (imp) {
-            ret.push(imp);
-        }
-        else if (def) {
-            ret.push(def);
-        }
-        return ret;
-    }
-    addImportsAndExports(output) {
-        var _a;
-        const contents = new chunk_1.Chunk();
-        for (const r of output.requires) {
-            const name = (_a = r.name) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-            const filename = r.filename.replace(".abap", ".mjs");
-            if (filename === output.filename) {
-                continue;
-            }
-            if (name) {
-                contents.appendString("const {" + name + "} = await import(\"./" + filename + "\");\n");
-            }
-            else {
-                contents.appendString("await import(\"./" + filename + "\");\n");
-            }
-        }
-        contents.appendChunk(output.chunk);
-        if (output.exports.length > 0) {
-            contents.appendString("\nexport {" + output.exports.join(", ") + "};");
-        }
-        return contents;
-    }
-    findExports(node) {
-        var _a, _b;
-        if (node === undefined) {
-            return [];
-        }
-        const res = [];
-        for (const c of node.findAllStatements(abaplint.Statements.ClassDefinition)) {
-            const e = (_a = c.findFirstExpression(abaplint.Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
-            if (e) {
-                res.push(e.toLowerCase());
-            }
-        }
-        for (const c of node.findAllStatements(abaplint.Statements.Interface)) {
-            const e = (_b = c.findFirstExpression(abaplint.Expressions.InterfaceName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
-            if (e) {
-                res.push(e.toLowerCase());
-            }
-        }
-        return res;
-    }
     validate(reg) {
         const issues = new validation_1.Validation(this.options).run(reg);
         if (issues.length > 0) {

package/build/src/requires.d.ts

@@ -1,5 +1,5 @@
 import * as abaplint from "@abaplint/core";
-import { IRequire } from ".";
+import { IRequire } from "./types";
 export declare class Requires {
     private readonly reg;
     constructor(reg: abaplint.IRegistry);

package/build/src/statements/create_data.js

@@ -3,11 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateDataTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class CreateDataTranspiler {
     transpile(node, traversal) {
+        var _a, _b;
         const targetNode = node.findDirectExpression(abaplint.Expressions.Target);
         const target = traversal.traverse(targetNode);
-        return new chunk_1.Chunk("abap.statements.createData(" + target.getCode() + ");");
+        const options = [];
+        let dynamic = (_a = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(abaplint.Expressions.ConstantString);
+        if (dynamic) {
+            options.push(`"name": ` + dynamic.getFirstToken().getStr());
+        }
+        else {
+            dynamic = (_b = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.FieldChain);
+            if (dynamic) {
+                options.push(`"name": ` + new expressions_1.FieldChainTranspiler(true).transpile(dynamic, traversal).getCode());
+            }
+        }
+        if (node.findDirectTokenByText("TABLE")) {
+            options.push(`"table": true`);
+        }
+        let add = "";
+        if (options.length > 0) {
+            add = ",{" + options.join(",") + "}";
+        }
+        return new chunk_1.Chunk("abap.statements.createData(" + target.getCode() + add + ");");
     }
 }
 exports.CreateDataTranspiler = CreateDataTranspiler;

package/build/src/statements/data.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTranspiler = void 0;
 const abaplint = require("@abaplint/core");
-const types_1 = require("../types");
+const transpile_types_1 = require("../transpile_types");
 const constant_1 = require("../expressions/constant");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
@@ -40,7 +40,7 @@ class DataTranspiler {
         const ret = new chunk_1.Chunk()
             .appendString("let ")
             .append(found.getName().toLowerCase(), token, traversal)
-            .appendString(" = " + new types_1.TranspileTypes().toType(found.getType()))
+            .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
             .append(";", node.getLastToken(), traversal)
             .append(value, node.getLastToken(), traversal);
         return ret;

package/build/src/statements/do.js

@@ -12,14 +12,14 @@ class DoTranspiler {
             const source = new expressions_1.SourceTranspiler(true).transpile(found, traversal).getCode();
             const idSource = unique_identifier_1.UniqueIdentifier.get();
             const id = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${idSource} = ${source};
-for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
+            return new chunk_1.Chunk(`const ${idSource} = ${source};
+for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
 abap.builtin.sy.get().index.set(${id} + 1);`);
         }
         else {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`let ${unique} = 1;
-while (true) {
+            return new chunk_1.Chunk(`let ${unique} = 1;
+while (true) {
 abap.builtin.sy.get().index.set(${unique}++);`);
         }
     }

package/build/src/statements/method_implementation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodImplementationTranspiler = void 0;
 const abaplint = require("@abaplint/core");
-const types_1 = require("../types");
+const transpile_types_1 = require("../transpile_types");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class MethodImplementationTranspiler {
@@ -37,7 +37,7 @@ class MethodImplementationTranspiler {
                 if (unique === "") {
                     unique = "INPUT";
                 }
-                after = after + new types_1.TranspileTypes().declare(identifier) + "\n";
+                after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
                 if (identifier.getMeta().includes("importing" /* MethodImporting */) && identifier.getType().isGeneric() === false) {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
                 }
@@ -72,7 +72,7 @@ class MethodImplementationTranspiler {
                 }
             }
             else if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
-                after = after + new types_1.TranspileTypes().declare(identifier) + "\n";
+                after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
             }
         }
         if (after.length > 0) { // argh

package/build/src/statements/select.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class SelectTranspiler {
     transpile(node, traversal) {
         var _a, _b;
@@ -10,6 +11,14 @@ class SelectTranspiler {
         let select = "SELECT ";
         select += ((_a = node.findFirstExpression(abaplint.Expressions.SQLFieldList)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + " ";
         select += ((_b = node.findFirstExpression(abaplint.Expressions.SQLFrom)) === null || _b === void 0 ? void 0 : _b.concatTokens()) + " ";
+        for (const d of node.findAllExpressionsRecursive(abaplint.Expressions.Dynamic)) {
+            const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
+            if (chain) {
+                const code = new expressions_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
+                const search = d.concatTokens();
+                select = select.replace(search, `" + ${code} + "`);
+            }
+        }
         if (node.concatTokens().toUpperCase().startsWith("SELECT SINGLE ")) {
             select += "LIMIT 1";
         }

package/build/src/structures/class_implementation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassImplementationTranspiler = void 0;
 const abaplint = require("@abaplint/core");
-const types_1 = require("../types");
+const transpile_types_1 = require("../transpile_types");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class ClassImplementationTranspiler {
@@ -70,7 +70,7 @@ class ClassImplementationTranspiler {
         const staticAttributes = this.findStaticAttributes(cdef, scope);
         for (const attr of staticAttributes) {
             const name = clasName + "." + attr.prefix + attr.identifier.getName().toLowerCase();
-            ret += name + " = " + new types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";
+            ret += name + " = " + new transpile_types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";
             const val = attr.identifier.getValue();
             if (typeof val === "string") {
                 const e = new expressions_1.ConstantTranspiler().escape(val);

package/build/src/structures/interface.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterfaceTranspiler = void 0;
 const abaplint = require("@abaplint/core");
-const types_1 = require("../types");
+const transpile_types_1 = require("../transpile_types");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class InterfaceTranspiler {
@@ -42,7 +42,7 @@ class InterfaceTranspiler {
             }
             const interfaceName = node.getFirstToken().getStr().toLowerCase();
             const name = interfaceName + "." + interfaceName + "$" + n.toLowerCase();
-            ret += name + " = " + new types_1.TranspileTypes().toType(identifier.getType()) + ";\n";
+            ret += name + " = " + new transpile_types_1.TranspileTypes().toType(identifier.getType()) + ";\n";
             const constantStatement = traversal.findStatementInFile(identifier.getStart());
             const valExpression = constantStatement === null || constantStatement === void 0 ? void 0 : constantStatement.findFirstExpression(abaplint.Expressions.Value);
             if ((valExpression === null || valExpression === void 0 ? void 0 : valExpression.getChildren()[1].get()) instanceof abaplint.Expressions.SimpleFieldChain) {

package/build/src/transpile_types.d.ts

@@ -0,0 +1,5 @@
+import * as abaplint from "@abaplint/core";
+export declare class TranspileTypes {
+    declare(t: abaplint.TypedIdentifier): string;
+    toType(type: abaplint.AbstractType): string;
+}

package/build/src/transpile_types.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TranspileTypes = void 0;
+const abaplint = require("@abaplint/core");
+class TranspileTypes {
+    declare(t) {
+        const type = t.getType();
+        return "let " + t.getName().toLowerCase() + " = " + this.toType(type) + ";";
+    }
+    toType(type) {
+        let resolved = "";
+        let extra = "";
+        if (type instanceof abaplint.BasicTypes.ObjectReferenceType
+            || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
+            resolved = "ABAPObject";
+        }
+        else if (type instanceof abaplint.BasicTypes.TableType) {
+            resolved = "Table";
+            extra = this.toType(type.getRowType());
+            extra += ", " + JSON.stringify(type.getOptions());
+        }
+        else if (type instanceof abaplint.BasicTypes.IntegerType) {
+            resolved = "Integer";
+        }
+        else if (type instanceof abaplint.BasicTypes.StringType) {
+            resolved = "String";
+        }
+        else if (type instanceof abaplint.BasicTypes.DateType) {
+            resolved = "Date";
+        }
+        else if (type instanceof abaplint.BasicTypes.TimeType) {
+            resolved = "Time";
+        }
+        else if (type instanceof abaplint.BasicTypes.DataReference) {
+            resolved = "DataReference";
+            extra = this.toType(type.getType());
+        }
+        else if (type instanceof abaplint.BasicTypes.StructureType) {
+            resolved = "Structure";
+            const list = [];
+            for (const c of type.getComponents()) {
+                list.push(c.name.toLowerCase() + ": " + this.toType(c.type));
+            }
+            extra = "{" + list.join(", ") + "}";
+        }
+        else if (type instanceof abaplint.BasicTypes.CLikeType
+            || type instanceof abaplint.BasicTypes.CSequenceType) {
+            // if not supplied its a Character(1)
+            resolved = "Character";
+        }
+        else if (type instanceof abaplint.BasicTypes.AnyType) {
+            // if not supplied its a Character(4)
+            resolved = "Character";
+            extra = "{length: 4}";
+        }
+        else if (type instanceof abaplint.BasicTypes.SimpleType) {
+            // if not supplied its a Character(1)
+            resolved = "Character";
+        }
+        else if (type instanceof abaplint.BasicTypes.CharacterType) {
+            resolved = "Character";
+            if (type.getLength() !== 1) {
+                extra = "{length: " + type.getLength() + ", qualifiedName: \"" + type.getQualifiedName() + "\"}";
+            }
+            else if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + type.getQualifiedName() + "\"}";
+            }
+        }
+        else if (type instanceof abaplint.BasicTypes.NumericType) {
+            resolved = "Numc";
+            if (type.getLength() !== 1) {
+                extra = "{length: " + type.getLength() + "}";
+            }
+        }
+        else if (type instanceof abaplint.BasicTypes.PackedType) {
+            resolved = "Packed";
+            extra = "{length: " + type.getLength() + ", decimals: " + type.getDecimals() + "}";
+        }
+        else if (type instanceof abaplint.BasicTypes.NumericGenericType) {
+            resolved = "Packed";
+            extra = "{length: 8, decimals: 0}";
+        }
+        else if (type instanceof abaplint.BasicTypes.XStringType) {
+            resolved = "XString";
+        }
+        else if (type instanceof abaplint.BasicTypes.XSequenceType) {
+            // if not supplied itsa a Hex(1)
+            resolved = "Hex";
+        }
+        else if (type instanceof abaplint.BasicTypes.HexType) {
+            resolved = "Hex";
+            if (type.getLength() !== 1) {
+                extra = "{length: " + type.getLength() + "}";
+            }
+        }
+        else if (type instanceof abaplint.BasicTypes.FloatType) {
+            resolved = "Float";
+        }
+        else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {
+            resolved = "DecFloat34";
+        }
+        else if (type instanceof abaplint.BasicTypes.UnknownType) {
+            return `(() => { throw "Unknown type: ${type.getError()}" })()`;
+        }
+        else if (type instanceof abaplint.BasicTypes.VoidType) {
+            return `(() => { throw "Void type: ${type.getVoided()}" })()`;
+        }
+        else {
+            resolved = "typeTodo" + type.constructor.name;
+        }
+        return "new abap.types." + resolved + "(" + extra + ")";
+    }
+}
+exports.TranspileTypes = TranspileTypes;
+//# sourceMappingURL=transpile_types.js.map

package/build/src/traversal.js

@@ -5,7 +5,7 @@ const abaplint = require("@abaplint/core");
 const StatementTranspilers = require("./statements");
 const ExpressionTranspilers = require("./expressions");
 const StructureTranspilers = require("./structures");
-const types_1 = require("./types");
+const transpile_types_1 = require("./transpile_types");
 const chunk_1 = require("./chunk");
 class Traversal {
     constructor(spaghetti, file, obj, reg, runtimeTypeError = false) {
@@ -265,7 +265,7 @@ class Traversal {
                 continue;
             }
             const name = a.getName().toLowerCase();
-            ret += "this." + name + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+            ret += "this." + name + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
         }
         // attributes from directly implemented interfaces(not interfaces implemented in super classes)
         for (const i of def.getImplementing()) {
@@ -305,7 +305,7 @@ class Traversal {
                 continue;
             }
             const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
-            ret += "this." + n + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+            ret += "this." + n + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
         }
         for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
             ret += this.dataFromInterfaces(i.name, scope);

package/build/src/types.d.ts

@@ -1,5 +1,49 @@
+import { Chunk } from "./chunk";
 import * as abaplint from "@abaplint/core";
-export declare class TranspileTypes {
-    declare(t: abaplint.TypedIdentifier): string;
-    toType(type: abaplint.AbstractType): string;
+import { TestMethodList } from "./unit_test";
+export interface IFile {
+    filename: string;
+    relative?: string;
+    contents: string;
+}
+export interface IObjectIdentifier {
+    name: string;
+    type: string;
+}
+export interface IOutput {
+    objects: IOutputFile[];
+    reg: abaplint.IRegistry;
+    unitTestScript: string;
+    initializationScript: string;
+    databaseSetup: string;
+}
+export interface IRequire {
+    name: string | undefined;
+    filename: string;
+}
+export interface IProgress {
+    set(total: number, text: string): void;
+    tick(text: string): Promise<void>;
+}
+/** one javascript output file for each object */
+export interface IOutputFile {
+    object: IObjectIdentifier;
+    filename: string;
+    chunk: Chunk;
+    requires: readonly IRequire[];
+    exports: readonly string[];
+}
+export interface ITranspilerOptions {
+    /** ignore syntax check, used for internal testing */
+    ignoreSyntaxCheck?: boolean;
+    /** adds common js modules */
+    addCommonJS?: boolean;
+    /** adds filenames as comments in the output js */
+    addFilenames?: boolean;
+    /** skip outputing constants, used for internal testing */
+    skipConstants?: boolean;
+    /** sets behavior for unknown types, either fail at compile- or run-time */
+    unknownTypes?: "compileError" | "runtimeError";
+    skip?: TestMethodList;
+    only?: TestMethodList;
 }

package/build/src/types.js

@@ -1,112 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TranspileTypes = void 0;
-const abaplint = require("@abaplint/core");
-class TranspileTypes {
-    declare(t) {
-        const type = t.getType();
-        return "let " + t.getName().toLowerCase() + " = " + this.toType(type) + ";";
-    }
-    toType(type) {
-        let resolved = "";
-        let extra = "";
-        if (type instanceof abaplint.BasicTypes.ObjectReferenceType
-            || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
-            resolved = "ABAPObject";
-        }
-        else if (type instanceof abaplint.BasicTypes.TableType) {
-            resolved = "Table";
-            extra = this.toType(type.getRowType());
-            extra += ", " + JSON.stringify(type.getOptions());
-        }
-        else if (type instanceof abaplint.BasicTypes.IntegerType) {
-            resolved = "Integer";
-        }
-        else if (type instanceof abaplint.BasicTypes.StringType) {
-            resolved = "String";
-        }
-        else if (type instanceof abaplint.BasicTypes.DateType) {
-            resolved = "Date";
-        }
-        else if (type instanceof abaplint.BasicTypes.TimeType) {
-            resolved = "Time";
-        }
-        else if (type instanceof abaplint.BasicTypes.DataReference) {
-            resolved = "DataReference";
-            extra = this.toType(type.getType());
-        }
-        else if (type instanceof abaplint.BasicTypes.StructureType) {
-            resolved = "Structure";
-            const list = [];
-            for (const c of type.getComponents()) {
-                list.push(c.name.toLowerCase() + ": " + this.toType(c.type));
-            }
-            extra = "{" + list.join(", ") + "}";
-        }
-        else if (type instanceof abaplint.BasicTypes.CLikeType
-            || type instanceof abaplint.BasicTypes.CSequenceType) {
-            // if not supplied its a Character(1)
-            resolved = "Character";
-        }
-        else if (type instanceof abaplint.BasicTypes.AnyType) {
-            // if not supplied its a Character(4)
-            resolved = "Character";
-            extra = "{length: 4}";
-        }
-        else if (type instanceof abaplint.BasicTypes.SimpleType) {
-            // if not supplied its a Character(1)
-            resolved = "Character";
-        }
-        else if (type instanceof abaplint.BasicTypes.CharacterType) {
-            resolved = "Character";
-            if (type.getLength() !== 1) {
-                extra = "{length: " + type.getLength() + ", qualifiedName: \"" + type.getQualifiedName() + "\"}";
-            }
-            else if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + type.getQualifiedName() + "\"}";
-            }
-        }
-        else if (type instanceof abaplint.BasicTypes.NumericType) {
-            resolved = "Numc";
-            if (type.getLength() !== 1) {
-                extra = "{length: " + type.getLength() + "}";
-            }
-        }
-        else if (type instanceof abaplint.BasicTypes.PackedType) {
-            resolved = "Packed";
-            extra = "{length: " + type.getLength() + ", decimals: " + type.getDecimals() + "}";
-        }
-        else if (type instanceof abaplint.BasicTypes.NumericGenericType) {
-            resolved = "Packed";
-            extra = "{length: 8, decimals: 0}";
-        }
-        else if (type instanceof abaplint.BasicTypes.XStringType) {
-            resolved = "XString";
-        }
-        else if (type instanceof abaplint.BasicTypes.XSequenceType) {
-            // if not supplied itsa a Hex(1)
-            resolved = "Hex";
-        }
-        else if (type instanceof abaplint.BasicTypes.HexType) {
-            resolved = "Hex";
-            if (type.getLength() !== 1) {
-                extra = "{length: " + type.getLength() + "}";
-            }
-        }
-        else if (type instanceof abaplint.BasicTypes.FloatType) {
-            resolved = "Float";
-        }
-        else if (type instanceof abaplint.BasicTypes.UnknownType) {
-            return `(() => { throw "Unknown type: ${type.getError()}" })()`;
-        }
-        else if (type instanceof abaplint.BasicTypes.VoidType) {
-            return `(() => { throw "Void type: ${type.getVoided()}" })()`;
-        }
-        else {
-            resolved = "typeTodo" + type.constructor.name;
-        }
-        return "new abap.types." + resolved + "(" + extra + ")";
-    }
-}
-exports.TranspileTypes = TranspileTypes;
 //# sourceMappingURL=types.js.map

package/build/src/unit_test.js

@@ -5,9 +5,9 @@ const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this somewhere else, its much more than just unit test relevant
     initializationScript(reg, dbSetup) {
-        let ret = `import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
+        let ret = `import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
 export async function initializeABAP(settings) {\n`;
         if (dbSetup === "") {
             ret += `// no database artifacts, skip DB initialization\n`;
@@ -19,20 +19,20 @@ export async function initializeABAP(settings) {\n`;
         return ret;
     }
     unitTestScript(reg, skip, _only) {
-        let ret = `import fs from "fs";
-import path from "path";
-import {dirname} from 'path';
-import {fileURLToPath} from 'url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-import {initializeABAP} from "./init.mjs";
-import runtime from "@abaplint/runtime";
-
-async function run() {
-  await initializeABAP();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+        let ret = `import fs from "fs";
+import path from "path";
+import {dirname} from 'path';
+import {fileURLToPath} from 'url';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+import {initializeABAP} from "./init.mjs";
+import runtime from "@abaplint/runtime";
+
+async function run() {
+  await initializeABAP();
+  const unit = new runtime.UnitTestResult();
+  let clas;
+  let locl;
+  let meth;
 try {\n`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -47,8 +47,8 @@ try {\n`;
                         || def.methods.length === 0) {
                         continue;
                     }
-                    ret += `{
-const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
+                    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`;
                     for (const m of def.methods) {
@@ -76,24 +76,24 @@ locl = clas.addTestClass("${def.name}");\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());
-  throw e;
-}
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        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());
+  throw e;
+}
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
@@ -102,6 +102,11 @@ run().then(() => {
         // todo, some sorting might be required? eg. a class constructor using constant from interface?
         // temporary sorting: by filename
         const list = [];
+        for (const obj of reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.Table) {
+                list.push(`await import("./${obj.getName().toLowerCase()}.tabl.mjs");`);
+            }
+        }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.FunctionGroup) {
                 for (const m of obj.getModules()) {

package/build/src/validation.d.ts

@@ -1,5 +1,5 @@
 import { Issue, IRegistry, IConfig } from "@abaplint/core";
-import { ITranspilerOptions } from ".";
+import { ITranspilerOptions } from "./types";
 export declare const config: IConfig;
 export declare class Validation {
     private readonly options;

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "1.7.14",
-  "description": "Transpiler",
-  "main": "build/src/index.js",
-  "typings": "build/src/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/abaplint/transpiler.git"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
-    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
-    "test": "npm run compile && mocha"
-  },
-  "mocha": {
-    "recursive": true,
-    "reporter": "progress",
-    "spec": "build/test/**/*.js",
-    "require": "source-map-support/register"
-  },
-  "keywords": [
-    "ABAP",
-    "abaplint"
-  ],
-  "author": "abaplint",
-  "license": "MIT",
-  "dependencies": {
-    "@abaplint/core": "^2.83.23",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.0.0",
-    "chai": "^4.3.4",
-    "mocha": "^9.1.3",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.5.4"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "1.7.18",
+  "description": "Transpiler",
+  "main": "build/src/index.js",
+  "typings": "build/src/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/abaplint/transpiler.git"
+  },
+  "scripts": {
+    "compile": "tsc",
+    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
+    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
+    "test": "npm run compile && mocha"
+  },
+  "mocha": {
+    "recursive": true,
+    "reporter": "progress",
+    "spec": "build/test/**/*.js",
+    "require": "source-map-support/register"
+  },
+  "keywords": [
+    "ABAP",
+    "abaplint"
+  ],
+  "author": "abaplint",
+  "license": "MIT",
+  "dependencies": {
+    "@abaplint/core": "^2.83.23",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.0.0",
+    "chai": "^4.3.4",
+    "mocha": "^9.1.4",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.5.4"
+  }
+}