npm - @abaplint/transpiler - Versions diffs - 2.1.33 → 2.1.36 - Mend

@abaplint/transpiler 2.1.33 → 2.1.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/build/src/statements/assign.js +33 -6
package/build/src/statements/class_implementation.js +3 -1
package/build/src/structures/class_definition.js +1 -0
package/build/src/structures/interface.js +3 -1
package/build/src/transpile_types.js +14 -2
package/package.json +2 -2

package/build/src/statements/assign.js CHANGED Viewed

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssignTranspiler = void 0;
+/* eslint-disable max-len */
 const abaplint = require("@abaplint/core");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class AssignTranspiler {
     transpile(node, traversal) {
-        var _a, _b;
-        const sources = node.findDirectExpressions(abaplint.Expressions.Source).map(e => new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode());
+        var _a, _b, _c;
+        const assignSource = node.findDirectExpression(abaplint.Expressions.AssignSource);
+        const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressions(abaplint.Expressions.Source).map(e => new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode())) || [];
         const fs = new expressions_1.FieldSymbolTranspiler().transpile(node.findDirectExpression(abaplint.Expressions.FSTarget), traversal).getCode();
         const options = [];
         const concat = node.concatTokens().toUpperCase();
@@ -19,17 +21,42 @@ class AssignTranspiler {
             options.push("source: " + sources.pop());
         }
         else {
-            let dynamic = (_a = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(abaplint.Expressions.ConstantString);
+            let dynamicName = "";
+            for (const c of (assignSource === null || assignSource === void 0 ? void 0 : assignSource.getChildren()) || []) {
+                if (c instanceof abaplint.Nodes.ExpressionNode
+                    && c.get() instanceof abaplint.Expressions.Dynamic
+                    && c.findFirstExpression(abaplint.Expressions.ConstantString)) {
+                    if (dynamicName !== "") {
+                        dynamicName += " + ";
+                    }
+                    dynamicName += (_a = c.findFirstExpression(abaplint.Expressions.ConstantString)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
+                }
+                else if (c instanceof abaplint.Nodes.ExpressionNode
+                    && c.get() instanceof abaplint.Expressions.Dynamic
+                    && c.findDirectExpression(abaplint.Expressions.FieldChain)) {
+                    if (dynamicName !== "") {
+                        dynamicName += " + ";
+                    }
+                    dynamicName += new expressions_1.FieldChainTranspiler(true).transpile(c.findDirectExpression(abaplint.Expressions.FieldChain), traversal).getCode();
+                }
+                else if (c.concatTokens() === "(" || c.concatTokens() === ")") {
+                    continue;
+                }
+                else if (c.concatTokens() === "=>" || c.concatTokens() === "->") {
+                    dynamicName += " + '" + c.concatTokens() + "'";
+                }
+            }
+            options.push(`dynamicName: ` + dynamicName);
+            // dynamicSource is the first part only
+            let dynamic = (_b = assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.ConstantString);
             if (dynamic) {
-                options.push(`dynamicText: ` + dynamic.getFirstToken().getStr());
                 const s = dynamic.getFirstToken().getStr().toLowerCase().match(/\w+/);
                 options.push(`dynamicSource: (() => {try { return ${s}; } catch {}})()`);
             }
             else {
-                dynamic = (_b = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.FieldChain);
+                dynamic = (_c = assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _c === void 0 ? void 0 : _c.findFirstExpression(abaplint.Expressions.FieldChain);
                 if (dynamic) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(dynamic, traversal).getCode();
-                    options.push(`dynamicText: ` + code);
                     options.push(`dynamicSource: (() => {try { return eval(${code}.toLowerCase().match(/\\w+/)[0]); } catch {}})()`);
                 }
             }

package/build/src/statements/class_implementation.js CHANGED Viewed

@@ -17,7 +17,9 @@ class ClassImplementationTranspiler {
         else if (def === null || def === void 0 ? void 0 : def.getSuperClass()) {
             ret += " extends " + ((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
         }
-        return new chunk_1.Chunk().append(ret + " {", node, traversal);
+        return new chunk_1.Chunk().append(ret + ` {
+static INTERNAL_TYPE = 'CLAS';
+static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];`, node, traversal);
     }
 }
 exports.ClassImplementationTranspiler = ClassImplementationTranspiler;

package/build/src/structures/class_definition.js CHANGED Viewed

@@ -22,6 +22,7 @@ class ClassDefinitionTranspiler {
             // its an abstract class with only abstract methods
             return new chunk_1.Chunk(`
 class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
+  static INTERNAL_TYPE = 'CLAS';
   async constructor_() {
     this.me = new abap.types.ABAPObject();
     this.me.set(this);

package/build/src/structures/interface.js CHANGED Viewed

@@ -12,14 +12,16 @@ class InterfaceTranspiler {
         let ret = "";
         let name;
         for (const c of node.getChildren()) {
+            const def = traversal.getInterfaceDefinition(node.getFirstToken());
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Interface) {
                 name = (_a = c.findDirectExpression(abaplint.Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toLowerCase();
                 name = traversal_1.Traversal.escapeClassName(name);
                 ret += `class ${name} {\n`;
+                ret += `static INTERNAL_TYPE = 'INTF';\n`;
+                ret += `static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];\n`;
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {
                 ret += "}\n";
-                const def = traversal.getInterfaceDefinition(node.getFirstToken());
                 ret += traversal.registerClassOrInterface(def);
             }
         }

package/build/src/transpile_types.js CHANGED Viewed

@@ -8,7 +8,7 @@ class TranspileTypes {
         return "let " + t.getName().toLowerCase() + " = " + this.toType(type) + ";";
     }
     toType(type) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let resolved = "";
         let extra = "";
         if (type instanceof abaplint.BasicTypes.ObjectReferenceType
@@ -96,9 +96,15 @@ class TranspileTypes {
         }
         else if (type instanceof abaplint.BasicTypes.NumericType) {
             resolved = "Numc";
-            if (type.getLength() !== 1) {
+            if (type.getQualifiedName() && type.getLength() !== 1) {
+                extra = "{length: " + type.getLength() + ", qualifiedName: \"" + type.getQualifiedName() + "\"}";
+            }
+            else if (type.getLength() !== 1) {
                 extra = "{length: " + type.getLength() + "}";
             }
+            else if (type.getQualifiedName()) {
+                extra = "{qualifiedName: \"" + type.getQualifiedName() + "\"}";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.PackedType) {
             resolved = "Packed";
@@ -131,9 +137,15 @@ class TranspileTypes {
         }
         else if (type instanceof abaplint.BasicTypes.FloatType) {
             resolved = "Float";
+            if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + ((_h = type.getQualifiedName()) === null || _h === void 0 ? void 0 : _h.toUpperCase()) + "\"}";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.FloatingPointType) {
             resolved = "Float";
+            if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + ((_j = type.getQualifiedName()) === null || _j === void 0 ? void 0 : _j.toUpperCase()) + "\"}";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {
             resolved = "DecFloat34";

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.1.33",
+  "version": "2.1.36",
   "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.91.28",
+    "@abaplint/core": "^2.91.30",
     "source-map": "^0.7.4"
   },
   "devDependencies": {