@abaplint/cli 2.119.45 → 2.119.46

package/build/cli.js

@@ -32672,7 +32672,7 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/bui
 const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
 const isSimple = /^\w+$/;
 class Select {
-    static runSyntax(node, input, skipImplicitInto = false) {
+    static runSyntax(node, input, skipImplicitInto = false, selectLoop = false) {
         var _a;
         const token = node.getFirstToken();
         let from = node.findDirectExpression(Expressions.SQLFrom);
@@ -32731,6 +32731,14 @@ class Select {
             sql_source_1.SQLSource.runSyntax(s, input);
         }
         for (const up of node.findDirectExpressions(Expressions.SQLUpTo)) {
+            if (intoExpression
+                && this.isStrictMode(node, input)
+                && (selectLoop === false || input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud)
+                && from.getFirstToken().getStart().isBefore(up.getFirstToken().getStart())
+                && up.getFirstToken().getStart().isBefore(intoExpression.getFirstToken().getStart())) {
+                const message = `The addition "UP TO n ROWS" must only be placed after the INTO/APPENDING clause.`;
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, up.getFirstToken(), message));
+            }
             for (const s of up.findDirectExpressions(Expressions.SQLSource)) {
                 sql_source_1.SQLSource.runSyntax(s, input);
             }
@@ -32756,7 +32764,7 @@ class Select {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, orderBy.getFirstToken(), message));
             }
         }
-        if (this.isStrictMode(node)) {
+        if (this.isStrictMode(node, input)) {
             this.strictModeChecks(node, input);
         }
         if (input.scope.getType() === _scope_type_1.ScopeType.OpenSQL) {
@@ -32764,7 +32772,11 @@ class Select {
         }
     }
     // there are multiple rules, but gotta start somewhere
-    static isStrictMode(node) {
+    static isStrictMode(node, input) {
+        // strict OpenSQL is always required in the cloud language version
+        if (input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud) {
+            return true;
+        }
         const into = node.findDirectExpressionsMulti([Expressions.SQLIntoList, Expressions.SQLIntoStructure, Expressions.SQLIntoTable])[0];
         const where = node.findDirectExpression(Expressions.SQLCond);
         // INTO is after WHERE
@@ -38188,8 +38200,9 @@ class DeleteInternal {
             const localVariable = input.scope.findVariable(target.concatTokens());
             if (localVariable === undefined && node.getChildren().length === 5 && node.getChildren()[2].concatTokens().toUpperCase() === "FROM") {
                 // it might be a database table
-                tabl = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(target.concatTokens());
-                if (tabl) {
+                const found = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(target.concatTokens());
+                if ((found === null || found === void 0 ? void 0 : found.object) !== undefined) {
+                    tabl = found;
                     input.scope.getDDICReferences().addUsing(input.scope.getParentObj(), { object: tabl.object });
                 }
             }
@@ -38197,7 +38210,7 @@ class DeleteInternal {
                 targetType = target_1.Target.runSyntax(target, input);
                 if (node.findDirectTokenByText("TABLE") === undefined
                     && node.findDirectTokenByText("ADJACENT") === undefined
-                    && node.findDirectTokenByText("FROM")
+                    && (node.findDirectTokenByText("FROM") || node.findDirectTokenByText("INDEX"))
                     && targetType instanceof basic_1.TableType
                     && targetType.getAccessType() === basic_1.TableAccessType.hashed) {
                     const message = "Implicit or explicit index operation on hashed table is not possible";
@@ -40762,6 +40775,14 @@ class Loop {
         }
         const targetConcat = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.concatTokens().toUpperCase();
         const topType = sourceType; // todo: refactor topType vs sourceType vs rowType
+        if (topType instanceof basic_1.TableType
+            && topType.getAccessType() === basic_1.TableAccessType.hashed
+            && node.findDirectTokenByText("USING") === undefined
+            && (node.findDirectTokenByText("FROM") || node.findDirectTokenByText("TO"))) {
+            const message = "Implicit or explicit index operation on hashed table is not possible";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return;
+        }
         if (sourceType instanceof basic_1.TableType) {
             rowType = sourceType.getRowType();
             sourceType = rowType;
@@ -41304,6 +41325,13 @@ class ModifyInternal {
                 // ok
             }
             else if (targetType instanceof basic_1.TableType) {
+                if (node.findDirectTokenByText("TABLE") === undefined
+                    && node.findDirectTokenByText("INDEX")
+                    && targetType.getAccessType() === basic_1.TableAccessType.hashed) {
+                    const message = "Implicit or explicit index operation on hashed table is not possible";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return;
+                }
                 if (node.findDirectTokenByText("TABLE")
                     && node.findDirectTokenByText("INDEX")
                     && targetType.isWithHeader() === false) {
@@ -43203,7 +43231,7 @@ class SelectLoop {
     runSyntax(node, input) {
         const s = node.findDirectExpression(Expressions.Select);
         if (s) {
-            select_1.Select.runSyntax(s, input);
+            select_1.Select.runSyntax(s, input, false, true);
         }
     }
 }
@@ -67395,7 +67423,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.45";
+        return "2.119.46";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -98434,7 +98462,25 @@ class Progress {
         this.bar.render();
     }
 }
+function validateVersion(version) {
+    if (version === undefined) {
+        return;
+    }
+    let known = false;
+    if (typeof version === "string") {
+        const vers = core_1.Version;
+        known = Object.keys(core_1.Version).some(v => vers[v] === version);
+    }
+    else if (typeof version === "object" && typeof version.release === "string") {
+        // new object form: {release, language}
+        known = core_1.Release[version.release] !== undefined;
+    }
+    if (known === false) {
+        throw "Error: Unknown version in abaplint.json";
+    }
+}
 function loadConfig(filename) {
+    var _a;
     // possible cases:
     // a) nothing specified, using abaplint.json from cwd
     // b) nothing specified, no abaplint.json in cwd
@@ -98474,10 +98520,7 @@ function loadConfig(filename) {
     process.stderr.write("Using config: " + f + "\n");
     const json = fs.readFileSync(f, "utf8");
     const parsed = JSON5.parse(json);
-    const vers = core_1.Version;
-    if (Object.keys(core_1.Version).some(v => vers[v] === parsed.syntax.version) === false) {
-        throw "Error: Unknown version in abaplint.json";
-    }
+    validateVersion((_a = parsed.syntax) === null || _a === void 0 ? void 0 : _a.version);
     return {
         config: new core_1.Config(json),
         base: path.dirname(f) === process.cwd() ? "." : path.dirname(f),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.119.45",
+    "version": "2.119.46",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.45",
+        "@abaplint/core": "^2.119.46",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",