@k3000/store 1.5.5 → 1.7.0

package/architect.mjs

@@ -1,5 +1,3 @@
-import {dirname} from "node:path"
-import {fileURLToPath} from "node:url"
 import {openSync, closeSync, readFileSync, writeFileSync, readSync, writeSync, unlinkSync} from "node:fs"
 import {createCipheriv, createDecipheriv, createHash, scryptSync} from "node:crypto"
 
@@ -221,23 +219,14 @@ export class Entity {
 
     #indexPosition(index, buffer, length, s, e) {
 
-        if (e < s) return s
+        if (s + 1 === e) return e
 
-        let result = buffer.compare(this.#storage.getValue(index[s], length))
-
-        if (s === e) return result < 0 ? s : s + 1
-        if (result <= 0) return s
-
-        result = buffer.compare(this.#storage.getValue(index[e], length))
-
-        if (result >= 0) return e + 1
-
-        let m = Math.floor((s + e) / 2)
+        const m = Math.round((s + e) / 2)
 
-        result = buffer.compare(this.#storage.getValue(index[m], length))
+        const result = buffer.compare(this.#storage.getValue(index[m], length))
 
-        if (result < 0) return this.#indexPosition(index, buffer, length, s + 1, m - 1)
-        if (result > 0) return this.#indexPosition(index, buffer, length, m + 1, e - 1)
+        if (result < 0) return this.#indexPosition(index, buffer, length, s, m)
+        if (result > 0) return this.#indexPosition(index, buffer, length, m, e)
 
         return m
     }
@@ -264,21 +253,36 @@ export class Entity {
             if (i >= 0) {
 
                 index.splice(i, 1)
+            }
 
-                if (buf.compare(buffer) > 0) {
+            let resutl = buffer.compare(this.#storage.getValue(index[0], length))
 
-                    e = i - 1
+            if (index.length === 0) {
 
-                } else {
+                i = 0
+
+            } else if (index.length === 1) {
+
+                i = resutl < 0 ? 0 : 1
 
-                    e--
+            } else if (resutl <= 0) {
+
+                i = 0
+
+            } else {
 
-                    s = i
+                resutl = buffer.compare(this.#storage.getValue(index[e], length))
+
+                if (resutl >= 0) {
+
+                    i = e + 1
+
+                } else {
+
+                    i = this.#indexPosition(index, buffer, length, s, e)
                 }
             }
 
-            i = index.length === 0 ? 0 : this.#indexPosition(index, buffer, length, s, e)
-
             index.splice(i, 0, position)
         }
     }
@@ -463,9 +467,9 @@ export class Entities extends Array {
 
         let i
 
-        for (const value of Object.values(this.#index)) {
+        for (const [key, value] of Object.entries(this.#index)) {
 
-            i = value.indexOf(index)
+            i = value.indexOf(index + this.#positionSet[key])
 
             if (i >= 0) {
 
@@ -729,6 +733,15 @@ export class Entities extends Array {
         return result
     }
 
+    findByValue(name, value) {
+
+        const index = this.#index[name]
+        const position = this.#positionSet[name]
+
+        return this.#findByValue(index, value, this.#lengthSet[name], 0, index.length - 1)
+            .map(index => this.#getEntity(index - position))
+    }
+
     #indexAfterPosition(index, after, length, s, e) {
 
         if (s + 1 === e) return after.compare(this.#storage.getValue(index[s], length)) > 0 ? e : s
@@ -800,15 +813,6 @@ export class Entities extends Array {
             .map(index => this.#getEntity(index - position))
     }
 
-    findByValue(name, value) {
-
-        const index = this.#index[name]
-        const position = this.#positionSet[name]
-
-        return this.#findByValue(index, value, this.#lengthSet[name], 0, index.length - 1)
-            .map(index => this.#getEntity(index - position))
-    }
-
     #findByTime(index, after, before, length, s, e) {
 
         if (e < s) return []
@@ -960,7 +964,7 @@ export class Storage {
 
     constructor(url, password, newPwd) {
 
-        let dir = url.startsWith('file:///') ? dirname(fileURLToPath(url)) : url
+        let dir = url.startsWith('file:///') ? process.cwd() : url
 
         dir = dir.replace(/\\/g, '/')
 
@@ -1303,6 +1307,17 @@ export class Storage {
                     expired: true,
                     needsSave,
                 })
+
+            } else {
+
+                try {
+
+                    writeSync(this.#fd_data, value, 0, length, position)
+
+                } catch (e) {
+
+                    console.error(e)
+                }
             }
 
             return needsSave
@@ -1372,9 +1387,12 @@ export class Storage {
 
     updateValue(value, name, key) {
 
-        if (!value) return this.#record.value[name][key] += this.#struct.base[name][key].step
+        if (value === undefined) return this.#record.value[name][key] += this.#struct.base[name][key].step
+
+        if (Number.isNaN(Number.parseFloat(value))) {
 
-        value = Number.parseFloat(value) || 1
+            value = 1
+        }
 
         if (value > this.#record.value[name][key]) this.#record.value[name][key] = value
 

package/generator.mjs

@@ -1315,7 +1315,7 @@ ${Object.entries(value).map(([k, v]) => {
                 return `
     indexBy${n}(${k}, ${k}_2) {
 
-        if (${k}_2 === undefined) return super.findByValue($${k}, ${gen.set[v.type]}(${k}, $${k}))
+        if (${k}_2 === undefined || ${k} == ${k}_2) return super.findByValue($${k}, ${gen.set[v.type]}(${k}, $${k}))
 
         return super.findByRange($${k}, ${gen.set[v.type]}(${k}, $${k}), ${gen.set[v.type]}(${k}_2, $${k}))
     }`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k3000/store",
-  "version": "1.5.5",
+  "version": "1.7.0",
   "description": "storage",
   "main": "generator.mjs",
   "scripts": {