@abaplint/transpiler-cli 2.11.69 → 2.11.71

package/build/bundle.js

@@ -105,14 +105,19 @@ class FileOperations {
         return Promise.all(promises);
     }
     static async loadFiles(config) {
-        const filter = (config.input_filter ?? []).map(pattern => new RegExp(pattern, "i"));
+        const inputFilters = (config.input_filter ?? []).map(pattern => new RegExp(pattern, "i"));
+        const excludeFilters = (config.exclude_filter ?? []).map(pattern => new RegExp(pattern, "i"));
         let skipped = 0;
         let added = 0;
         const folders = Array.isArray(config.input_folder) ? config.input_folder : [config.input_folder];
         const filesToRead = [];
         for (const folder of folders) {
             for (const filename of glob.sync(folder + "/**", { nosort: true, nodir: true })) {
-                if (filter.length > 0 && filter.some(a => a.test(filename)) === false) {
+                if (inputFilters.length > 0 && inputFilters.some(a => a.test(filename)) === false) {
+                    skipped++;
+                    continue;
+                }
+                else if (excludeFilters.length > 0 && excludeFilters.some(a => a.test(filename)) === true) {
                     skipped++;
                     continue;
                 }
@@ -3751,12 +3756,10 @@ exports.CorrespondingBody = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
-const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain.js");
 class CorrespondingBody extends combi_1.Expression {
     getRunnable() {
-        const mapping = (0, combi_1.seq)("MAPPING", (0, combi_1.plus)((0, combi_1.seq)(_1.ComponentName, "=", component_chain_1.ComponentChain)));
         const discarding = (0, combi_1.ver)(version_1.Version.v751, "DISCARDING DUPLICATES");
-        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(_1.CorrespondingBodyBase), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(mapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("MAPPING FROM ENTITY", (0, combi_1.optPrio)("USING CONTROL"))), // todo, version something?
+        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(_1.CorrespondingBodyBase), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(_1.CorrespondingBodyMapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("MAPPING FROM ENTITY", (0, combi_1.optPrio)("USING CONTROL"))), // todo, version something?
         (0, combi_1.optPrio)((0, combi_1.seq)("EXCEPT", (0, combi_1.alt)((0, combi_1.plus)(_1.Field), "*"))));
     }
 }
@@ -3788,6 +3791,29 @@ exports.CorrespondingBodyBase = CorrespondingBodyBase;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body_mapping.js":
+/*!***********************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body_mapping.js ***!
+  \***********************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CorrespondingBodyMapping = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+class CorrespondingBodyMapping extends combi_1.Expression {
+    getRunnable() {
+        const mapping = (0, combi_1.seq)("MAPPING", (0, combi_1.plus)((0, combi_1.seq)(_1.ComponentName, "=", _1.ComponentChain)));
+        return mapping;
+    }
+}
+exports.CorrespondingBodyMapping = CorrespondingBodyMapping;
+//# sourceMappingURL=corresponding_body_mapping.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/data_definition.js":
 /*!************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/data_definition.js ***!
@@ -4769,9 +4795,7 @@ __exportStar(__webpack_require__(/*! ./compare */ "./node_modules/@abaplint/core
 __exportStar(__webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain_simple.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare_simple */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare_simple.js"), exports);
-__exportStar(__webpack_require__(/*! ./value_base */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_base.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare_single */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare_single.js"), exports);
-__exportStar(__webpack_require__(/*! ./corresponding_body_base */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body_base.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_compare */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_compare.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_cond_sub */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_cond_sub.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_cond */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/component_cond.js"), exports);
@@ -4784,6 +4808,8 @@ __exportStar(__webpack_require__(/*! ./constant_field_length */ "./node_modules/
 __exportStar(__webpack_require__(/*! ./constant_string */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/constant_string.js"), exports);
 __exportStar(__webpack_require__(/*! ./constant */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/constant.js"), exports);
 __exportStar(__webpack_require__(/*! ./conv_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/conv_body.js"), exports);
+__exportStar(__webpack_require__(/*! ./corresponding_body_base */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body_base.js"), exports);
+__exportStar(__webpack_require__(/*! ./corresponding_body_mapping */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body_mapping.js"), exports);
 __exportStar(__webpack_require__(/*! ./corresponding_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/corresponding_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./data_definition */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/data_definition.js"), exports);
 __exportStar(__webpack_require__(/*! ./database_connection */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/database_connection.js"), exports);
@@ -4964,6 +4990,7 @@ __exportStar(__webpack_require__(/*! ./type_structure */ "./node_modules/@abapli
 __exportStar(__webpack_require__(/*! ./type_table_key */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_table_key.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_table */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_table.js"), exports);
 __exportStar(__webpack_require__(/*! ./type */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type.js"), exports);
+__exportStar(__webpack_require__(/*! ./value_base */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_base.js"), exports);
 __exportStar(__webpack_require__(/*! ./value_body_line */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_body_line.js"), exports);
 __exportStar(__webpack_require__(/*! ./value_body_lines */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_body_lines.js"), exports);
 __exportStar(__webpack_require__(/*! ./value_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/value_body.js"), exports);
@@ -53851,7 +53878,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.194";
+        return "2.113.195";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -78541,7 +78568,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class CompareTranspiler {
     transpile(node, traversal) {
         // todo, this is not correct
-        const concat = node.concatTokens().toUpperCase();
+        let concat = node.concatTokens().toUpperCase();
         let pre = concat.startsWith("NOT ") ? "!" : "";
         const sources = node.findDirectExpressionsMulti([core_1.Expressions.Source, core_1.Expressions.SourceFieldSymbolChain, core_1.Expressions.SourceFieldSymbol]);
         if (sources.length === 1) {
@@ -78571,7 +78598,10 @@ class CompareTranspiler {
                 return new chunk_1.Chunk().appendString("abap.compare.assigned(").appendChunk(s0).appendString(")");
             }
             if (concat.endsWith(" IS SUPPLIED")) {
-                return new chunk_1.Chunk().appendString(pre + "INPUT && INPUT." + concat.replace(" IS SUPPLIED", "").toLowerCase());
+                if (concat.startsWith("NOT ")) {
+                    concat = concat.replace("NOT ", "");
+                }
+                return new chunk_1.Chunk().appendString(pre + "(INPUT && INPUT." + concat.replace(" IS SUPPLIED", "" + ")").toLowerCase());
             }
             else if (concat.endsWith(" IS NOT SUPPLIED")) {
                 return new chunk_1.Chunk().appendString(pre + "INPUT && INPUT." + concat.replace(" IS NOT SUPPLIED", "").toLowerCase() + " === undefined");
@@ -79277,6 +79307,8 @@ const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abapli
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const type_name_or_infer_1 = __webpack_require__(/*! ./type_name_or_infer */ "./node_modules/@abaplint/transpiler/build/src/expressions/type_name_or_infer.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_chain.js");
+const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class CorrespondingBodyTranspiler {
     transpile(typ, body, traversal) {
         if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
@@ -79285,6 +79317,8 @@ class CorrespondingBodyTranspiler {
         const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
         let target = transpile_types_1.TranspileTypes.toType(type);
         let source;
+        const mapping = [];
+        const mappingRow = { componentName: undefined, componentChain: undefined };
         for (const child of body.getChildren()) {
             const c = child.get();
             if (c instanceof core_1.Expressions.Source && child instanceof core_1.Nodes.ExpressionNode) {
@@ -79294,12 +79328,33 @@ class CorrespondingBodyTranspiler {
                 source = traversal.traverse(child?.findDirectExpression(core_1.Expressions.Source));
                 target = `abap.statements.moveCorresponding(${source.getCode()}, ${target})`;
             }
+            else if (c instanceof core_1.Expressions.CorrespondingBodyMapping && child instanceof core_1.Nodes.ExpressionNode) {
+                for (const cc of child.getChildren()) {
+                    if (cc.get() instanceof core_1.Expressions.ComponentName) {
+                        mappingRow.componentName = cc;
+                    }
+                    else if (cc.get() instanceof core_1.Expressions.ComponentChain) {
+                        mappingRow.componentChain = cc;
+                        mapping.push(mappingRow);
+                    }
+                }
+            }
             else {
-                throw new Error("CorrespondingBodyTranspiler, todo, " + c.constructor.name);
+                throw new Error("CorrespondingBodyTranspiler, todo, " + c.constructor.name + ", " + body.concatTokens());
             }
         }
         const ret = new chunk_1.Chunk();
-        ret.appendString(`abap.statements.moveCorresponding(${source.getCode()}, ${target})`);
+        const id = unique_identifier_1.UniqueIdentifier.get();
+        ret.appendString("(await (async () => {\n");
+        ret.appendString(`const ${id} = ${target};\n`);
+        ret.appendString(`abap.statements.moveCorresponding(${source.getCode()}, ${id});\n`);
+        for (const map of mapping) {
+            const componentName = map.componentName.concatTokens().toLowerCase();
+            const chain = new component_chain_1.ComponentChainTranspiler().transpile(map.componentChain, traversal).getCode();
+            ret.appendString(`${id}.get().${componentName}.set(${source.getCode()}.get().${chain});\n`);
+        }
+        ret.appendString("return " + id + ";\n");
+        ret.appendString("})())");
         return ret;
     }
 }
@@ -79646,7 +79701,7 @@ class FilterBodyTranspiler {
             throw new Error("FilterBodyTranspiler, Expected TypeNameOrInfer");
         }
         else if (body.findDirectTokenByText("EXCEPT")) {
-            return new chunk_1.Chunk(`throw new Error("FilterBodyTranspiler EXCEPT in, not supported, transpiler");`);
+            return new chunk_1.Chunk(`(() => { throw new Error("FilterBodyTranspiler EXCEPT in, not supported, transpiler"); })()`);
         }
         const source = traversal.traverse(body.findDirectExpression(core_1.Expressions.Source)).getCode();
         const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
@@ -92406,7 +92461,6 @@ exports.config = {
         "begin_end_names": true,
         "check_syntax": true,
         "form_no_dash": true,
-        "omit_preceding_zeros": true,
         "obsolete_statement": {
             "setExtended": true,
         },

package/build/types.d.ts

@@ -3,6 +3,8 @@ export interface ITranspilerConfig {
     input_folder: string | string[];
     /** list of regex, case insensitive, empty gives all files, positive list */
     input_filter?: string[];
+    /** list of regex, case insensitive */
+    exclude_filter?: string[];
     output_folder: string;
     /** to be deprecated, "lib", use "libs" instead
      * @deprecated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.69",
+  "version": "2.11.71",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,10 +27,10 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.194",
-    "@abaplint/transpiler": "^2.11.69",
+    "@abaplint/core": "^2.113.195",
+    "@abaplint/transpiler": "^2.11.71",
     "@types/glob": "^8.1.0",
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.3.1",
     "@types/progress": "^2.0.7",
     "glob": "=7.2.0",
     "progress": "^2.0.3",