@abaplint/runtime 2.3.47 → 2.3.49

package/build/src/compare/cp.js

@@ -36,6 +36,8 @@ function cp(left, right) {
     r = r.replace(/\)/g, "\\)");
     r = r.replace(/\./g, "\\.");
     r = r.replace(/\|/g, "\\|");
+    r = r.replace(/\$/g, "\\$");
+    r = r.replace(/\^/g, "\\^");
     r = r.replace(/#\*/g, "\\u{002A}");
     r = r.replace(/#\+/g, "\\u{002B}");
     r = r.replace(/\*/g, "[\\s\\S]*");

package/build/src/statements/insert_internal.js

@@ -7,23 +7,32 @@ const types_1 = require("../types");
 const read_table_1 = require("./read_table");
 const sort_1 = require("./sort");
 function insertInternal(options) {
-    var _a;
+    var _a, _b, _c, _d, _e;
     if (options.table instanceof types_1.FieldSymbol) {
         options.table = options.table.getPointer();
     }
     const tableOptions = options.table.getOptions();
-    const isSorted = (tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.type) === types_1.TableAccessType.sorted || (tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.type) === types_1.TableAccessType.hashed;
+    const isSorted = ((_a = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === types_1.TableAccessType.sorted || ((_b = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.primaryKey) === null || _b === void 0 ? void 0 : _b.type) === types_1.TableAccessType.hashed;
     if (isSorted) {
         const insert = options.data instanceof types_1.Structure ? options.data.get() : { table_line: options.data };
         const compare = (row) => {
-            for (const key of (tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.keyFields) || []) {
-                if ((0, compare_1.ne)(row[key.toLowerCase()], insert[key.toLowerCase()])) {
-                    return false;
+            var _a;
+            for (const key of ((_a = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.primaryKey) === null || _a === void 0 ? void 0 : _a.keyFields) || []) {
+                if (key.includes("-")) {
+                    const [first, second] = key.split("-");
+                    if ((0, compare_1.ne)(row[first.toLowerCase()].get()[second.toLowerCase()], insert[first.toLowerCase()].get()[second.toLowerCase()])) {
+                        return false;
+                    }
+                }
+                else {
+                    if ((0, compare_1.ne)(row[key.toLowerCase()], insert[key.toLowerCase()])) {
+                        return false;
+                    }
                 }
             }
             return true;
         };
-        if (tableOptions.isUnique === true) {
+        if (((_c = tableOptions.primaryKey) === null || _c === void 0 ? void 0 : _c.isUnique) === true) {
             (0, read_table_1.readTable)(options.table, { withKey: compare });
             // @ts-ignore
             if (abap.builtin.sy.get().subrc.get() === 0) {
@@ -78,7 +87,7 @@ function insertInternal(options) {
     abap.builtin.sy.get().subrc.set(0);
     if (isSorted) {
         // slow, but works for now
-        const by = (_a = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.keyFields) === null || _a === void 0 ? void 0 : _a.map(f => { return { component: f.toLowerCase() }; });
+        const by = (_e = (_d = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.primaryKey) === null || _d === void 0 ? void 0 : _d.keyFields) === null || _e === void 0 ? void 0 : _e.map(f => { return { component: f.toLowerCase() }; });
         (0, sort_1.sort)(options.table, { by: by });
     }
 }

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

@@ -1,6 +1,7 @@
 import { FieldSymbol, Integer, Table } from "../types";
 export interface ILoopOptions {
     where?: (i: any) => Promise<boolean>;
+    usingKey?: string;
     from?: Integer;
     to?: Integer;
 }

package/build/src/statements/read_table.js

@@ -4,7 +4,7 @@ exports.readTable = void 0;
 const compare_1 = require("../compare");
 const types_1 = require("../types");
 function readTable(table, options) {
-    var _a;
+    var _a, _b;
     let found = undefined;
     let foundIndex = 0;
     const arr = table.array();
@@ -34,7 +34,7 @@ function readTable(table, options) {
     }
     else if (options === null || options === void 0 ? void 0 : options.from) {
         if (table instanceof types_1.Table && options.from instanceof types_1.Structure) {
-            const keys = (_a = table.getOptions()) === null || _a === void 0 ? void 0 : _a.keyFields;
+            const keys = (_b = (_a = table.getOptions()) === null || _a === void 0 ? void 0 : _a.primaryKey) === null || _b === void 0 ? void 0 : _b.keyFields;
             const isStructured = arr[0] instanceof types_1.Structure;
             if (keys !== undefined && isStructured === true) {
                 //        console.dir(keys);

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

@@ -15,11 +15,16 @@ export declare class LoopIndex {
     index: number;
     constructor(start: number);
 }
-export declare type ITableOptions = {
+export declare type ITableKey = {
+    name: string;
     type?: TableAccessType;
-    keyFields?: string[];
-    isUnique?: boolean;
+    keyFields: string[];
+    isUnique: boolean;
+};
+export declare type ITableOptions = {
     withHeader: boolean;
+    primaryKey?: ITableKey;
+    secondary?: ITableKey[];
 };
 export declare type TableRowType = INumeric | Structure | ICharacter | Table | ABAPObject;
 export declare class Table {

package/build/src/types/table.js

@@ -32,9 +32,12 @@ class Table {
         }
         if (this.options === undefined) {
             this.options = {
-                type: TableAccessType.standard,
-                keyFields: [],
-                isUnique: false,
+                primaryKey: {
+                    name: "primary_key",
+                    type: TableAccessType.standard,
+                    keyFields: [],
+                    isUnique: false,
+                },
                 withHeader: false,
             };
         }

package/package.json

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