@abaplint/transpiler-cli 2.7.81 → 2.7.83

package/build/bundle.js

@@ -7573,7 +7573,8 @@ class TypeTableKey extends combi_1.Expression {
         const defaultKey = "DEFAULT KEY";
         const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
         const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)("READ-ONLY"));
+        const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }
@@ -15700,7 +15701,7 @@ class TypeMesh {
         const on = (0, combi_1.seq)("ON", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName, (0, combi_1.star)((0, combi_1.seq)("AND", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName)));
         const using = (0, combi_1.seq)("USING KEY", expressions_1.NamespaceSimpleName);
         const association = (0, combi_1.seq)("ASSOCIATION", expressions_1.NamespaceSimpleName, "TO", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(on));
-        const ret = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
+        const ret = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
         return ret;
     }
 }
@@ -30031,6 +30032,7 @@ const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modu
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class Sort {
     runSyntax(node, scope, filename) {
+        var _a, _b;
         for (const s of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(s, scope, filename);
         }
@@ -30038,6 +30040,9 @@ class Sort {
         if (tnode) {
             const ttype = new target_1.Target().runSyntax(tnode, scope, filename);
             if (ttype instanceof basic_1.TableType) {
+                if (((_b = (_a = ttype.getOptions()) === null || _a === void 0 ? void 0 : _a.primaryKey) === null || _b === void 0 ? void 0 : _b.type) === basic_1.TableAccessType.sorted) {
+                    throw new Error(`Sorted table, already sorted`);
+                }
                 const rowType = ttype.getRowType();
                 if (!(rowType instanceof basic_1.VoidType)
                     && !(rowType instanceof basic_1.UnknownType)
@@ -47792,7 +47797,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.28";
+        return "2.102.29";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -70342,9 +70347,16 @@ exports.ComponentChainSimpleTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
+const field_length_1 = __webpack_require__(/*! ./field_length */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_length.js");
+const field_offset_1 = __webpack_require__(/*! ./field_offset */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_offset.js");
 class ComponentChainSimpleTranspiler {
+    constructor(prefix = "") {
+        this.prefix = "";
+        this.prefix = prefix;
+    }
     transpile(node, traversal) {
-        const ret = new chunk_1.Chunk();
+        const offset = [];
+        let ret = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             const type = c.get();
             if (type instanceof core_1.Expressions.ComponentName) {
@@ -70354,11 +70366,26 @@ class ComponentChainSimpleTranspiler {
                     field = interfaceName + "$" + field;
                 }
                 field = traversal_1.Traversal.escapeNamespace(field).replace("~", "$");
-                ret.append(field, c, traversal);
+                ret.append(this.prefix + field, c, traversal);
+                this.prefix = "";
             }
             else if (type instanceof core_1.Expressions.ArrowOrDash) {
                 ret.append(".get().", c, traversal);
             }
+            else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.FieldOffset) {
+                offset.push("offset: " + new field_offset_1.FieldOffsetTranspiler().transpile(c, traversal).getCode());
+            }
+            else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.FieldLength) {
+                const len = new field_length_1.FieldLengthTranspiler().transpile(c, traversal).getCode();
+                if (len !== "*") {
+                    offset.push("length: " + len);
+                }
+            }
+        }
+        if (offset.length > 0) {
+            const pre = "new abap.OffsetLength(";
+            const post = ", {" + offset.join(", ") + "})";
+            ret = new chunk_1.Chunk().appendString(pre).appendChunk(ret).appendString(post);
         }
         return ret;
     }
@@ -70380,45 +70407,49 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentCompareTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const component_chain_simple_1 = __webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_chain_simple.js");
 class ComponentCompareTranspiler {
     transpile(node, traversal) {
         const concat = node.concatTokens().toUpperCase();
         const pre = concat.startsWith("NOT") ? "!" : "";
         const componentExpression = node.findDirectExpression(core_1.Expressions.ComponentChainSimple);
-        const component = traversal.traverse(componentExpression).getCode();
+        if (componentExpression === undefined) {
+            throw new Error("unexpected, ComponentCompareTranspiler");
+        }
+        const component = new component_chain_simple_1.ComponentChainSimpleTranspiler("I.").transpile(componentExpression, traversal).getCode();
         if (node.findDirectExpression(core_1.Expressions.CompareOperator)) {
             const compare = traversal.traverse(node.findDirectExpression(core_1.Expressions.CompareOperator)).getCode();
             const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
-            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.${compare}(I.${component}, ${source});}`);
+            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.${compare}(${component}, ${source});}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS INITIAL"))
             || concat.endsWith("IS NOT INITIAL")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(${component}) === false;}`);
         }
         else if (concat.endsWith("IS INITIAL")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(${component});}`);
         }
         if (concat.startsWith((componentExpression === null || componentExpression === void 0 ? void 0 : componentExpression.concatTokens().toUpperCase()) + " IN ")) {
             const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
-            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.in(I.${component}, ${source});}`);
+            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.in(${component}, ${source});}`);
         }
         else if (concat.startsWith((componentExpression === null || componentExpression === void 0 ? void 0 : componentExpression.concatTokens().toUpperCase()) + " NOT IN ")) {
             const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
-            return new chunk_1.Chunk(`(I) => {return !abap.compare.in(I.${component}, ${source});}`);
+            return new chunk_1.Chunk(`(I) => {return !abap.compare.in(${component}, ${source});}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS BOUND"))
             || concat.endsWith("IS NOT BOUND")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(${component});}`);
         }
         else if (concat.endsWith("IS BOUND")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.initial(${component}) === false;}`);
         }
         if ((concat.startsWith("NOT") && concat.endsWith("IS ASSIGNED"))
             || concat.endsWith("IS NOT ASSIGNED")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(I.${component}) === false;}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(${component}) === false;}`);
         }
         else if (concat.endsWith("IS ASSIGNED")) {
-            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(I.${component});}`);
+            return new chunk_1.Chunk(`(I) => {return abap.compare.assigned(${component});}`);
         }
         return new chunk_1.Chunk("ComponentCompareTodo");
     }
