@abaplint/transpiler 2.0.8 → 2.0.11

package/README.md

@@ -1,3 +1,3 @@
-# @abaplint/transpiler
-
+# @abaplint/transpiler
+
 Transpiler

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

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

package/build/src/expressions/simple_source3.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleSource3Transpiler = void 0;
 const source_1 = require("./source");
 class SimpleSource3Transpiler {
+    constructor(addGet = false) {
+        this.addGet = addGet;
+    }
     transpile(node, traversal) {
-        return new source_1.SourceTranspiler().transpile(node, traversal);
+        return new source_1.SourceTranspiler(this.addGet).transpile(node, traversal);
     }
 }
 exports.SimpleSource3Transpiler = SimpleSource3Transpiler;

package/build/src/handle_data_element.js

@@ -18,11 +18,11 @@ class HandleDataElement {
                 fixedValues = doma.getFixedValues();
             }
         }
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "DTEL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "domain": ${JSON.stringify(obj.getDomainName())},
-  "fixedValues": ${JSON.stringify(fixedValues)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "DTEL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "domain": ${JSON.stringify(obj.getDomainName())},
+  "fixedValues": ${JSON.stringify(fixedValues)},
 };`);
         const output = {
             object: {

package/build/src/handle_table.js

@@ -12,10 +12,10 @@ class HandleTable {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TABL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "keyFields": ${JSON.stringify(obj.listKeys())},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TABL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "keyFields": ${JSON.stringify(obj.listKeys())},
 };`);
         const output = {
             object: {

package/build/src/handle_table_type.js

@@ -11,9 +11,9 @@ class HandleTableType {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TTYP",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TTYP",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         const output = {
             object: {

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

@@ -5,13 +5,24 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class MoveTranspiler {
     transpile(node, traversal) {
+        var _a;
         const source = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Source));
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
-        const ret = new chunk_1.Chunk()
-            .appendChunk(target)
-            .appendString(".set(")
-            .appendChunk(source)
-            .append(");", node.getLastToken(), traversal);
+        const ret = new chunk_1.Chunk();
+        const second = (_a = node.getChildren()[1]) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        if (second === "?=") {
+            ret.appendString("await abap.statements.cast(")
+                .appendChunk(target)
+                .appendString(", ")
+                .appendChunk(source)
+                .append(");", node.getLastToken(), traversal);
+        }
+        else {
+            ret.appendChunk(target)
+                .appendString(".set(")
+                .appendChunk(source)
+                .append(");", node.getLastToken(), traversal);
+        }
         return ret;
     }
 }

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

@@ -4,4 +4,6 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class SelectTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    private findKeys;
+    private concatCond;
 }

package/build/src/statements/select.js

@@ -13,7 +13,7 @@ class SelectTranspiler {
         select += ((_b = node.findFirstExpression(abaplint.Expressions.SQLFrom)) === null || _b === void 0 ? void 0 : _b.concatTokens()) + " ";
         const where = node.findFirstExpression(abaplint.Expressions.SQLCond);
         if (where) {
-            select += "WHERE " + where.concatTokens() + " ";
+            select += "WHERE " + this.concatCond(where, traversal) + " ";
         }
         const orderBy = node.findFirstExpression(abaplint.Expressions.SQLOrderBy);
         if (orderBy) {
@@ -34,7 +34,40 @@ class SelectTranspiler {
         if (node.concatTokens().toUpperCase().startsWith("SELECT SINGLE ")) {
             select += "UP TO 1 ROWS";
         }
-        return new chunk_1.Chunk().append(`await abap.statements.select(${target}, {select: "${select.trim()}"});`, node, traversal);
+        const keys = this.findKeys(node, traversal);
+        let primaryKey = "";
+        if (keys.length > 0) {
+            primaryKey = `, primaryKey: ${JSON.stringify(keys)}`;
+        }
+        return new chunk_1.Chunk().append(`await abap.statements.select(${target}, {select: "${select.trim()}"${primaryKey}});`, node, traversal);
+    }
+    findKeys(node, traversal) {
+        let keys = [];
+        const from = node.findAllExpressions(abaplint.Expressions.SQLFromSource).map(e => e.concatTokens());
+        if (from.length === 1) {
+            const tabl = traversal.findTable(from[0]);
+            if (tabl) {
+                keys = tabl.listKeys().map(k => k.toLowerCase());
+            }
+        }
+        return keys;
+    }
+    concatCond(cond, traversal) {
+        let ret = "";
+        for (const c of cond.getChildren()) {
+            if (c.get() instanceof abaplint.Expressions.SimpleSource3
+                && c instanceof abaplint.Nodes.ExpressionNode
+                && c.findDirectExpression(abaplint.Expressions.Constant) === undefined) {
+                ret += " '\" + " + new expressions_1.SimpleSource3Transpiler(true).transpile(c, traversal).getCode() + " + \"'";
+            }
+            else if (c instanceof abaplint.Nodes.ExpressionNode) {
+                ret += " " + this.concatCond(c, traversal);
+            }
+            else {
+                ret += " " + c.concatTokens();
+            }
+        }
+        return ret.trim();
     }
 }
 exports.SelectTranspiler = SelectTranspiler;

package/build/src/statements/wait.js

@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaitTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class WaitTranspiler {
     transpile(node, traversal) {
+        const options = [];
+        const seconds = node.findExpressionAfterToken("TO");
+        if (seconds) {
+            options.push("seconds: " + traversal.traverse(seconds).getCode());
+        }
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes(" FOR PUSH CHANNELS ") === false) {
-            return new chunk_1.Chunk().appendString("WAIT_TODO");
+        if (concat.includes(" UNTIL ") === false && seconds) {
+            const sec = new expressions_1.SourceTranspiler(true).transpile(seconds, traversal).getCode();
+            return new chunk_1.Chunk().appendString(`await new Promise(r => setTimeout(r, ${sec} * 1000));`);
         }
         const lookup = traversal.lookupClassOrInterface("KERNEL_PUSH_CHANNELS", node.getFirstToken());
-        const options = [];
         const cond = node.findFirstExpression(abaplint.Expressions.Cond);
         if (cond) {
             options.push("cond: " + traversal.traverse(cond).getCode());
         }
-        const seconds = node.findExpressionAfterToken("TO");
-        if (seconds) {
-            options.push("seconds: " + traversal.traverse(seconds).getCode());
-        }
         const call = `await ${lookup}.wait({${options.join(",")}});`;
         return new chunk_1.Chunk().append(`if (${lookup} === undefined) throw new Error("Wait, kernel class missing");\n${call}`, node, traversal);
     }

package/build/src/structures/interface.js

@@ -60,6 +60,9 @@ class InterfaceTranspiler {
                 const a = val;
                 for (const v of Object.keys(val)) {
                     const s = a[v];
+                    if (s === undefined) {
+                        continue;
+                    }
                     ret += name + ".get()." + v + ".set(" + s + ");\n";
                 }
             }

package/build/src/transpile_types.js

@@ -8,11 +8,15 @@ class TranspileTypes {
         return "let " + t.getName().toLowerCase() + " = " + this.toType(type) + ";";
     }
     toType(type) {
+        var _a;
         let resolved = "";
         let extra = "";
         if (type instanceof abaplint.BasicTypes.ObjectReferenceType
             || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
             resolved = "ABAPObject";
+            if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + ((_a = type.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) + "\"}";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.TableType) {
             resolved = "Table";

package/build/src/traversal.d.ts

@@ -32,6 +32,7 @@ export declare class Traversal {
     private findReadOrWriteReference;
     buildConstructorContents(scope: abaplint.ISpaghettiScopeNode | undefined, def: abaplint.IClassDefinition, inputName: string): string;
     findInterfaceDefinition(name: string, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.IInterfaceDefinition | undefined;
+    findTable(name: string): abaplint.Objects.Table | undefined;
     findClassDefinition(name: string, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.IClassDefinition | undefined;
     private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;

package/build/src/traversal.js

@@ -289,6 +289,10 @@ class Traversal {
         }
         return intf;
     }
+    findTable(name) {
+        const tabl = this.reg.getObject("TABL", name);
+        return tabl;
+    }
     findClassDefinition(name, scope) {
         let clas = scope === null || scope === void 0 ? void 0 : scope.findClassDefinition(name);
         if (clas === undefined) {

package/build/src/unit_test.js

@@ -6,11 +6,11 @@ const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this method somewhere else, its much more than just unit test relevant
     initializationScript(reg, dbSetup, extraSetup) {
-        let ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
-
+        let ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = \`${dbSetup.schemas.sqlite}\`;\n`;
         ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
@@ -28,19 +28,19 @@ export async function initializeABAP() {\n`;
         return ret;
     }
     unitTestScriptOpen(reg, _skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
-  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
-  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30}), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
+  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
+  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30}), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
 `;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -60,44 +60,44 @@ async function run() {
                         if (m.isForTesting === false) {
                             continue;
                         }
-                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
-  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
-  ls_input.get().method_name.set("${m.name.toUpperCase()}");
+                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
+  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
+  ls_input.get().method_name.set("${m.name.toUpperCase()}");
   abap.statements.append({source: ls_input, target: lt_input});`;
                     }
                 }
             }
         }
-        ret += `
-
-  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
-  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `
+
+  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
+  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
     unitTestScript(reg, skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-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;
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+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`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -111,9 +111,9 @@ async function run() {
                         // todo, fix, there might be global test methods
                         continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
-      locl = clas.addTestClass("${def.name}");
+                    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) {
@@ -140,24 +140,24 @@ async function run() {
                 }
             }
         }
-        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;
     }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "2.0.8",
-  "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:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
-    "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.88.10",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.0",
-    "chai": "^4.3.6",
-    "mocha": "^9.2.2",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.6.3"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.0.11",
+  "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:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
+    "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.89.12",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.1",
+    "@types/mocha": "^9.1.1",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.2",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.6.3"
+  }
+}