@abaplint/transpiler 2.3.102 → 2.3.104

package/build/src/db/sqlite_database_schema.js

@@ -52,16 +52,20 @@ class SQLiteDatabaseSchema {
             return "";
         }
         const fields = [];
+        const fieldsRaw = [];
         for (const field of type.getComponents()) {
             if (field.type instanceof abaplint.BasicTypes.StructureType) {
                 // is a GROUP NAME
                 continue;
             }
+            fieldsRaw.push(field.name.toLowerCase());
             fields.push("'" + field.name.toLowerCase() + "' " + this.toType(field.type, field.name, tabl.getName()));
         }
         // assumption: all transparent tables have primary keys
         // add single quotes to field names to allow for keywords as field names
-        const key = ", PRIMARY KEY(" + tabl.listKeys(this.reg).map(e => "'" + e.toLowerCase() + "'").join(",") + ")";
+        const key = ", PRIMARY KEY(" + tabl.listKeys(this.reg)
+            .filter(e => fieldsRaw.includes(e.toLowerCase()))
+            .map(e => "'" + e.toLowerCase() + "'").join(",") + ")";
         return `CREATE TABLE '${tabl.getName().toLowerCase()}' (${fields.join(", ")}${key});\n`;
     }
     toType(type, fieldname, errorInfo) {

package/build/src/expressions/field_length.js

@@ -2,28 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldLengthTranspiler = void 0;
 const core_1 = require("@abaplint/core");
-const field_symbol_1 = require("./field_symbol");
 const chunk_1 = require("../chunk");
+const field_chain_1 = require("./field_chain");
 class FieldLengthTranspiler {
     transpile(node, traversal) {
         let ret = "";
         for (const c of node.getChildren()) {
             if (c instanceof core_1.Nodes.ExpressionNode) {
-                if (c.get() instanceof core_1.Expressions.SourceField) {
-                    let sourceStr = c.getFirstToken().getStr();
-                    if (sourceStr === "sy") {
-                        sourceStr = "abap.builtin.sy";
-                    }
-                    ret += sourceStr;
-                }
-                else if (c.get() instanceof core_1.Expressions.SourceFieldSymbol) {
-                    ret += new field_symbol_1.FieldSymbolTranspiler().transpile(c, traversal).getCode();
-                }
-                else if (c.get() instanceof core_1.Expressions.ArrowOrDash) {
-                    ret += ".get().";
-                }
-                else if (c.get() instanceof core_1.Expressions.ComponentName) {
-                    ret += c.getFirstToken().getStr();
+                if (c.get() instanceof core_1.Expressions.SimpleFieldChain2) {
+                    ret = new field_chain_1.FieldChainTranspiler().transpile(c, traversal).getCode();
                 }
             }
             else if (c instanceof core_1.Nodes.TokenNode) {

package/build/src/expressions/field_offset.js

@@ -2,34 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldOffsetTranspiler = void 0;
 const core_1 = require("@abaplint/core");
-const field_symbol_1 = require("./field_symbol");
 const chunk_1 = require("../chunk");
+const field_chain_1 = require("./field_chain");
 class FieldOffsetTranspiler {
     transpile(node, traversal) {
         let ret = "";
         for (const c of node.getChildren()) {
             if (c instanceof core_1.Nodes.ExpressionNode) {
-                if (c.get() instanceof core_1.Expressions.SourceField) {
-                    let sourceStr = c.getFirstToken().getStr().toLowerCase();
-                    if (sourceStr === "sy") {
-                        sourceStr = "abap.builtin.sy";
-                    }
-                    ret += sourceStr;
-                }
-                else if (c.get() instanceof core_1.Expressions.SourceFieldSymbol) {
-                    ret += new field_symbol_1.FieldSymbolTranspiler().transpile(c, traversal).getCode();
-                }
-                else if (c.get() instanceof core_1.Expressions.ArrowOrDash) {
-                    ret += ".get()";
-                }
-                else if (c.get() instanceof core_1.Expressions.ComponentName) {
-                    const name = c.getFirstToken().getStr().toLowerCase();
-                    if (name.match(/^\d/)) {
-                        ret += `["` + name + `"]`;
-                    }
-                    else {
-                        ret += `.` + name;
-                    }
+                if (c.get() instanceof core_1.Expressions.SimpleFieldChain2) {
+                    ret = new field_chain_1.FieldChainTranspiler().transpile(c, traversal).getCode();
                 }
             }
             else if (c instanceof core_1.Nodes.TokenNode) {

package/build/src/statements/method_implementation.js

@@ -14,7 +14,7 @@ class MethodImplementationTranspiler {
         let methodName = token.getStr();
         const scope = traversal.findCurrentScopeByToken(token);
         if (scope === undefined) {
-            throw new Error("MethodTranspiler, scope not found, " + methodName);
+            throw new Error("MethodTranspiler, scope not found, " + methodName + ", " + traversal.getFilename());
         }
         else if (scope.getIdentifier().sname !== methodName) {
             throw new Error("MethodTranspiler, wrong scope found, " + scope.getIdentifier().sname);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.3.102",
+  "version": "2.3.104",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.94.14",
+    "@abaplint/core": "^2.94.18",
     "source-map": "^0.7.4"
   },
   "devDependencies": {