@@ -72618,7 +72649,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class TargetTranspiler {
     transpile(node, traversal) {
         const offset = [];
-        const ret = new chunk_1.Chunk();
+        let ret = new chunk_1.Chunk();
         const children = node.getChildren();
         for (let i = 0; i < children.length; i++) {
             const c = children[i];
@@ -72678,16 +72709,12 @@ class TargetTranspiler {
                 }
             }
         }
-        let pre = "";
-        let post = "";
         if (offset.length > 0) {
-            pre = "new abap.OffsetLength(";
-            post = ", {" + offset.join(", ") + "})";
+            const pre = "new abap.OffsetLength(";
+            const post = ", {" + offset.join(", ") + "})";
+            ret = new chunk_1.Chunk().appendString(pre).appendChunk(ret).appendString(post);
         }
-        return new chunk_1.Chunk()
-            .appendString(pre)
-            .appendChunk(ret)
-            .appendString(post);
+        return ret;
     }
 }
 exports.TargetTranspiler = TargetTranspiler;
@@ -75966,10 +75993,26 @@ const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abap
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class FormTranspiler {
-    transpile(node) {
+    transpile(node, traversal) {
         unique_identifier_1.UniqueIdentifier.resetIndexBackup();
         const name = node.findFirstExpression(abaplint.Expressions.FormName).getFirstToken().getStr();
-        return new chunk_1.Chunk("async function " + name + "() {");
+        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
+        const def = scope === null || scope === void 0 ? void 0 : scope.findFormDefinition(name);
+        const ret = new chunk_1.Chunk("async function " + name + "(INPUT) {");
+        const params = [];
+        for (const p of (def === null || def === void 0 ? void 0 : def.getChangingParameters()) || []) {
+            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+        }
+        for (const p of (def === null || def === void 0 ? void 0 : def.getTablesParameters()) || []) {
+            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+        }
+        for (const p of (def === null || def === void 0 ? void 0 : def.getUsingParameters()) || []) {
+            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+        }
+        if (params.length > 0) {
+            ret.appendString("\n" + params.join("\n"));
+        }
+        return ret;
     }
 }
 exports.FormTranspiler = FormTranspiler;
@@ -76787,7 +76830,11 @@ class LoopTranspiler {
             else if (compare.findDirectTokenByText("NOT")) {
                 continue;
             }
-            const tchain = traversal.traverse(compare.findDirectExpression(abaplint.Expressions.ComponentChainSimple));
+            const simple = compare.findDirectExpression(abaplint.Expressions.ComponentChainSimple);
+            if ((simple === null || simple === void 0 ? void 0 : simple.getChildren().length) !== 1) {
+                continue;
+            }
+            const tchain = traversal.traverse(simple);
             const tsource = traversal.traverse(compare.findDirectExpression(abaplint.Expressions.Source));
             topEquals[tchain.getCode()] = tsource.getCode();
         }
@@ -77410,19 +77457,61 @@ exports.ParameterTranspiler = ParameterTranspiler;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PerformTranspiler = void 0;
+/* eslint-disable max-len */
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class PerformTranspiler {
-    transpile(node, _traversal) {
+    transpile(node, traversal) {
+        var _a, _b, _c;
         const formName = node.findDirectExpression(abaplint.Expressions.FormName);
         if (formName === undefined) {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler FormName not found");`);
         }
-        // todo, parameters
-        if (node.concatTokens().toUpperCase().includes(" IN PROGRAM ")) {
+        else if (node.concatTokens().toUpperCase().includes(" IN PROGRAM ")) {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler IN PROGRAM, transpiler todo");`);
         }
-        return new chunk_1.Chunk("await " + formName.concatTokens() + "();");
+        let def = undefined;
+        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
+        for (const r of (scope === null || scope === void 0 ? void 0 : 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 ((_a = node.findDirectExpression(abaplint.Expressions.PerformTables)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(abaplint.Expressions.Source)) || []) {
+            console.dir(t);
+            const name = def === null || def === void 0 ? void 0 : def.getTablesParameters()[index].getName().toLowerCase();
+            if (name === undefined) {
+                continue;
+            }
+            params.push(`"${name}": ` + traversal.traverse(t).getCode());
+            index++;
+        }
+        index = 0;
+        for (const u of ((_b = node.findDirectExpression(abaplint.Expressions.PerformUsing)) === null || _b === void 0 ? void 0 : _b.findDirectExpressions(abaplint.Expressions.Source)) || []) {
+            console.dir(u);
+            const name = def === null || def === void 0 ? void 0 : def.getUsingParameters()[index].getName().toLowerCase();
+            if (name === undefined) {
+                continue;
+            }
+            params.push(`"${name}": ` + traversal.traverse(u).getCode());
+            index++;
+        }
+        index = 0;
+        for (const c of ((_c = node.findDirectExpression(abaplint.Expressions.PerformChanging)) === null || _c === void 0 ? void 0 : _c.findDirectExpressions(abaplint.Expressions.Source)) || []) {
+            console.dir(c);
+            const name = def === null || def === void 0 ? void 0 : def.getChangingParameters()[index].getName().toLowerCase();
+            if (name === undefined) {
+                continue;
+            }
+            params.push(`"${name}": ` + traversal.traverse(c).getCode());
+            index++;
+        }
+        return new chunk_1.Chunk("await " + formName.concatTokens() + `({${params.join(",")}});`);
     }
 }
 exports.PerformTranspiler = PerformTranspiler;
@@ -80946,6 +81035,13 @@ class Traversal {
                     }
                 }
             }
+            else if (c.get() instanceof abaplint.Expressions.AttributeName
+                && context instanceof abaplint.BasicTypes.DataReference) {
+                const type = context.getType();
+                if (type instanceof abaplint.BasicTypes.StructureType) {
+                    context = type.getComponentByName(c.concatTokens());
+                }
+            }
         }
         return context;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.81",
+  "version": "2.7.83",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.7.81",
+    "@abaplint/transpiler": "^2.7.83",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.5.6",
-    "@abaplint/core": "^2.102.28",
+    "@types/node": "^20.5.7",
+    "@abaplint/core": "^2.102.29",
     "progress": "^2.0.3",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",