@k3000/store 1.4.4 → 1.5.1

package/README.md

@@ -145,7 +145,7 @@ updateCol('user', {
     loginTime: Time().value(Time.update).remark('登录时间')
 })
 
-// 更名索引
+// 更新索引
 updateIndex('test', {
     uid: true,
     pwd: false,

package/architect.mjs

@@ -710,14 +710,16 @@ export class Entities extends Array {
 
         result = [index[m]]
 
-        for (let i = m - 1; i >= 0; i--) {
+        let i
+
+        for (i = m - 1; i >= 0; i--) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
             result.unshift(index[i])
         }
 
-        for (let i = m + 1; i < index.length; i++) {
+        for (i = m + 1; i < index.length; i++) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
@@ -727,14 +729,75 @@ export class Entities extends Array {
         return result
     }
 
-    findByValue2(name, value, value2) {
+    #indexAfterPosition(index, after, length, s, e) {
+
+        if (s + 1 === e) return after.compare(this.#storage.getValue(index[s], length)) > 0 ? e : s
+
+        const m = Math.round((s + e) / 2)
+
+        const result = after.compare(this.#storage.getValue(index[m], length))
+
+        if (result > 0) return this.#indexAfterPosition(index, after, length, m, e)
+
+        return this.#indexAfterPosition(index, after, length, s, m)
+    }
+
+    #indexBeforePosition(index, before, length, s, e) {
+
+        if (s + 1 === e) return before.compare(this.#storage.getValue(index[e], length)) < 0 ? s : e
+
+        const m = Math.round((s + e) / 2)
+
+        const result = before.compare(this.#storage.getValue(index[m], length))
+
+        if (result < 0) return this.#indexBeforePosition(index, before, length, s, m)
+
+        return this.#indexBeforePosition(index, before, length, m, e)
+    }
+
+    #findByRange(index, after, before, length) {
+
+        if (index.length === 0) return []
+
+        let s = 0, e = index.length - 1
+
+        let result = this.#storage.getValue(index[s], length)
+
+        if (index.length === 1) {
+
+            if (result.compare(after) >= 0 && result.compare(before) <= 0) {
+
+                return [index[0]]
+            }
+
+            return []
+        }
+
+        if (result.compare(before) > 0) return []
+
+        result = this.#storage.getValue(index[e], length)
+
+        if (result.compare(after) < 0) return []
+
+        s = this.#indexAfterPosition(index, after, length, s, e)
+
+        e = this.#indexBeforePosition(index, before, length, s, e)
+
+        return index.slice(s, e + 1)
+    }
+
+    findByRange(name, value, value2) {
+
+        const index = this.#index[name]
+        const position = this.#positionSet[name]
 
         if (value.compare(value2) > 0) {
 
             [value, value2] = [value2, value]
         }
 
-
+        return this.#findByRange(index, value, value2, this.#lengthSet[name])
+            .map(index => this.#getEntity(index - position))
     }
 
     findByValue(name, value) {

package/generator.mjs

@@ -1304,15 +1304,17 @@ ${Object.entries(value).map(([k, v]) => {
                 return `
     indexBy${n}({after, before} = {}) {
 
-        return super.findByTime($${k}, {after, before})
+        return super.findByRange($${k}, d2b(after || 0), d2b(before || MaxTime))
     }`
 
             } else {
 
                 return `
-    indexBy${n}(${k}) {
+    indexBy${n}(${k}, ${k}_2) {
 
-        return super.findByValue($${k}, ${gen.set[v.type]}(${k}, $${k}))
+        if (${k}_2 === undefined) 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}))
     }`
             }
 
@@ -1338,12 +1340,13 @@ interface ${key} {
     ${key}: ${gen.type[value.type]}`).join('')}
 }
 
+// @ts-ignore
 interface ${key}Set extends Array<${key}> {
     ${Object.entries(value).filter(([, value]) => value.index).map(([k, value]) => {
             const Key = k[0].toUpperCase() + k.substring(1)
             return value.type === typeMap.time ? `
     indexBy${Key}({after, before}): Array<${key}>` : `
-    indexBy${Key}(${k}: ${gen.type[value.type]}): Array<${key}>`
+    indexBy${Key}(${k}: ${gen.type[value.type]}, ${k}_2?: ${gen.type[value.type]}): Array<${key}>`
         }).join('')}
     /**
      * 重写push方法
@@ -1384,7 +1387,7 @@ export interface Storage {${Object.keys(struct.base).map(key => {
 
 const clipIndexMjs = (path, struct) => writeFileSync(path, `
 import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
-doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '${modulePath}'
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '${modulePath}'
 import {struct} from '${modulePath2}'
 
 const storage = new Storage(import.meta.url)

package/package.json

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

package/test/1/index.mjs

@@ -1,6 +1,6 @@
 
 import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
-doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '../../architect.mjs'
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '../../architect.mjs'
 import {struct} from '../../generator.mjs'
 
 const storage = new Storage(import.meta.url)
@@ -270,24 +270,30 @@ class AdminSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
-    indexByValid(valid) {
+    indexByValid(valid, valid_2) {
+
+        if (valid_2 === undefined) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
 
-        return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+        return super.findByRange($valid, super.intToBuffer(valid, $valid), super.intToBuffer(valid_2, $valid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -326,19 +332,23 @@ class LogSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -377,9 +387,11 @@ class TestSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
+
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 }
 

package/test/1/type.ts

@@ -23,11 +23,12 @@ interface Admin {
     time: Number | Date
 }
 
+// @ts-ignore
 interface AdminSet extends Array<Admin> {
     
-    indexById(id: Number): Array<Admin>
-    indexByUid(uid: String): Array<Admin>
-    indexByValid(valid: Number): Array<Admin>
+    indexById(id: Number, id_2?: Number): Array<Admin>
+    indexByUid(uid: String, uid_2?: String): Array<Admin>
+    indexByValid(valid: Number, valid_2?: Number): Array<Admin>
     indexByTime({after, before}): Array<Admin>
     /**
      * 重写push方法
@@ -79,10 +80,11 @@ interface Log {
     content: String
 }
 
+// @ts-ignore
 interface LogSet extends Array<Log> {
     
-    indexById(id: Number): Array<Log>
-    indexByUid(uid: String): Array<Log>
+    indexById(id: Number, id_2?: Number): Array<Log>
+    indexByUid(uid: String, uid_2?: String): Array<Log>
     indexByTime({after, before}): Array<Log>
     /**
      * 重写push方法
@@ -154,9 +156,10 @@ interface Test {
     text: String
 }
 
+// @ts-ignore
 interface TestSet extends Array<Test> {
     
-    indexById(id: Number): Array<Test>
+    indexById(id: Number, id_2?: Number): Array<Test>
     /**
      * 重写push方法
      */

package/test/2/index.mjs

@@ -1,6 +1,6 @@
 
 import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
-doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '../../architect.mjs'
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '../../architect.mjs'
 import {struct} from '../../generator.mjs'
 
 const storage = new Storage(import.meta.url)
@@ -327,24 +327,30 @@ class AdminSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
-    indexByValid(valid) {
+    indexByValid(valid, valid_2) {
+
+        if (valid_2 === undefined) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
 
-        return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+        return super.findByRange($valid, super.intToBuffer(valid, $valid), super.intToBuffer(valid_2, $valid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -383,19 +389,23 @@ class LogSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -434,9 +444,11 @@ class TestSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
+
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 }
 

package/test/2/type.ts

@@ -23,11 +23,12 @@ interface Admin {
     time: Number | Date
 }
 
+// @ts-ignore
 interface AdminSet extends Array<Admin> {
     
-    indexById(id: Number): Array<Admin>
-    indexByUid(uid: String): Array<Admin>
-    indexByValid(valid: Number): Array<Admin>
+    indexById(id: Number, id_2?: Number): Array<Admin>
+    indexByUid(uid: String, uid_2?: String): Array<Admin>
+    indexByValid(valid: Number, valid_2?: Number): Array<Admin>
     indexByTime({after, before}): Array<Admin>
     /**
      * 重写push方法
@@ -79,10 +80,11 @@ interface Log {
     content: String
 }
 
+// @ts-ignore
 interface LogSet extends Array<Log> {
     
-    indexById(id: Number): Array<Log>
-    indexByUid(uid: String): Array<Log>
+    indexById(id: Number, id_2?: Number): Array<Log>
+    indexByUid(uid: String, uid_2?: String): Array<Log>
     indexByTime({after, before}): Array<Log>
     /**
      * 重写push方法
@@ -154,9 +156,10 @@ interface Test {
     text: String
 }
 
+// @ts-ignore
 interface TestSet extends Array<Test> {
     
-    indexById(id: Number): Array<Test>
+    indexById(id: Number, id_2?: Number): Array<Test>
     /**
      * 重写push方法
      */
@@ -208,6 +211,7 @@ interface Test2 {
     test3: Number
 }
 
+// @ts-ignore
 interface Test2Set extends Array<Test2> {
     
     /**

package/test/3/index.mjs

@@ -1,6 +1,6 @@
 
 import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
-doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '../../architect.mjs'
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '../../architect.mjs'
 import {struct} from '../../generator.mjs'
 
 const storage = new Storage(import.meta.url)
@@ -334,24 +334,30 @@ class AdminSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
-    indexByValid(valid) {
+    indexByValid(valid, valid_2) {
+
+        if (valid_2 === undefined) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
 
-        return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+        return super.findByRange($valid, super.intToBuffer(valid, $valid), super.intToBuffer(valid_2, $valid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -390,19 +396,23 @@ class LogSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -441,9 +451,11 @@ class TestSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
+
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 }
 

package/test/3/type.ts

@@ -23,11 +23,12 @@ interface Admin {
     time: Number | Date
 }
 
+// @ts-ignore
 interface AdminSet extends Array<Admin> {
     
-    indexById(id: Number): Array<Admin>
-    indexByUid(uid: String): Array<Admin>
-    indexByValid(valid: Number): Array<Admin>
+    indexById(id: Number, id_2?: Number): Array<Admin>
+    indexByUid(uid: String, uid_2?: String): Array<Admin>
+    indexByValid(valid: Number, valid_2?: Number): Array<Admin>
     indexByTime({after, before}): Array<Admin>
     /**
      * 重写push方法
@@ -79,10 +80,11 @@ interface Log {
     content: String
 }
 
+// @ts-ignore
 interface LogSet extends Array<Log> {
     
-    indexById(id: Number): Array<Log>
-    indexByUid(uid: String): Array<Log>
+    indexById(id: Number, id_2?: Number): Array<Log>
+    indexByUid(uid: String, uid_2?: String): Array<Log>
     indexByTime({after, before}): Array<Log>
     /**
      * 重写push方法
@@ -154,9 +156,10 @@ interface Test {
     text: String
 }
 
+// @ts-ignore
 interface TestSet extends Array<Test> {
     
-    indexById(id: Number): Array<Test>
+    indexById(id: Number, id_2?: Number): Array<Test>
     /**
      * 重写push方法
      */
@@ -212,6 +215,7 @@ interface Test2 {
     test2: String
 }
 
+// @ts-ignore
 interface Test2Set extends Array<Test2> {
     
     /**

package/test/4/index.mjs

@@ -1,6 +1,6 @@
 
 import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
-doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '../../architect.mjs'
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '../../architect.mjs'
 import {struct} from '../../generator.mjs'
 
 const storage = new Storage(import.meta.url)
@@ -334,24 +334,30 @@ class AdminSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
-    indexByValid(valid) {
+    indexByValid(valid, valid_2) {
+
+        if (valid_2 === undefined) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
 
-        return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+        return super.findByRange($valid, super.intToBuffer(valid, $valid), super.intToBuffer(valid_2, $valid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -390,19 +396,23 @@ class LogSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 
-    indexByUid(uid) {
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
 
-        return super.findByValue($uid, super.s2b(uid, $uid))
+        return super.findByRange($uid, super.intToBuffer(uid, $uid), super.intToBuffer(uid_2, $uid))
     }
 
     indexByTime({after, before} = {}) {
 
-        return super.findByTime($time, {after, before})
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
     }
 }
 
@@ -441,9 +451,11 @@ class TestSet extends Entities {
         throw new TypeError('stringToBuffer is not a function')
     }
 
-    indexById(id) {
+    indexById(id, id_2) {
+
+        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
-        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        return super.findByRange($id, super.intToBuffer(id, $id), super.intToBuffer(id_2, $id))
     }
 }