@abaplint/transpiler-cli 2.7.140 → 2.7.142

package/build/bundle.js

@@ -7433,7 +7433,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class SQLJoin extends combi_1.Expression {
     getRunnable() {
-        const joinType = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("INNER", "LEFT OUTER", "LEFT")), "JOIN");
+        const joinType = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("INNER", "LEFT OUTER", "LEFT", "RIGHT OUTER", "RIGHT")), "JOIN");
         const join = (0, combi_1.seq)(joinType, _1.SQLFromSource, "ON", _1.SQLCond);
         return join;
     }
@@ -47058,6 +47058,7 @@ exports.NumberRange = NumberRange;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Oauth2Profile = void 0;
+const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "./node_modules/@abaplint/core/build/src/xml_utils.js");
 const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
 class Oauth2Profile extends _abstract_object_1.AbstractObject {
     getType() {
@@ -47073,6 +47074,15 @@ class Oauth2Profile extends _abstract_object_1.AbstractObject {
         // todo
         return undefined;
     }
+    listScopes() {
+        var _a, _b, _c;
+        const ret = [];
+        const parsed = super.parseRaw2();
+        for (const t of (0, xml_utils_1.xmlToArray)((_c = (_b = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.PROFILE) === null || _b === void 0 ? void 0 : _b.T_SCOPES) === null || _c === void 0 ? void 0 : _c.OA2P_SCOPES)) {
+            ret.push(t.SCOPE);
+        }
+        return ret;
+    }
 }
 exports.Oauth2Profile = Oauth2Profile;
 //# sourceMappingURL=oauth2_profile.js.map
@@ -50064,7 +50074,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.105.8";
+        return "2.105.10";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -74955,6 +74965,7 @@ const simple_source3_1 = __webpack_require__(/*! ./simple_source3 */ "./node_mod
 const field_chain_1 = __webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_chain.js");
 const sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js");
 class SQLCondTranspiler {
     transpile(node, traversal, table) {
         var _a;
@@ -75004,7 +75015,8 @@ class SQLCondTranspiler {
             pre = "NOT ";
         }
         if (sqlin.getChildren().length === 2) {
-            return `${pre}" + abap.expandIN("${fieldName.concatTokens()}", ${source.concatTokens()}) + "`;
+            const s = new source_1.SourceTranspiler().transpile(source, traversal).getCode();
+            return `${pre}" + abap.expandIN("${fieldName.concatTokens()}", ${s}) + "`;
         }
         else {
             const cond = [];
@@ -76046,6 +76058,45 @@ exports.HandleMSAG = HandleMSAG;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_oa2p.js":
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/handlers/handle_oa2p.js ***!
+  \*****************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.HandleOA2P = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class HandleOA2P {
+    runObject(obj, _reg) {
+        var _a;
+        const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
+        if (filename === undefined) {
+            return [];
+        }
+        const chunk = new chunk_1.Chunk().appendString(`abap.OA2P["${obj.getName().toUpperCase()}"] = {\n`);
+        chunk.appendString(`  "scopes": ${JSON.stringify(obj.listScopes())},\n`);
+        chunk.appendString(`};`);
+        const output = {
+            object: {
+                name: obj.getName(),
+                type: obj.getType(),
+            },
+            filename: filename,
+            chunk: chunk,
+            requires: [],
+            exports: [],
+        };
+        return [output];
+    }
+}
+exports.HandleOA2P = HandleOA2P;
+//# sourceMappingURL=handle_oa2p.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_smim.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/handlers/handle_smim.js ***!
@@ -76367,6 +76418,7 @@ const handle_type_pool_1 = __webpack_require__(/*! ./handlers/handle_type_pool *
 const handle_w3mi_1 = __webpack_require__(/*! ./handlers/handle_w3mi */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_w3mi.js");
 const handle_smim_1 = __webpack_require__(/*! ./handlers/handle_smim */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_smim.js");
 const handle_msag_1 = __webpack_require__(/*! ./handlers/handle_msag */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_msag.js");
+const handle_oa2p_1 = __webpack_require__(/*! ./handlers/handle_oa2p */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_oa2p.js");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -76407,6 +76459,9 @@ class Transpiler {
             else if (obj instanceof abaplint.Objects.TypePool) {
                 output.objects.push(...new handle_type_pool_1.HandleTypePool().runObject(obj, reg));
             }
+            else if (obj instanceof abaplint.Objects.Oauth2Profile) {
+                output.objects.push(...new handle_oa2p_1.HandleOA2P().runObject(obj, reg));
+            }
             else if (obj instanceof abaplint.Objects.Table) {
                 output.objects.push(...new handle_table_1.HandleTable().runObject(obj, reg));
             }
@@ -84935,6 +84990,7 @@ exports.config = {
                 "MSAG",
                 "NROB",
                 "NSPC",
+                "OA2P",
                 "PARA",
                 "PROG",
                 "SHLP",
@@ -86539,9 +86595,9 @@ const xmlNode = __webpack_require__(/*! ./xmlNode */ "./node_modules/fast-xml-pa
 const readDocType = __webpack_require__(/*! ./DocTypeReader */ "./node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js");
 const toNumber = __webpack_require__(/*! strnum */ "./node_modules/strnum/strnum.js");
 
-const regx =
-  '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|((NAME:)?(NAME))([^>]*)>|((\\/)(NAME)\\s*>))([^<]*)'
-  .replace(/NAME/g, util.nameRegexp);
+// const regx =
+//   '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|((NAME:)?(NAME))([^>]*)>|((\\/)(NAME)\\s*>))([^<]*)'
+//   .replace(/NAME/g, util.nameRegexp);
 
 //const tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(\\s*"+cdataRegx+")*([^<]+)?","g");
 //const tagsRegx = new RegExp("<(\\/?)((\\w*:)?([\\w:\\-\._]+))([^>]*)>([^<]*)("+cdataRegx+"([^<]*))*([^<]+)?","g");
@@ -87034,8 +87090,8 @@ function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
   let tagName = tagExp;
   let attrExpPresent = true;
   if(separatorIndex !== -1){//separate tag name and attributes expression
-    tagName = tagExp.substr(0, separatorIndex).replace(/\s\s*$/, '');
-    tagExp = tagExp.substr(separatorIndex + 1);
+    tagName = tagExp.substring(0, separatorIndex);
+    tagExp = tagExp.substring(separatorIndex + 1).trimStart();
   }
 
   const rawTagName = tagName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.140",
+  "version": "2.7.142",
   "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.140",
+    "@abaplint/transpiler": "^2.7.142",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",
-    "@types/node": "^20.10.6",
-    "@abaplint/core": "^2.105.8",
+    "@types/node": "^20.11.0",
+    "@abaplint/core": "^2.105.10",
     "progress": "^2.0.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",