@abaplint/core 2.102.2 → 2.102.4

package/build/src/abap/5_syntax/_procedural.js

@@ -12,6 +12,7 @@ const _typed_identifier_1 = require("../types/_typed_identifier");
 const basic_1 = require("../types/basic");
 const ddic_1 = require("../../ddic");
 const _object_oriented_1 = require("./_object_oriented");
+const _reference_1 = require("./_reference");
 class Procedural {
     constructor(reg, scope) {
         this.scope = scope;
@@ -85,7 +86,19 @@ class Procedural {
             if (param.type === undefined || param.type === "") {
                 found = new basic_1.AnyType();
             }
-            else {
+            else if (param.type.includes("=>")) {
+                // then its a type from global INTF or CLAS
+                const [clas, name] = param.type.split("=>");
+                const def = this.scope.findObjectDefinition(clas);
+                if (def) {
+                    const type = def.getTypeDefinitions().getByName(name);
+                    if (type) {
+                        this.scope.addReference(nameToken, type, _reference_1.ReferenceType.TypeReference, filename);
+                        found = type.getType();
+                    }
+                }
+            }
+            if (found === undefined) {
                 found = ddic.lookup(param.type).type;
             }
             if (param.direction === types_1.FunctionModuleParameterDirection.tables) {

package/build/src/abap/5_syntax/_type_utils.js

@@ -214,7 +214,11 @@ class TypeUtils {
         /*
             console.dir(source);
             console.dir(target);
+            console.dir(calculated);
         */
+        if (calculated && source instanceof basic_1.StringType && target instanceof basic_1.XStringType) {
+            return false;
+        }
         if (calculated) {
             return this.isAssignable(source, target);
         }
@@ -265,6 +269,9 @@ class TypeUtils {
                 }
                 return false;
             }
+            else if (target instanceof cgeneric_type_1.CGenericType) {
+                return false;
+            }
             else if (target instanceof basic_1.XSequenceType || target instanceof basic_1.XStringType) {
                 if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
                     return true;

package/build/src/abap/5_syntax/expressions/method_call_param.js

@@ -53,6 +53,7 @@ class MethodCallParam {
                 sourceType = new source_1.Source().runSyntax(child, scope, filename, targetType);
             }
             const calculated = child.findFirstExpression(Expressions.MethodCallChain) !== undefined
+                || child.findFirstExpression(Expressions.StringTemplate) !== undefined
                 || child.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (sourceType === undefined) {
                 throw new Error("No source type determined, method source");

package/build/src/abap/5_syntax/expressions/method_parameters.js

@@ -126,10 +126,13 @@ class MethodParameters {
         }
         for (const item of items) {
             const parameter = allImporting.find(p => p.getName().toUpperCase() === item.name);
+            const calculated = item.source.findFirstExpression(Expressions.MethodCallChain) !== undefined
+                || item.source.findFirstExpression(Expressions.StringTemplate) !== undefined
+                || item.source.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (parameter === undefined) {
                 throw new Error("Method importing parameter \"" + item.name + "\" does not exist");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(item.sourceType, parameter.getType()) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(item.sourceType, parameter.getType(), calculated) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
             this.requiredParameters.delete(item.name);

package/build/src/abap/5_syntax/expressions/string_template.js

@@ -8,9 +8,10 @@ const _type_utils_1 = require("../_type_utils");
 class StringTemplate {
     runSyntax(node, scope, filename) {
         const typeUtils = new _type_utils_1.TypeUtils(scope);
+        const ret = basic_1.StringType.get();
         for (const templateSource of node.findAllExpressions(Expressions.StringTemplateSource)) {
             const s = templateSource.findDirectExpression(Expressions.Source);
-            const type = new source_1.Source().runSyntax(s, scope, filename, basic_1.StringType.get());
+            const type = new source_1.Source().runSyntax(s, scope, filename, ret);
             if (type === undefined) {
                 throw new Error("No target type determined");
             }
@@ -34,7 +35,7 @@ class StringTemplate {
                 throw new Error("Cannot apply ALPHA to this type");
             }
         }
-        return basic_1.StringType.get();
+        return ret;
     }
 }
 exports.StringTemplate = StringTemplate;

package/build/src/objects/table_type.js

@@ -21,23 +21,52 @@ class TableType extends _abstract_object_1.AbstractObject {
         };
     }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        this.parseXML();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.ddtext;
     }
     setDirty() {
         this.parsedXML = undefined;
         super.setDirty();
     }
     buildTableOptions() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        let primaryKey = undefined;
+        if (((_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.accessmode) === "S") {
+            primaryKey = {
+                isUnique: ((_b = this.parsedXML) === null || _b === void 0 ? void 0 : _b.keykind) === "U",
+                type: basic_1.TableAccessType.sorted,
+                keyFields: [],
+                name: "primary_key",
+            };
+            for (const f of ((_c = this.parsedXML) === null || _c === void 0 ? void 0 : _c.dd42v) || []) {
+                if (f.keyname === "") {
+                    primaryKey.keyFields.push(f.keyfield);
+                }
+            }
+        }
+        else if (((_d = this.parsedXML) === null || _d === void 0 ? void 0 : _d.accessmode) === "H") {
+            primaryKey = {
+                isUnique: ((_e = this.parsedXML) === null || _e === void 0 ? void 0 : _e.keykind) === "U",
+                type: basic_1.TableAccessType.hashed,
+                keyFields: [],
+                name: "primary_key",
+            };
+            for (const f of ((_f = this.parsedXML) === null || _f === void 0 ? void 0 : _f.dd42v) || []) {
+                if (f.keyname === "") {
+                    primaryKey.keyFields.push(f.keyfield);
+                }
+            }
+        }
         const tableOptions = {
             withHeader: false,
             keyType: Types.TableKeyType.user,
+            primaryKey: primaryKey,
             secondary: [],
         };
-        for (const k of ((_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.dd43v) || []) {
+        for (const k of ((_g = this.parsedXML) === null || _g === void 0 ? void 0 : _g.dd43v) || []) {
             const fields = [];
-            for (const f of ((_b = this.parsedXML) === null || _b === void 0 ? void 0 : _b.dd42v) || []) {
+            for (const f of ((_h = this.parsedXML) === null || _h === void 0 ? void 0 : _h.dd42v) || []) {
                 if (f.keyname === k.keyname) {
                     fields.push(f.keyfield);
                 }
@@ -53,7 +82,7 @@ class TableType extends _abstract_object_1.AbstractObject {
                 default:
                     break;
             }
-            (_c = tableOptions.secondary) === null || _c === void 0 ? void 0 : _c.push({
+            (_j = tableOptions.secondary) === null || _j === void 0 ? void 0 : _j.push({
                 name: k.keyname,
                 type: accessType,
                 keyFields: fields,
@@ -141,6 +170,9 @@ class TableType extends _abstract_object_1.AbstractObject {
         this.parsedXML.datatype = dd40v.DATATYPE;
         this.parsedXML.leng = dd40v.LENG;
         this.parsedXML.decimals = dd40v.DECIMALS;
+        this.parsedXML.accessmode = dd40v.ACCESSMODE;
+        this.parsedXML.keykind = dd40v.KEYKIND;
+        this.parsedXML.ddtext = dd40v.DDTEXT;
         for (const x of (0, xml_utils_1.xmlToArray)((_a = values.DD42V) === null || _a === void 0 ? void 0 : _a.DD42V)) {
             this.parsedXML.dd42v.push({
                 keyname: x.SECKEYNAME || "",

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.2";
+        return "2.102.4";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/prefer_pragmas.js

@@ -42,6 +42,8 @@ class PreferPragmas extends _abap_rule_1.ABAPRule {
             shortDescription: `prefer pragmas over pseudo comments `,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-pragmas-to-pseudo-comments`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
+            badExample: `DATA foo1 TYPE i. "#EC NEEDED`,
+            goodExample: `DATA foo2 TYPE i ##NEEDED.`,
         };
     }
     getConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.2",
+    "version": "2.102.4",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,10 +50,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.36.2",
+        "@microsoft/api-extractor": "^7.36.3",
         "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.2",
+        "@types/node": "^20.4.4",
         "chai": "^4.3.7",
         "eslint": "^8.45.0",
         "mocha": "^10.2.0",
@@ -63,7 +63,7 @@
         "typescript": "^5.1.6"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.2.5",
+        "fast-xml-parser": "^4.2.6",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.3"
     }