@abaplint/core 2.95.33 → 2.95.35

package/build/src/abap/2_statements/expressions/type_table.js

@@ -10,13 +10,14 @@ class TypeTable extends combi_1.Expression {
     getRunnable() {
         const header = "WITH HEADER LINE";
         const initial = (0, combi_1.seq)("INITIAL SIZE", _1.Constant);
-        const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE", (0, combi_1.opt)("OF"), (0, combi_1.opt)("REF TO"), (0, combi_1.opt)(_1.TypeName));
+        const generic = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE");
+        const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.opt)("REF TO"), (0, combi_1.opt)(_1.TypeName));
         const likeType = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), (0, combi_1.opt)(field_chain_1.FieldChain), (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
         const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
         const rangeLike = (0, combi_1.seq)("RANGE OF", _1.SimpleFieldChain, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
         // a maximum of 15 secondary table keys can be defined
         // "WITH" is not allowed as a field name in keys
-        const typetable = (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial))));
+        const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial)))));
         const occurs = (0, combi_1.seq)("OCCURS", _1.Integer);
         const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "FAILED", "LOCK", "READ RESULT", "UPDATE"), _1.TypeName));
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));

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

@@ -287,17 +287,24 @@ class BasicTypes {
         }
         const typeTableKeys = node.findAllExpressions(expressions_1.TypeTableKey);
         const firstKey = typeTableKeys[0];
+        const isNamed = (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpression(expressions_1.Field)) !== undefined;
         const primaryKey = {
             name: "primary_key",
             type: type,
-            isUnique: (firstKey === null || firstKey === void 0 ? void 0 : firstKey.concatTokens().toUpperCase().includes("WITH UNIQUE ")) === true,
+            isUnique: isNamed ? false : (firstKey === null || firstKey === void 0 ? void 0 : firstKey.concatTokens().toUpperCase().includes("WITH UNIQUE ")) === true,
             keyFields: [],
         };
-        for (const k of (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpressions(expressions_1.FieldSub)) || []) {
-            primaryKey.keyFields.push(k.concatTokens().toUpperCase());
+        let start = 1;
+        if (isNamed === false) {
+            for (const k of (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpressions(expressions_1.FieldSub)) || []) {
+                primaryKey.keyFields.push(k.concatTokens().toUpperCase());
+            }
+        }
+        else {
+            start = 0;
         }
         const secondaryKeys = [];
-        for (let i = 1; i < typeTableKeys.length; i++) {
+        for (let i = start; i < typeTableKeys.length; i++) {
             const row = typeTableKeys[i];
             const name = (_b = row.findDirectExpression(expressions_1.Field)) === null || _b === void 0 ? void 0 : _b.concatTokens();
             if (name === undefined) {
@@ -684,6 +691,9 @@ class BasicTypes {
                 return new Types.UnknownType("Not a structured type");
             }
             foundType = foundType.getComponentByName(subs[0]);
+            if (foundType === undefined) {
+                return new Types.UnknownType(`Field "${subs[0]}" not found in structure`);
+            }
             subs.shift();
         }
         return foundType;

package/build/src/abap/types/basic/data_reference_type.js

@@ -14,6 +14,10 @@ class DataReference extends _abstract_type_1.AbstractType {
         return this.type;
     }
     toABAP() {
+        const type = this.type.toABAP();
+        if (type.includes(" TABLE OF ")) {
+            return ""; // hmm, should this return undefined?
+        }
         return "REF TO " + this.type.toABAP();
     }
     isGeneric() {

package/build/src/abap/types/basic/table_type.js

@@ -12,9 +12,13 @@ var TableAccessType;
 })(TableAccessType = exports.TableAccessType || (exports.TableAccessType = {}));
 class TableType extends _abstract_type_1.AbstractType {
     constructor(rowType, options, qualifiedName) {
+        var _a;
         super({ qualifiedName: qualifiedName });
         this.rowType = rowType;
         this.options = options;
+        if (((_a = options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === TableAccessType.standard && options.primaryKey.isUnique === true) {
+            throw new Error("STANDARD tables cannot have UNIQUE key");
+        }
     }
     getOptions() {
         return this.options;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.33";
+        return "2.95.35";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -1545,7 +1545,7 @@ ${indentation}    output = ${topTarget}.`;
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline LOOP input", this.getMetadata().key, this.conf.severity, fix);
     }
-    outlineLoopTarget(node, lowFile, _highSyntax) {
+    outlineLoopTarget(node, lowFile, highSyntax) {
         var _a, _b, _c, _d, _e, _f, _g;
         // also allows outlining of voided types
         if (!(node.get() instanceof Statements.Loop)) {
@@ -1556,16 +1556,19 @@ ${indentation}    output = ${topTarget}.`;
             return undefined;
         }
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes(" REFERENCE INTO ")
-            || concat.includes(" GROUP BY ")
-            || concat.startsWith("LOOP AT GROUP ")) {
+        if (concat.includes(" GROUP BY ") || concat.startsWith("LOOP AT GROUP ")) {
             return undefined;
         }
+        const isReference = concat.includes(" REFERENCE INTO ");
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
         const dataTarget = (_c = (_b = node.findDirectExpression(Expressions.LoopTarget)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.findDirectExpression(Expressions.InlineData);
         if (dataTarget) {
             const targetName = ((_d = dataTarget.findDirectExpression(Expressions.TargetField)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "DOWNPORT_ERROR";
-            const code = `DATA ${targetName} LIKE LINE OF ${sourceName}.\n${indentation}`;
+            let code = `DATA ${targetName} LIKE LINE OF ${sourceName}.\n${indentation}`;
+            if (isReference) {
+                const likeName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+                code = `DATA ${likeName} LIKE LINE OF ${sourceName}.\n${indentation}DATA ${targetName} LIKE REF TO ${likeName}.\n${indentation}`;
+            }
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, dataTarget.getFirstToken().getStart(), dataTarget.getLastToken().getEnd(), targetName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
@@ -2173,10 +2176,15 @@ ${indentation}    output = ${topTarget}.`;
             else if (found.getType() instanceof basic_1.VoidType && found.getType().getQualifiedName() === undefined) {
                 continue;
             }
-            let type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
+            let type = found.getType().getQualifiedName()
+                ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase()
+                : found.getType().toABAP();
             if (found.getType() instanceof basic_1.ObjectReferenceType) {
                 type = found.getType().toABAP();
             }
+            if (type === "") {
+                continue;
+            }
             const code = `DATA ${name} TYPE ${type}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.33",
+    "version": "2.95.35",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",