ueberdb2 4.1.37 → 4.1.38

package/dist/index.js

@@ -738,7 +738,7 @@ const nullLogger = normalizeLogger(null);
 // Format: All characters match themselves except * matches any zero or more characters. No
 // backslash escaping is supported, so it is impossible to create a pattern that matches only the
 // '*' character.
-const simpleGlobToRegExp$1 = (s) => s.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+const simpleGlobToRegExp = (s) => s.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
 class AbstractDatabase {
     logger;
     // @ts-ignore
@@ -758,9 +758,9 @@ class AbstractDatabase {
      * For findKey regex. Used by document dbs like mongodb or dirty.
      */
     createFindRegex(key, notKey) {
-        let regex = `^(?=${simpleGlobToRegExp$1(key)}$)`;
+        let regex = `^(?=${simpleGlobToRegExp(key)}$)`;
         if (notKey != null)
-            regex += `(?!${simpleGlobToRegExp$1(notKey)}$)`;
+            regex += `(?!${simpleGlobToRegExp(notKey)}$)`;
         return new RegExp(regex);
     }
     doBulk(operations, cb) {
@@ -102627,7 +102627,6 @@ const Database$b = class Database extends require$$0$7.EventEmitter {
         };
         settings.mock = this;
         this.settings = settings;
-        console.log("Initialized");
     }
     close(cb) {
         this.emit('close', cb);
@@ -347100,7 +347099,9 @@ const DATABASE = 'ueberdb';
 const STORE_WITH_DOT = 'store:';
 const STORE = 'store';
 const WILDCARD = '*';
-const simpleGlobToRegExp = (s) => s.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+const escapeId = (id) => {
+    return id.replace(/[\W_]+/g, "_");
+};
 const Database$1 = class SurrealDB extends AbstractDatabase {
     _client;
     constructor(settings) {
@@ -347127,9 +347128,14 @@ const Database$1 = class SurrealDB extends AbstractDatabase {
     async get(key) {
         if (this._client == null)
             return null;
-        const res = await this._client.select(STORE_WITH_DOT + key);
+        const keyEscaped = escapeId(key);
+        const res = await this._client.select(STORE_WITH_DOT + keyEscaped);
         if (res.length > 0) {
-            return res[0].value;
+            console.log("Get: ", res[0].key, key);
+            if (res[0].key === key) {
+                return res[0].value;
+            }
+            return null;
         }
         else {
             return null;
@@ -347141,8 +347147,9 @@ const Database$1 = class SurrealDB extends AbstractDatabase {
         if (notKey != null) {
             const query = `SELECT key FROM store WHERE ${this.transformWildcard(key, 'key')} AND ${this.transformWildcardNegative(notKey, 'notKey')}`;
             key = key.replace(WILDCARD, '');
+            key = escapeId(key);
             notKey = notKey.replace(WILDCARD, '');
-            console.log("Key ", key, " notKey ", notKey);
+            notKey = escapeId(notKey);
             const res = await this._client.query(query, { key: key, notKey: notKey });
             // @ts-ignore
             return this.transformResult(res);
@@ -347150,6 +347157,7 @@ const Database$1 = class SurrealDB extends AbstractDatabase {
         else {
             const query = `SELECT key FROM store WHERE ${this.transformWildcard(key, 'key')}`;
             key = key.replace(WILDCARD, '');
+            key = escapeId(key);
             const res = await this._client.query(query, { key });
             // @ts-ignore
             return this.transformResult(res);
@@ -347185,57 +347193,47 @@ const Database$1 = class SurrealDB extends AbstractDatabase {
     }
     transformResult(res) {
         const value = [];
-        console.log("Outer result ", res);
         res[0].result.forEach(k => {
-            console.log("Resultat ", k);
             value.push(k.key);
         });
         return value;
     }
-    /**
-     * For findKey regex. Used by document dbs like mongodb or dirty.
-     */
-    createFindRegex(key, notKey) {
-        let regex = `^(?=${simpleGlobToRegExp(key)}$)`;
-        if (notKey != null)
-            regex += `(?!${simpleGlobToRegExp(notKey)}$)`;
-        return new RegExp(regex);
-    }
     async set(key, value) {
         if (this._client == null)
             return null;
+        const keyEscaped = escapeId(key);
         const exists = await this.get(key);
         if (exists) {
-            const updatE = await this._client.update(STORE, {
-                id: key,
+            await this._client.update(STORE, {
+                id: keyEscaped,
                 key: key,
                 value: value
             });
-            console.log("Update ", updatE);
         }
         else {
-            const created = await this._client.create(STORE, {
-                id: key,
+            await this._client.create(STORE, {
+                id: keyEscaped,
                 key: key,
                 value: value
             });
-            console.log("Created ", created);
         }
     }
     async remove(key) {
         if (this._client == null)
             return null;
+        key = escapeId(key);
         return await this._client.delete(STORE_WITH_DOT + key);
     }
     async doBulk(bulk) {
         if (this._client == null)
             return null;
         bulk.forEach(b => {
+            const key = escapeId(b.key);
             if (b.type === 'set') {
-                this._client.update(STORE + b.key, { key: b.key, value: b.value });
+                this._client.update(STORE + key, { key: key, value: b.value });
             }
             else if (b.type === 'remove') {
-                this._client.delete(STORE + b.key);
+                this._client.delete(STORE + key);
             }
         });
     }

package/package.json

@@ -62,7 +62,7 @@
     "url": "https://github.com/ether/ueberDB.git"
   },
   "main": "./dist/index.js",
-  "version": "4.1.37",
+  "version": "4.1.38",
   "bugs": {
     "url": "https://github.com/ether/ueberDB/issues"
   },