@abaplint/transpiler 2.13.1 → 2.13.3

package/build/src/db/populate_tables.js

@@ -77,9 +77,11 @@ class PopulateTables {
                 else if (parameter.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
                     pardecltyp = "1";
                 }
-                const paroptionl = optionalParameters.includes(parameter.getName()) ? "X" : " ";
+                const name = parameter.getName().toUpperCase();
+                const paroptionl = (optionalParameters.some(o => o.toUpperCase() === name) || method.getParameters().getParameterDefault(name) !== undefined) ? "X" : " ";
                 const type = parameter.getType().getQualifiedName()?.toUpperCase() || "";
-                ret.push(`INSERT INTO "seosubcodf" ("clsname", "cmpname", "sconame", "version", "editorder", "pardecltyp", "type", "paroptionl") VALUES ('${obj.getName()}', '${method.getName().toUpperCase()}', '${parameter.getName().toUpperCase()}', '1', ${editorder}, '${pardecltyp}', '${type}', '${paroptionl}');`);
+                const parvalue = method.getParameters().getParameterDefault(name)?.concatTokens() || "";
+                ret.push(`INSERT INTO "seosubcodf" ("clsname", "cmpname", "sconame", "version", "editorder", "pardecltyp", "type", "paroptionl", "parvalue") VALUES ('${obj.getName()}', '${method.getName().toUpperCase()}', '${name}', '1', ${editorder}, '${pardecltyp}', '${type}', '${paroptionl}', '${this.escape(parvalue)}');`);
             }
         }
         return ret;
@@ -90,9 +92,32 @@ class PopulateTables {
         if (def === undefined || !this.hasSEOSUBCOTX) {
             return [];
         }
+        const descriptions = [];
+        const xml = obj.getXML();
+        if (xml) {
+            const parsed = obj.parseRaw2();
+            const sub = parsed?.abapGit["asx:abap"]["asx:values"]?.DESCRIPTIONS?.SEOSUBCOTX;
+            if (sub) {
+                if (Array.isArray(sub)) {
+                    descriptions.push(...sub);
+                }
+                else {
+                    descriptions.push(sub);
+                }
+            }
+        }
         for (const method of def.getMethodDefinitions().getAll()) {
             for (const parameter of method.getParameters().getAll()) {
-                ret.push(`INSERT INTO "seosubcotx" ("clsname", "cmpname", "sconame", "langu", "descript") VALUES ('${obj.getName()}', '${method.getName().toUpperCase()}', '${parameter.getName().toUpperCase()}', 'E', 'todo');`);
+                const mName = method.getName().toUpperCase();
+                const pName = parameter.getName().toUpperCase();
+                let descript = "";
+                for (const d of descriptions) {
+                    if (d.CMPNAME?.toUpperCase() === mName && d.SCONAME?.toUpperCase() === pName) {
+                        descript = d.DESCRIPT || "";
+                        break;
+                    }
+                }
+                ret.push(`INSERT INTO "seosubcotx" ("clsname", "cmpname", "sconame", "langu", "descript") VALUES ('${obj.getName()}', '${mName}', '${pName}', 'E', '${this.escape(descript)}');`);
             }
         }
         return ret;

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

@@ -4,5 +4,6 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class DataTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    static findEnumDefault(scope: abaplint.ISpaghettiScopeNode, _enumType: abaplint.AbstractType): string | undefined;
     static buildValue(node: abaplint.Nodes.StatementNode, name: string, traversal: Traversal): string;
 }

package/build/src/statements/data.js

@@ -28,6 +28,13 @@ class DataTranspiler {
         else {
             value = DataTranspiler.buildValue(node, traversal_1.Traversal.prefixVariable(found.getName().toLowerCase()), traversal);
         }
+        // for enum types, initialize with the first enum value
+        if (found.getType() instanceof abaplint.BasicTypes.EnumType && value === "") {
+            const enumDefault = DataTranspiler.findEnumDefault(scope, found.getType());
+            if (enumDefault) {
+                value = "\n" + traversal_1.Traversal.prefixVariable(found.getName().toLowerCase()) + ".set(\"" + enumDefault + "\");";
+            }
+        }
         const ret = new chunk_1.Chunk()
             .appendString("let ")
             .appendString(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(found.getName().toLowerCase())))
@@ -36,6 +43,26 @@ class DataTranspiler {
             .appendString(value);
         return ret;
     }
