@abaplint/transpiler 1.7.28 → 1.7.32

package/build/src/database_setup.js

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

package/build/src/expressions/call_transformation_parameters.js

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

package/build/src/expressions/method_source.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodSourceTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const _1 = require(".");
 class MethodSourceTranspiler {
     constructor(prepend) {
         this.prepend = (prepend || "") + "await ";
@@ -18,8 +19,17 @@ class MethodSourceTranspiler {
             }
             else if (child.get() instanceof core_1.Expressions.Dynamic && (nextChild === null || nextChild === void 0 ? void 0 : nextChild.concatTokens()) === "=>") {
                 const second = child.getChildren()[1];
-                if (second.get() instanceof core_1.Expressions.FieldChain) {
-                    ret.appendChunk(traversal.traverse(second));
+                if (second.get() instanceof core_1.Expressions.FieldChain && second instanceof core_1.Nodes.ExpressionNode) {
+                    const t = new _1.FieldChainTranspiler(true).transpile(second, traversal).getCode();
+                    const lookup = traversal.lookupClassOrInterface(t, child.getFirstToken(), true);
+                    const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
+                    // 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 if (second.get() instanceof core_1.Expressions.Constant) {
                     const lookup = traversal.lookupClassOrInterface(second.getFirstToken().getStr(), child.getFirstToken(), true);

package/build/src/statements/call_transformation.js

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

package/build/src/unit_test.js

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

package/build/src/validation.js

@@ -28,7 +28,7 @@ exports.config = {
         },
         "parser_error": true,
         "allowed_object_types": {
-            "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "XSLT", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
+            "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "XSLT", "SICF", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
         },
         "exit_or_check": {
             "allowCheck": true,

package/package.json

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