@abaplint/cli 2.102.28 → 2.102.30

package/build/cli.js

@@ -8519,7 +8519,8 @@ class TypeTableKey extends combi_1.Expression {
         const defaultKey = "DEFAULT KEY";
         const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
         const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)("READ-ONLY"));
+        const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }
@@ -9612,7 +9613,7 @@ class CallFunction {
         const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
-        const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");
+        const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodSource, "ON END OF TASK");
         const performing = (0, combi_1.seq)("PERFORMING", expressions_1.FormName, "ON END OF TASK");
         const separate = (0, combi_1.str)("AS SEPARATE UNIT");
         const keeping = (0, combi_1.str)("KEEPING LOGICAL UNIT OF WORK");
@@ -16646,7 +16647,7 @@ class TypeMesh {
         const on = (0, combi_1.seq)("ON", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName, (0, combi_1.star)((0, combi_1.seq)("AND", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName)));
         const using = (0, combi_1.seq)("USING KEY", expressions_1.NamespaceSimpleName);
         const association = (0, combi_1.seq)("ASSOCIATION", expressions_1.NamespaceSimpleName, "TO", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(on));
-        const ret = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
+        const ret = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
         return ret;
     }
 }
@@ -20515,6 +20516,9 @@ class CurrentScope {
         if (this.current.getData().types[upper] !== undefined) {
             throw new Error(`Type name "${name}" already defined`);
         }
+        else if (this.isOO() && this.current.getData().vars[upper] !== undefined) {
+            throw new Error(`"${name}" already defined`);
+        }
         this.current.getData().types[upper] = type;
     }
     addExtraLikeType(type) {
@@ -20564,6 +20568,9 @@ class CurrentScope {
         if (this.current.getData().vars[upper] !== undefined) {
             throw new Error(`Variable name "${name}" already defined`);
         }
+        else if (this.isOO() && this.current.getData().types[upper] !== undefined) {
+            throw new Error(`"${name}" already defined`);
+        }
         this.current.getData().vars[upper] = identifier;
     }
     addIdentifier(identifier) {
@@ -20830,7 +20837,7 @@ class CurrentScope {
         while (curr !== undefined) {
             const stype = curr.getIdentifier().stype;
             if (stype === _scope_type_1.ScopeType.ClassDefinition
-                || stype === _scope_type_1.ScopeType.ClassImplementation
+                //          || stype === ScopeType.ClassImplementation
                 || stype === _scope_type_1.ScopeType.Interface) {
                 return true;
             }
@@ -30977,6 +30984,7 @@ const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modu
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class Sort {
     runSyntax(node, scope, filename) {
+        var _a, _b;
         for (const s of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(s, scope, filename);
         }
@@ -30984,6 +30992,9 @@ class Sort {
         if (tnode) {
             const ttype = new target_1.Target().runSyntax(tnode, scope, filename);
             if (ttype instanceof basic_1.TableType) {
+                if (((_b = (_a = ttype.getOptions()) === null || _a === void 0 ? void 0 : _a.primaryKey) === null || _b === void 0 ? void 0 : _b.type) === basic_1.TableAccessType.sorted) {
+                    throw new Error(`Sorted table, already sorted`);
+                }
                 const rowType = ttype.getRowType();
                 if (!(rowType instanceof basic_1.VoidType)
                     && !(rowType instanceof basic_1.UnknownType)
@@ -48738,7 +48749,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.28";
+        return "2.102.30";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.28",
+    "version": "2.102.30",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,23 +38,23 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.28",
+        "@abaplint/core": "^2.102.30",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.5.4",
+        "@types/node": "^20.5.7",
         "@types/progress": "^2.0.5",
-        "chai": "^4.3.7",
+        "chai": "^4.3.8",
         "chalk": "^5.3.0",
-        "eslint": "^8.47.0",
+        "eslint": "^8.48.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
         "memfs": "^4.2.1",
         "minimist": "^1.2.8",
         "mocha": "^10.2.0",
         "progress": "^2.0.3",
-        "typescript": "^5.1.6",
+        "typescript": "^5.2.2",
         "webpack": "^5.88.2",
         "webpack-cli": "^5.1.4",
         "xml-js": "^1.6.11"