@abaplint/transpiler 2.10.50 → 2.10.52

package/build/src/initialization.js

@@ -13,16 +13,16 @@ class Initialization {
         let ret = "";
         if (useImport === true) {
             ret = `/* eslint-disable import/newline-after-import */
-  import "./_top.mjs";\n`;
+import "./_top.mjs";\n`;
         }
         else {
             ret = `/* eslint-disable import/newline-after-import */
-  import runtime from "@abaplint/runtime";
-  globalThis.abap = new runtime.ABAP();\n`;
+import runtime from "@abaplint/runtime";
+globalThis.abap = new runtime.ABAP();\n`;
         }
         ret += `${this.buildImports(reg, useImport)}
 
-  export async function initializeABAP() {\n`;
+export async function initializeABAP() {\n`;
         ret += `  const sqlite = [];\n`;
         for (const i of dbSetup.schemas.sqlite) {
             ret += `  sqlite.push(\`${i}\`);\n`;
@@ -80,21 +80,18 @@ class Initialization {
             }
         }
         for (const obj of reg.getObjects()) {
-            if (obj instanceof abaplint.Objects.FunctionGroup) {
-                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.fugr`));
+            const name = imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`);
+            if (obj instanceof abaplint.Objects.Class
+                && obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
+                && this.hasClassConstructor(reg, obj)) {
+                // this will not solve all problems with class constructors 100%, but probably good enough
+                late.push(name);
             }
-            else if (obj instanceof abaplint.Objects.Class) {
-                if (obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
-                    && this.hasClassConstructor(reg, obj)) {
-                    // this will not solve all problems with class constors 100%, but probably good enough
-                    late.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
-                }
-                else {
-                    list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
-                }
-            }
-            else if (obj instanceof abaplint.Objects.Interface) {
-                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+            else if (obj instanceof abaplint.Objects.Interface
+                || obj instanceof abaplint.Objects.FunctionGroup
+                || obj instanceof abaplint.Objects.Program
+                || obj instanceof abaplint.Objects.Class) {
+                list.push(name);
             }
         }
         return [...list.sort(), ...late].join("\n");

package/build/src/statements/assign.js

@@ -60,34 +60,35 @@ class AssignTranspiler {
                 if (firstFirst?.get() instanceof abaplint.Expressions.Constant) {
                     const s = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/)?.toString();
                     options.push(`dynamicSource: (() => {
-            try { return ${s}; } catch {}
-            try { return this.${s}; } catch {}
-          })()`);
+  try { return ${s}; } catch {}
+  try { return this.${s}; } catch {}
+})()`);
                 }
                 else if (firstFirst?.get() instanceof abaplint.Expressions.FieldChain && firstFirst instanceof abaplint.Nodes.ExpressionNode) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(firstFirst, traversal).getCode();
                     options.push(`dynamicSource: (() => {
-            const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
-            try { return eval(name); } catch {}
-            try { return eval("this." + name); } catch {}
-          })()`);
+  const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
+  try { return eval(name); } catch {}
+  try { return eval("this." + name); } catch {}
+})()`);
                 }
             }
             else if (first?.get() instanceof abaplint.Expressions.Source && first instanceof abaplint.Nodes.ExpressionNode) {
                 //        const name = first.concatTokens().toLowerCase();
                 const name = new expressions_1.SourceTranspiler().transpile(first, traversal).getCode();
                 options.push(`dynamicSource: (() => {
-          try { return ${name}; } catch {}
-          try { return this.${name}; } catch {}
-        })()`);
+  try { return ${name}; } catch {}
+  try { return this.${name}; } catch {}
+})()`);
             }
         }
         if (concat.endsWith(" CASTING.") || concat.includes(" CASTING TYPE ")) {
             options.push("casting: true");
         }
-        return new chunk_1.Chunk().append("abap.statements.assign({", node, traversal)
+        const ret = new chunk_1.Chunk().append("abap.statements.assign({", node, traversal)
             .appendString(options.join(", "))
             .append("});", node.getLastToken(), traversal);
+        return ret;
     }
 }
 exports.AssignTranspiler = AssignTranspiler;

package/build/src/statements/call_function.js

@@ -45,8 +45,8 @@ class CallFunctionTranspiler {
         else {
             const illegalFunc = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_FUNC'", node.getFirstToken(), true);
             const call = `abap.FunctionModules[${fmname}]`;
-            ret.appendString(`if (${call} === undefined && ${illegalFunc} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_FUNC not found"; }\n`);
-            ret.appendString(`if (${call} === undefined) { throw new ${illegalFunc}(); }\n`);
+            // eslint-disable-next-line max-len
+            ret.appendString(`if (${call} === undefined) { if (${illegalFunc} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_FUNC not found"; } else { throw new ${illegalFunc}();} }\n`);
             ret.appendString(`await ${call}(${param});`);
         }
         if (exceptions) {

package/build/src/statements/perform.js

@@ -11,47 +11,67 @@ class PerformTranspiler {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler FormName not found");`);
         }
         else if (node.concatTokens().toUpperCase().includes(" IN PROGRAM ")) {
-            return new chunk_1.Chunk(`throw new Error("PerformTranspiler IN PROGRAM, transpiler todo");`);
-        }
-        let def = undefined;
-        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
-        for (const r of scope?.getData().references || []) {
-            if (r.referenceType === abaplint.ReferenceType.FormReference
-                && r.position.getStart().equals(formName.getFirstToken().getStart())
-                && r.resolved instanceof abaplint.Types.FormDefinition) {
-                def = r.resolved;
+            // todo: throw exception if not found?
+            const expression = node.findExpressionAfterToken("PROGRAM");
+            let ref = "";
+            if (expression?.get() instanceof abaplint.Expressions.Dynamic) {
+                const name = expression.getChildren()[1].concatTokens() + ".get().trimEnd()";
+                ref = `abap.Forms['PROG-' + ${name} + '-${formName.concatTokens().toUpperCase()}']`;
             }
-        }
-        // todo: pass by VALUE()
-        const params = [];
-        let index = 0;
-        for (const t of node.findDirectExpression(abaplint.Expressions.PerformTables)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
-            const name = def?.getTablesParameters()[index].getName().toLowerCase();
-            if (name === undefined) {
-                continue;
+            else {
+                const progName = expression?.concatTokens().toUpperCase();
+                ref = `abap.Forms['PROG-${progName}-${formName.concatTokens().toUpperCase()}']`;
             }
-            params.push(`"${name}": ` + traversal.traverse(t).getCode());
-            index++;
-        }
-        index = 0;
-        for (const u of node.findDirectExpression(abaplint.Expressions.PerformUsing)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
-            const name = def?.getUsingParameters()[index].getName().toLowerCase();
-            if (name === undefined) {
-                continue;
+            const params = [];
+            // hacky hack
+            for (const t of node.findDirectExpression(abaplint.Expressions.PerformChanging)?.findDirectExpressions(abaplint.Expressions.Target) || []) {
+                const name = t.getFirstToken().getStr();
+                params.push(`"${name}": ` + traversal.traverse(t).getCode());
             }
-            params.push(`"${name}": ` + traversal.traverse(u).getCode());
-            index++;
+            return new chunk_1.Chunk("await " + ref + `({${params.join(",")}});`);
         }
-        index = 0;
-        for (const c of node.findDirectExpression(abaplint.Expressions.PerformChanging)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
-            const name = def?.getChangingParameters()[index].getName().toLowerCase();
-            if (name === undefined) {
-                continue;
+        else {
+            // todo: most of this needs rewriting?
+            let def = undefined;
+            const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
+            for (const r of scope?.getData().references || []) {
+                if (r.referenceType === abaplint.ReferenceType.FormReference
+                    && r.position.getStart().equals(formName.getFirstToken().getStart())
+                    && r.resolved instanceof abaplint.Types.FormDefinition) {
+                    def = r.resolved;
+                }
+            }
+            // todo: pass by VALUE()
+            const params = [];
+            let index = 0;
+            for (const t of node.findDirectExpression(abaplint.Expressions.PerformTables)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
+                const name = def?.getTablesParameters()[index].getName().toLowerCase();
+                if (name === undefined) {
+                    continue;
+                }
+                params.push(`"${name}": ` + traversal.traverse(t).getCode());
+                index++;
+            }
+            index = 0;
+            for (const u of node.findDirectExpression(abaplint.Expressions.PerformUsing)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
+                const name = def?.getUsingParameters()[index].getName().toLowerCase();
+                if (name === undefined) {
+                    continue;
+                }
+                params.push(`"${name}": ` + traversal.traverse(u).getCode());
+                index++;
+            }
+            index = 0;
+            for (const c of node.findDirectExpression(abaplint.Expressions.PerformChanging)?.findDirectExpressions(abaplint.Expressions.Source) || []) {
+                const name = def?.getChangingParameters()[index].getName().toLowerCase();
+                if (name === undefined) {
+                    continue;
+                }
+                params.push(`"${name}": ` + traversal.traverse(c).getCode());
+                index++;
             }
-            params.push(`"${name}": ` + traversal.traverse(c).getCode());
-            index++;
+            return new chunk_1.Chunk("await " + formName.concatTokens() + `({${params.join(",")}});`);
         }
-        return new chunk_1.Chunk("await " + formName.concatTokens() + `({${params.join(",")}});`);
     }
 }
 exports.PerformTranspiler = PerformTranspiler;

package/build/src/structures/form.d.ts

@@ -0,0 +1,7 @@
+import * as abaplint from "@abaplint/core";
+import { IStructureTranspiler } from "./_structure_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class FormTranspiler implements IStructureTranspiler {
+    transpile(node: abaplint.Nodes.StructureNode, traversal: Traversal): Chunk;
+}

package/build/src/structures/form.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+class FormTranspiler {
+    transpile(node, traversal) {
+        const formName = node.findFirstStatement(abaplint.Statements.Form)
+            ?.findDirectExpression(abaplint.Expressions.FormName)?.concatTokens()?.toUpperCase();
+        const ret = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            ret.appendChunk(traversal.traverse(c));
+        }
+        if (formName && traversal.getCurrentObject().getType() === "PROG") {
+            ret.appendString(`abap.Forms['PROG-${traversal.getCurrentObject().getName().toUpperCase()}-${formName}'] = ${formName?.toLowerCase()};`);
+        }
+        return ret;
+    }
+}
+exports.FormTranspiler = FormTranspiler;
+//# sourceMappingURL=form.js.map

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

@@ -17,3 +17,4 @@ export * from "./try";
 export * from "./types";
 export * from "./when";
 export * from "./while";
+export * from "./form";

package/build/src/structures/index.js

@@ -33,4 +33,5 @@ __exportStar(require("./try"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./when"), exports);
 __exportStar(require("./while"), exports);
+__exportStar(require("./form"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/transpile_types.js

@@ -91,7 +91,7 @@ class TranspileTypes {
                     asInclude[c.name.toLowerCase()] = true;
                 }
             }
-            extra = "{" + list.join(", ") + "}";
+            extra = "{\n" + list.join(",\n") + "}";
             if (type.getQualifiedName() !== undefined) {
                 extra += ", \"" + type.getQualifiedName() + "\"";
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.50",
+  "version": "2.10.52",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",