@k3000/store 1.2.2 → 1.4.0

package/architect.mjs

@@ -103,6 +103,25 @@ export const TypeLen = {
     string: 12
 }
 
+/**
+ * @param {Buffer} a
+ * @param {Buffer} b
+ * @returns {-1 | 0 | 1}
+ */
+export const compareBuffer = (a, b) => {
+
+    if (a.length > b.length) return 1
+    if (a.length < b.length) return -1
+
+    for (let i = 0; i < a.length; i++) {
+
+        if (a[i] > b[i]) return 1
+        if (a[i] < b[i]) return -1
+    }
+
+    return 0
+}
+
 /**
  * 加解密的类
  */
@@ -222,14 +241,22 @@ export class Entity {
     #indexPosition(index, buffer, length, s, e) {
 
         if (e < s) return s
-        if (s === e) return buffer < this.#storage.getValue(index[s], length) ? s : s + 1
-        if (buffer <= this.#storage.getValue(index[s], length)) return s
-        if (buffer >= this.#storage.getValue(index[e], length)) return e + 1
 
-        let m = Math.floor((s + e) / 2), buf = this.#storage.getValue(index[m], length)
+        let result = compareBuffer(buffer, this.#storage.getValue(index[s], length))
+
+        if (s === e) return result < 0 ? s : s + 1
+        if (result <= 0) return s
 
-        if (buffer < buf) return this.#indexPosition(index, buffer, length, s + 1, m - 1)
-        if (buffer > buf) return this.#indexPosition(index, buffer, length, m + 1, e - 1)
+        result = compareBuffer(buffer, this.#storage.getValue(index[e], length))
+
+        if (result >= 0) return e + 1
+
+        let m = Math.floor((s + e) / 2)
+
+        result = compareBuffer(buffer, 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)
 
         return m
     }
@@ -693,21 +720,23 @@ export class Entities extends Array {
 
         if (e < s) return []
 
-        let m = Math.floor((s + e) / 2), buf = this.#storage.getValue(index[m], length)
+        let m = Math.floor((s + e) / 2)
 
-        if (buffer < buf) return this.#findByValue(index, buffer, length, s, m - 1)
-        if (buffer > buf) return this.#findByValue(index, buffer, length, m + 1, e)
+        let result = compareBuffer(buffer, this.#storage.getValue(index[m], length))
 
-        let result = [index[m]], i
+        if (result < 0) return this.#findByValue(index, buffer, length, s, m - 1)
+        if (result > 0) return this.#findByValue(index, buffer, length, m + 1, e)
 
-        for (i = m - 1; i >= 0; i--) {
+        result = [index[m]]
+
+        for (let i = m - 1; i >= 0; i--) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
             result.unshift(index[i])
         }
 
-        for (i = m + 1; i < index.length; i++) {
+        for (let i = m + 1; i < index.length; i++) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
@@ -732,8 +761,8 @@ export class Entities extends Array {
 
         let m = Math.floor((s + e) / 2), buffer = this.#storage.getValue(index[m], length)
 
-        if (before < buffer) return this.#findByTime(index, after, before, length, s, m - 1)
-        if (after > buffer) return this.#findByTime(index, after, before, length, m + 1, e)
+        if (compareBuffer(before, buffer) < 0) return this.#findByTime(index, after, before, length, s, m - 1)
+        if (compareBuffer(after, buffer) > 0) return this.#findByTime(index, after, before, length, m + 1, e)
 
         let result = [index[m]], i
 
@@ -1084,6 +1113,11 @@ export class Storage {
         }
     }
 
+    /**
+     * @param {Number} position
+     * @param {Number} length
+     * @returns {Buffer}
+     */
     getValue(position, length) {
 
         if (this.#values.has(position)) {

package/generator.mjs

@@ -1,5 +1,5 @@
 import {copyFileSync, existsSync, mkdirSync, readdirSync, statSync, writeFileSync} from "node:fs";
-import {buffer, string, Storage, TypeLen} from './architect.mjs'
+import {buffer, string, Storage, TypeLen, readInt24BE, readUint24BE, compareBuffer} from './architect.mjs'
 import {resolve} from 'node:path'
 
 const modulePath = import.meta.url.endsWith('?test=true') ? '../../architect.mjs' : '@k3000/store/architect.mjs'
@@ -127,7 +127,7 @@ class Type {
 
         if (this.#index) {
 
-            obj.index = []
+            obj.index = true
         }
 
         if (this.#value !== undefined) {
@@ -582,13 +582,15 @@ function appendSet(name, set, remark = '') {
 
             } else if (typeof value.type === "string" || value.type instanceof String) {
 
+                if (!Reflect.has(typeMap, value.type)) continue
+
                 value.length = value.length || TypeLen[value.type]
 
                 value.type = typeMap[value.type]
 
                 if (value.index) {
 
-                    value.index = []
+                    value.index = true
 
                 } else if (Reflect.has(value, 'index')) {
 
@@ -633,13 +635,15 @@ function updateCol(name, set) {
 
             } else if (typeof value.type === "string" || value.type instanceof String) {
 
+                if (!Reflect.has(typeMap, value.type)) continue
+
                 value.length = value.length || TypeLen[value.type]
 
                 value.type = typeMap[value.type]
 
                 if (value.index) {
 
-                    value.index = []
+                    value.index = true
 
                 } else if (Reflect.has(value, 'index')) {
 
@@ -787,6 +791,128 @@ function updateSetRemark(name, remark) {
     }
 }
 
+const updateIndex2 = function (store, record, struct) {
+
+    record = record.map(position => position + struct.position)
+
+    switch (struct.type) {
+
+        case typeMap.id:
+
+            return record.sort((a, b) => store.getValue(a, struct.length).readUInt32BE()
+                - store.getValue(b, struct.length).readUInt32BE())
+
+        case typeMap.uint:
+
+            switch (struct.length) {
+
+                case 1:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readUInt8()
+                        - store.getValue(b, struct.length).readUInt8())
+
+                case 2:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readUInt16BE()
+                        - store.getValue(b, struct.length).readUInt16BE())
+
+                case 3:
+
+                    return record.sort((a, b) => readUint24BE(store.getValue(a, struct.length))
+                        - readUint24BE(store.getValue(b, struct.length)))
+
+                case 4:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readUInt32BE()
+                        - store.getValue(b, struct.length).readUInt32BE())
+            }
+
+        case typeMap.int:
+
+            switch (struct.length) {
+
+                case 1:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readInt8()
+                        - store.getValue(b, struct.length).readInt8())
+
+                case 2:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readInt16BE()
+                        - store.getValue(b, struct.length).readInt16BE())
+
+                case 3:
+
+                    return record.sort((a, b) => readInt24BE(store.getValue(a, struct.length))
+                        - readInt24BE(store.getValue(b, struct.length)))
+
+                case 4:
+
+                    return record.sort((a, b) => store.getValue(a, struct.length).readInt32BE()
+                        - store.getValue(b, struct.length).readInt32BE())
+            }
+
+        case typeMap.bigUint:
+
+            return record.sort((a, b) => store.getValue(a, struct.length).readBigUInt64BE()
+                - store.getValue(b, struct.length).readBigUInt64BE())
+
+        case typeMap.bigint:
+
+            return record.sort((a, b) => store.getValue(a, struct.length).readBigInt64BE()
+                - store.getValue(b, struct.length).readBigInt64BE())
+
+        case typeMap.time:
+
+            return record.sort((a, b) => b2d(store.getValue(a, struct.length))
+                - b2d(store.getValue(b, struct.length)))
+
+        case typeMap.float:
+
+            return record.sort((a, b) => store.getValue(a, struct.length).readDoubleBE()
+                - store.getValue(b, struct.length).readDoubleBE())
+
+        case typeMap.string:
+
+            return record.sort((a, b) => compareBuffer(store.getValue(a, struct.length)
+                , store.getValue(b, struct.length)))
+    }
+}
+
+const updateIndex = function (name, set) {
+
+    console.log(this.curr.record.index)
+
+    const struct = this.curr.struct.base[name]
+    const index = this.curr.record.index[name]
+
+    if (index === undefined) return
+
+    for (let [key, value] of Object.entries(set)) {
+
+        if (!Reflect.has(struct, key)) continue
+
+        if (value) {
+
+            if (!Reflect.has(index, key)) {
+
+                const indexList = updateIndex2(this.curr, [...this.curr.record.record[name]], struct[key])
+
+                if (indexList) {
+
+                    struct[key].index = true
+                    index[key] = indexList
+                }
+            }
+
+        } else if (Reflect.has(struct, key)) {
+
+            delete struct[key].index
+            delete index[key]
+        }
+    }
+}
+
 const commentRemark = (remark = '') => remark.replace(/\n/g, '\n\t * ')
 
 function submit() {
@@ -1426,6 +1552,18 @@ export default function upgrade(name, {
          * updateSetRemark(name, remark)
          */
         updateSetRemark: updateSetRemark.bind(scope),
+        /**
+         * 更新索引
+         * @type {function}
+         * @param {string} name
+         * @param {Object} set
+         * @example
+         * updateIndex(name, {
+         *     uid: true,
+         *     pwd: false,
+         * })
+         */
+        updateIndex: updateIndex.bind(scope),
         /**
          * 提交跟新
          * @type {function}

package/package.json

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

package/test/index.mjs

@@ -1,15 +1,15 @@
 
 const index = import.meta.url.indexOf('?')
 
-export const modules = await import(`./2/index.mjs${index > -1 ? import.meta.url.substring(index) : ''}`)
+export const modules = await import(`./7/index.mjs${index > -1 ? import.meta.url.substring(index) : ''}`)
 
 export const close = modules.close
 export const remark = modules.remark
-export const version = 2
+export const version = 7
 export const getStruct = modules.getStruct
 
 /**
- * @type {import('./2/type').Storage}
+ * @type {import('./7/type').Storage}
  */
 export const storage = modules.default
 

package/test.mjs

@@ -15,7 +15,6 @@ import upgrade, {
 } from './generator.mjs?test=true'
 // } from '@k3000/store/generator.mjs'
 import {existsSync, readdirSync, rmdirSync, statSync, unlinkSync} from "node:fs";
-import {json} from "node:stream/consumers";
 
 test('测试类型类', async t => {
 
@@ -23,7 +22,7 @@ test('测试类型类', async t => {
 
         assert.strictEqual(
             Id('备注').toString(),
-            '{"type":0,"remark":"备注","index":[],"value":1,"length":4,"step":1}')
+            '{"type":0,"remark":"备注","index":true,"value":1,"length":4,"step":1}')
     })
 
     await t.test('测试Id类型完整配置', _ => {
@@ -66,7 +65,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":1,"remark":"","index":[],"value":0,"length":4,"step":1}')
+            '{"type":1,"remark":"","index":true,"value":0,"length":4,"step":1}')
     })
 
     await t.test('测试Int类型缺省配置', _ => {
@@ -97,7 +96,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":2,"remark":"","index":[],"value":0,"length":4,"step":1}')
+            '{"type":2,"remark":"","index":true,"value":0,"length":4,"step":1}')
     })
 
     await t.test('测试BigUint类型缺省配置', _ => {
@@ -128,7 +127,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":3,"remark":"","index":[],"value":"0","length":8,"step":1}')
+            '{"type":3,"remark":"","index":true,"value":"0","length":8,"step":1}')
     })
 
     await t.test('测试Bigint类型缺省配置', _ => {
@@ -159,7 +158,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":4,"remark":"","index":[],"value":"0","length":8,"step":1}')
+            '{"type":4,"remark":"","index":true,"value":"0","length":8,"step":1}')
     })
 
     await t.test('测试Time类型缺省配置', _ => {
@@ -189,7 +188,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":5,"remark":"","index":[],"value":0,"length":6}')
+            '{"type":5,"remark":"","index":true,"value":0,"length":6}')
     })
 
     await t.test('测试Float类型缺省配置', _ => {
@@ -220,7 +219,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":6,"remark":"","index":[],"value":0,"length":8,"step":1}')
+            '{"type":6,"remark":"","index":true,"value":0,"length":8,"step":1}')
     })
 
     await t.test('测试String类型缺省配置', _ => {
@@ -251,7 +250,7 @@ test('测试类型类', async t => {
                 .step()
                 .remark()
                 .toString(),
-            '{"type":7,"remark":"","index":[],"value":"","length":12}')
+            '{"type":7,"remark":"","index":true,"value":"","length":12}')
     })
 
     await t.test('测试Buffer类型缺省配置', _ => {

package/type.ts

@@ -12,8 +12,9 @@ export interface Gen {
     deleteSet(name: String): void
     deleteCol(name: String, colName: String): void
     updateSetRemark(name: String, remark: String): void
+    updateIndex(name: String, set: Object): void
     /**
      * 提交修改
      */
     submit(): void
-}
+}