@abaplint/cli 2.101.11 → 2.101.12

package/build/cli.js

@@ -14704,7 +14704,7 @@ class ReadTable {
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const fields = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("INTO", (0, combi_1.failStar)()), expressions_1.FieldSub));
         const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)(expressions_1.Dynamic, fields)), "BINARY SEARCH");
-        return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource2), (0, combi_1.opt)(perm));
+        return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(perm));
     }
 }
 exports.ReadTable = ReadTable;
@@ -20405,7 +20405,7 @@ BuiltIn.methods = [
     {
         name: "XSTRLEN",
         mandatory: {
-            "val": new basic_1.XStringType(),
+            "val": new basic_1.XSequenceType(),
         },
         return: new basic_1.IntegerType(),
     },
@@ -21624,7 +21624,7 @@ class TypeUtils {
         return false;
     }
     isAssignableStrict(source, target) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         /*
             console.dir(source);
             console.dir(target);
@@ -21663,8 +21663,14 @@ class TypeUtils {
                 return false;
             }
         }
-        else if (source instanceof basic_1.StringType && target instanceof basic_1.StructureType) {
-            if (this.structureContainsString(target)) {
+        else if (source instanceof basic_1.StringType) {
+            if (target instanceof basic_1.StructureType && this.structureContainsString(target)) {
+                return false;
+            }
+            else if (target instanceof basic_1.XSequenceType) {
+                if (((_f = source.getAbstractTypeData()) === null || _f === void 0 ? void 0 : _f.derivedFromConstant) === true) {
+                    return true;
+                }
                 return false;
             }
             return true;
@@ -21687,6 +21693,11 @@ class TypeUtils {
                 return false;
             }
         }
+        else if (source instanceof basic_1.XStringType) {
+            if (target instanceof basic_1.CLikeType) {
+                return false;
+            }
+        }
         return this.isAssignable(source, target);
     }
     isAssignable(source, target) {
@@ -23315,6 +23326,9 @@ class Constant {
             }
             return new basic_1.CharacterType(len, { derivedFromConstant: true });
         }
+        else if (node.getFirstToken().getStr().startsWith("`")) {
+            return new basic_1.StringType({ qualifiedName: "STRING", derivedFromConstant: true });
+        }
         else {
             return new basic_1.StringType({ qualifiedName: "STRING" });
         }
@@ -28610,10 +28624,15 @@ const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_module
 const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const inline_data_1 = __webpack_require__(/*! ../expressions/inline_data */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/inline_data.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class GetBit {
     runSyntax(node, scope, filename) {
+        let lastType = undefined;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+            lastType = new source_1.Source().runSyntax(s, scope, filename);
+        }
+        if (lastType && new _type_utils_1.TypeUtils(scope).isHexLike(lastType) === false) {
+            throw new Error("Input must be byte-like");
         }
         for (const t of node.findDirectExpressions(Expressions.Target)) {
             const inline = t === null || t === void 0 ? void 0 : t.findDirectExpression(Expressions.InlineData);
@@ -30488,13 +30507,17 @@ exports.SetBit = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class SetBit {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
         for (const t of node.findDirectExpressions(Expressions.Target)) {
-            new target_1.Target().runSyntax(t, scope, filename);
+            const typ = new target_1.Target().runSyntax(t, scope, filename);
+            if (typ && new _type_utils_1.TypeUtils(scope).isHexLike(typ) === false) {
+                throw new Error("Input must be byte-like");
+            }
         }
     }
 }
@@ -48161,7 +48184,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.11";
+        return "2.101.12";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -53250,6 +53273,10 @@ Make sure to test the downported code, it might not always be completely correct
         if (found) {
             return found;
         }
+        found = this.downportReadTable(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         return undefined;
     }
     //////////////////////////////////////////
@@ -53545,6 +53572,22 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         }
         return undefined;
     }
+    downportReadTable(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.ReadTable)) {
+            return undefined;
+        }
+        const source = high.findExpressionAfterToken("TABLE");
+        if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.Source) {
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA(${uniqueName}) = ${source.concatTokens()}.\n` + indentation);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline table source", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceInsertExpression(high, lowFile, highSyntax) {
         if (!(high.get() instanceof Statements.InsertInternal)) {
             return undefined;
@@ -70647,7 +70690,7 @@ function readDocType(xmlData, i){
                     i += 7; 
                     [entityName, val,i] = readEntityExp(xmlData,i+1);
                     if(val.indexOf("&") === -1) //Parameter entities are not supported
-                        entities[ entityName ] = {
+                        entities[ validateEntityName(entityName) ] = {
                             regx : RegExp( `&${entityName};`,"g"),
                             val: val
                         };
@@ -70768,6 +70811,18 @@ function isNotation(xmlData, i){
     return false
 }
 
+//an entity name should not contains special characters that may be used in regex
+//Eg !?\\\/[]$%{}^&*()<>
+const specialChar = "!?\\\/[]$%{}^&*()<>";
+
+function validateEntityName(name){
+    for (let i = 0; i < specialChar.length; i++) {
+        const ch = specialChar[i];
+        if(name.indexOf(ch) !== -1) throw new Error(`Invalid character ${ch} in entity name`);
+    }
+    return name;
+}
+
 module.exports = readDocType;
 
 /***/ }),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.101.11",
+    "version": "2.101.12",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.101.11",
+        "@abaplint/core": "^2.101.12",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
@@ -47,16 +47,16 @@
         "@types/progress": "^2.0.5",
         "chai": "^4.3.7",
         "chalk": "^5.2.0",
-        "eslint": "^8.41.0",
+        "eslint": "^8.42.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^3.5.1",
+        "memfs": "^3.5.2",
         "minimist": "^1.2.8",
         "mocha": "^10.2.0",
         "progress": "^2.0.3",
         "typescript": "^5.1.3",
         "webpack": "^5.85.0",
-        "webpack-cli": "^5.1.1",
+        "webpack-cli": "^5.1.3",
         "xml-js": "^1.6.11"
     },
     "dependencies": {}