+    static findEnumDefault(scope, _enumType) {
+        let current = scope;
+        while (current) {
+            const vars = current.getData().vars;
+            for (const key of Object.keys(vars)) {
+                const v = vars[key];
+                if (v.getMeta().includes("enum" /* abaplint.IdentifierMeta.Enum */)) {
+                    const structType = v.getType();
+                    if (structType instanceof abaplint.BasicTypes.StructureType) {
+                        const components = structType.getComponents();
+                        if (components.length > 0) {
+                            return components[0].name.toUpperCase();
+                        }
+                    }
+                }
+            }
+            current = current.getParent();
+        }
+        return undefined;
+    }
     static buildValue(node, name, traversal) {
         let value = "";
         const val = node.findFirstExpression(abaplint.Expressions.Value);

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

@@ -15,6 +15,7 @@ export * from "./module";
 export * from "./select";
 export * from "./method";
 export * from "./try";
+export * from "./type_enum";
 export * from "./types";
 export * from "./when";
 export * from "./while";

package/build/src/structures/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./module"), exports);
 __exportStar(require("./select"), exports);
 __exportStar(require("./method"), exports);
 __exportStar(require("./try"), exports);
+__exportStar(require("./type_enum"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./when"), exports);
 __exportStar(require("./while"), exports);

package/build/src/structures/type_enum.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 TypeEnumTranspiler implements IStructureTranspiler {
+    transpile(node: abaplint.Nodes.StructureNode, _traversal: Traversal): Chunk;
+}

package/build/src/structures/type_enum.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeEnumTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+const traversal_1 = require("../traversal");
+const chunk_1 = require("../chunk");
+class TypeEnumTranspiler {
+    transpile(node, _traversal) {
+        const begin = node.findDirectStatement(abaplint.Statements.TypeEnumBegin);
+        if (begin === undefined) {
+            return new chunk_1.Chunk("");
+        }
+        const nsNames = begin.findAllExpressions(abaplint.Expressions.NamespaceSimpleName);
+        if (nsNames.length < 2) {
+            return new chunk_1.Chunk("");
+        }
+        const structureName = nsNames[1].concatTokens().toLowerCase();
+        const values = [];
+        for (const t of node.findDirectStatements(abaplint.Statements.Type)) {
+            const name = t.findFirstExpression(abaplint.Expressions.NamespaceSimpleName);
+            if (name) {
+                values.push(name.concatTokens().toLowerCase());
+            }
+        }
+        const fields = values.map(v => `"${v}": new abap.types.String()`).join(",\n");
+        let ret = `let ${traversal_1.Traversal.prefixVariable(structureName)} = new abap.types.Structure({
+${fields}});\n`;
+        for (const v of values) {
+            ret += `${traversal_1.Traversal.prefixVariable(structureName)}.get().${v}.set("${v.toUpperCase()}");\n`;
+        }
+        return new chunk_1.Chunk(ret);
+    }
+}
+exports.TypeEnumTranspiler = TypeEnumTranspiler;
+//# sourceMappingURL=type_enum.js.map

package/build/src/transpile_types.js

@@ -176,9 +176,15 @@ class TranspileTypes {
         }
         else if (type instanceof abaplint.BasicTypes.HexType) {
             resolved = featureHexUInt8 ? "HexUInt8" : "Hex";
-            if (type.getLength() !== 1) {
+            if (type.getLength() !== 1 && type.getQualifiedName() !== undefined) {
+                extra = "{length: " + type.getLength() + ", qualifiedName: \"" + type.getQualifiedName()?.toUpperCase() + "\"}";
+            }
+            else if (type.getLength() !== 1) {
                 extra = "{length: " + type.getLength() + "}";
             }
+            else if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + type.getQualifiedName()?.toUpperCase() + "\"}";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.FloatType) {
             resolved = "Float";
@@ -195,6 +201,12 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {
             resolved = "DecFloat34";
         }
+        else if (type instanceof abaplint.BasicTypes.EnumType) {
+            resolved = "String";
+            if (type.getQualifiedName() !== undefined) {
+                extra = "{qualifiedName: \"" + type.getQualifiedName()?.toUpperCase() + "\"}";
+            }
+        }
         else if (type instanceof abaplint.BasicTypes.UnknownType) {
             return `(() => { throw new Error("Unknown type: ${type.getError()}") })()`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.1",
+  "version": "2.13.3",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.118.2",
+    "@abaplint/core": "^2.118.7",
     "source-map": "^0.7.6"
   },
   "devDependencies": {