@abaplint/runtime 2.7.78 → 2.7.80

package/build/src/abap_regex.js

@@ -12,7 +12,7 @@ class ABAPRegExp {
         return ret;
     }
     static escapeRegExp(text) {
-        return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+        return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
     }
 }
 exports.ABAPRegExp = ABAPRegExp;

package/build/src/builtin/replace.js

@@ -30,8 +30,7 @@ function replace(input) {
         sub = input.sub.get();
     }
     if (sub !== undefined) {
-        sub = sub.replace(/\\/g, "\\\\");
-        sub = sub.replace(/\[/g, "\\[");
+        sub = abap_regex_1.ABAPRegExp.escapeRegExp(sub);
     }
     if (typeof input.regex === "string") {
         sub = new RegExp(abap_regex_1.ABAPRegExp.convert(input.regex), "g");
@@ -51,7 +50,7 @@ function replace(input) {
             wi +
             input.val.getOffset({ offset: offset + length }).get();
     }
-    else if (input.occ === undefined && sub && wi) {
+    else if (input.occ === undefined && sub && wi !== undefined) {
         val = val.replace(sub, wi);
     }
     else if (input.occ && input.occ.get() === 0 && sub && wi !== undefined) {

package/build/src/statements/insert_internal.js

@@ -147,10 +147,10 @@ function insertInternal(options) {
             by = [];
         }
         if (by && by.length > 0) {
-            (0, sort_1.sort)(options.table, { by: by });
+            (0, sort_1.sort)(options.table, { by: by, skipSortedCheck: true });
         }
         else {
-            (0, sort_1.sort)(options.table);
+            (0, sort_1.sort)(options.table, { skipSortedCheck: true });
         }
     }
 }

package/build/src/statements/sort.d.ts

@@ -1,9 +1,10 @@
 import { FieldSymbol, Table } from "../types";
 export interface ISortOptions {
     descending?: boolean;
+    skipSortedCheck?: boolean;
     by?: {
         component: string;
         descending?: boolean;
     }[];
 }
-export declare function sort(input: Table | FieldSymbol, options?: ISortOptions): void;
+export declare function sort(input: Table | FieldSymbol | any[], options?: ISortOptions): void;

package/build/src/statements/sort.js

@@ -42,7 +42,8 @@ function compare(a, b, input) {
     }
 }
 function sort(input, options) {
-    //  console.dir(options);
+    //  console.dir(input);
+    var _a, _b;
     if (input instanceof types_1.FieldSymbol) {
         const pnt = input.getPointer();
         if (pnt === undefined) {
@@ -51,6 +52,11 @@ function sort(input, options) {
         sort(pnt, options);
         return;
     }
+    else if ((options === null || options === void 0 ? void 0 : options.skipSortedCheck) !== true
+        && input instanceof types_1.Table
+        && ((_b = (_a = input.getOptions()) === null || _a === void 0 ? void 0 : _a.primaryKey) === null || _b === void 0 ? void 0 : _b.type) === types_1.TableAccessType.sorted) {
+        throw new Error("SORT called on sorted table");
+    }
     if (input instanceof types_1.HashedTable) {
         throw new Error("Sort hashed table, ugh?");
     }

package/build/src/types/table.d.ts

@@ -46,8 +46,6 @@ export declare let featureHashedTables: boolean;
 export declare class TableFactory {
     static construct(rowType: TableRowType, options?: ITableOptions, qualifiedName?: string): Table | HashedTable;
 }
-export declare class SortedTable {
-}
 export declare class HashedTable implements ITable {
     private value;
     private readonly header;

package/build/src/types/table.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Table = exports.HashedTable = exports.SortedTable = exports.TableFactory = exports.featureHashedTables = exports.LoopController = exports.TableKeyType = exports.TableAccessType = void 0;
+exports.Table = exports.HashedTable = exports.TableFactory = exports.featureHashedTables = exports.LoopController = exports.TableKeyType = exports.TableAccessType = void 0;
 const integer_1 = require("./integer");
 const string_1 = require("./string");
 const clone_1 = require("../clone");
@@ -57,9 +57,11 @@ class TableFactory {
     }
 }
 exports.TableFactory = TableFactory;
-class SortedTable {
+/*
+export class SortedTable {
+  // todo
 }
-exports.SortedTable = SortedTable;
+*/
 class HashedTable {
     constructor(rowType, options, qualifiedName) {
         this.value = {};
@@ -277,7 +279,7 @@ class Table {
             throw `Table, secondary key "${name}" not found`;
         }
         const copy = [...this.value];
-        (0, sort_1.sort)(copy, { by: secondary.keyFields.map(k => { return { component: k.toLowerCase() }; }) });
+        (0, sort_1.sort)(copy, { by: secondary.keyFields.map(k => { return { component: k.toLowerCase() }; }), skipSortedCheck: true });
         this.secondaryIndexes[name.toUpperCase()] = copy;
         return copy;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.7.78",
+  "version": "2.7.80",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",