@k3000/store 1.4.0 → 1.4.2

package/README.md

@@ -145,6 +145,12 @@ updateCol('user', {
     loginTime: Time().value(Time.update).remark('登录时间')
 })
 
+// 更名索引
+updateIndex('test', {
+    uid: true,
+    pwd: false,
+})
+
 // 更名操作
 renameSet('test', 'test2')
 renameCol('user', {

package/architect.mjs

@@ -811,6 +811,56 @@ export class Entities extends Array {
 
         return s2b(value, this.#lengthSet[name])
     }
+
+    intToBuffer(value, name) {
+
+        const size = this.#lengthSet[name]
+
+        const buffer = Buffer.alloc(size)
+
+        switch (size) {
+
+            case 1:
+                buffer.writeInt8(value)
+                break
+            case 2:
+                buffer.writeInt16BE(value)
+                break
+            case 3:
+                writeInt24BE(buffer, value)
+                break
+            case 4:
+                buffer.writeInt32BE(value)
+                break
+        }
+
+        return buffer
+    }
+
+    uintToBuffer(value, name) {
+
+        const size = this.#lengthSet[name]
+
+        const buffer = Buffer.alloc(size)
+
+        switch (size) {
+
+            case 1:
+                buffer.writeUint8(value)
+                break
+            case 2:
+                buffer.writeUint16BE(value)
+                break
+            case 3:
+                writeUint24BE(buffer, value)
+                break
+            case 4:
+                buffer.writeUint32BE(value)
+                break
+        }
+
+        return buffer
+    }
 }
 
 const u2o = (url = '') => {

package/package.json

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

package/test/7/index.mjs

@@ -132,7 +132,7 @@ class Log extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($type).readUint16BE(0),
-                set: value => super.set($type, super.uintToBuffer(value, $type)),
+                set: value => super.set2($type, super.uintToBuffer(value, $type)),
             },
             uid: {
                 enumerable: true,
@@ -301,6 +301,11 @@ class LogSet extends Entities {
         return super.findByValue($uid, super.s2b(uid, $uid))
     }
 
+    indexByType(type) {
+
+        return super.findByValue($type, super.uintToBuffer(type, $type))
+    }
+
     indexByTime({after, before} = {}) {
 
         return super.findByTime($time, {after, before})

package/test/7/type.ts

@@ -83,6 +83,7 @@ interface LogSet extends Array<Log> {
     
     indexById(id: Number): Array<Log>
     indexByUid(uid: String): Array<Log>
+    indexByType(type: Number): Array<Log>
     indexByTime({after, before}): Array<Log>
     /**
      * 重写push方法

package/test/8/index.mjs

@@ -0,0 +1,373 @@
+
+import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store} from '../../architect.mjs'
+import {struct} from '../../generator.mjs'
+
+const storage = new Storage(import.meta.url)
+
+const $id = 'id'
+const $uid = 'uid'
+const $pwd = 'pwd'
+const $valid = 'valid'
+const $time = 'time'
+const $type = 'type'
+const $content = 'content'
+const $test = 'test'
+const $str = 'str'
+const $test2 = 'test2'
+
+class Admin extends Entity {
+
+    static name = 'admin'
+    
+    static create(_) {
+		_.id = storage.updateValue(_.id, Admin.name, $id)
+		_.pwd = _.pwd || '123456'
+		_.time = _.time || new Date()
+		_.valid = _.valid || 0
+        return _
+    }
+
+    constructor(...arg) {
+
+        super(storage, ...arg)
+        
+        return Object.defineProperties({}, {
+            [position]: {
+                enumerable: false,
+                configurable: false,
+                get: () => this[position],
+            },
+            id: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($id).readUInt32BE(0),
+                set: value => {
+                    super.set2($id, uInt32BEToBuffer(value))
+                    this.#update()
+                },
+            },
+            pwd: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($pwd)),
+                set: value => {
+                    super.set($pwd, super.s2b(value, $pwd))
+                    this.#update()
+                },
+            },
+            time: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2d(super.get($time)),
+                set: value => super.set2($time, d2b(value)),
+            },
+            uid: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($uid)),
+                set: value => {
+                    super.set2($uid, super.s2b(value, $uid))
+                    this.#update()
+                },
+            },
+            valid: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($valid).readUint8(0),
+                set: value => {
+                    super.set2($valid, super.uintToBuffer(value, $valid))
+                    this.#update()
+                },
+            },
+        })
+    }
+
+
+    #update() {
+
+        this.time = Date.now()
+    }
+}
+
+class Log extends Entity {
+
+    static name = 'log'
+    
+    static create(_) {
+		_.id = storage.updateValue(_.id, Log.name, $id)
+		_.time = _.time || new Date()
+        return _
+    }
+
+    constructor(...arg) {
+
+        super(storage, ...arg)
+        
+        return Object.defineProperties({}, {
+            [position]: {
+                enumerable: false,
+                configurable: false,
+                get: () => this[position],
+            },
+            content: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($content)),
+                set: value => super.set($content, super.s2b(value, $content)),
+            },
+            id: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($id).readUInt32BE(0),
+                set: value => super.set2($id, uInt32BEToBuffer(value)),
+            },
+            time: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2d(super.get($time)),
+                set: value => super.set2($time, d2b(value)),
+            },
+            type: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($type).readUint16BE(0),
+                set: value => super.set2($type, super.uintToBuffer(value, $type)),
+            },
+            uid: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($uid)),
+                set: value => super.set2($uid, super.s2b(value, $uid)),
+            },
+        })
+    }
+
+}
+
+class Test3 extends Entity {
+
+    static name = 'test3'
+    
+    static create(_) {
+
+        return _
+    }
+
+    constructor(...arg) {
+
+        super(storage, ...arg)
+        
+        return Object.defineProperties({}, {
+            [position]: {
+                enumerable: false,
+                configurable: false,
+                get: () => this[position],
+            },
+            pwd: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($pwd)),
+                set: value => super.set($pwd, super.s2b(value, $pwd)),
+            },
+            str: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($str)),
+                set: value => super.set($str, super.s2b(value, $str)),
+            },
+            test: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($test)),
+                set: value => super.set($test, super.s2b(value, $test)),
+            },
+            test2: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($test2)),
+                set: value => super.set($test2, super.s2b(value, $test2)),
+            },
+            uid: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($uid)),
+                set: value => super.set($uid, super.s2b(value, $uid)),
+            },
+        })
+    }
+
+}
+
+
+class AdminSet extends Entities {
+
+    constructor() {
+
+        super(storage, Admin)
+    }
+    /**
+     * 内部方法
+     */
+    s2b() {
+
+        throw new TypeError('s2b is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByValue() {
+
+        throw new TypeError('findByValue is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByTime() {
+
+        throw new TypeError('findByTime is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    stringToBuffer() {
+        
+        throw new TypeError('stringToBuffer is not a function')
+    }
+
+    indexById(id) {
+
+        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+    }
+
+    indexByUid(uid) {
+
+        return super.findByValue($uid, super.s2b(uid, $uid))
+    }
+
+    indexByValid(valid) {
+
+        return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+    }
+
+    indexByTime({after, before} = {}) {
+
+        return super.findByTime($time, {after, before})
+    }
+}
+
+class LogSet extends Entities {
+
+    constructor() {
+
+        super(storage, Log)
+    }
+    /**
+     * 内部方法
+     */
+    s2b() {
+
+        throw new TypeError('s2b is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByValue() {
+
+        throw new TypeError('findByValue is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByTime() {
+
+        throw new TypeError('findByTime is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    stringToBuffer() {
+        
+        throw new TypeError('stringToBuffer is not a function')
+    }
+
+    indexById(id) {
+
+        return super.findByValue($id, uInt32BEToBuffer(id, $id))
+    }
+
+    indexByUid(uid) {
+
+        return super.findByValue($uid, super.s2b(uid, $uid))
+    }
+
+    indexByType(type) {
+
+        return super.findByValue($type, super.uintToBuffer(type, $type))
+    }
+
+    indexByTime({after, before} = {}) {
+
+        return super.findByTime($time, {after, before})
+    }
+}
+
+class Test3Set extends Entities {
+
+    constructor() {
+
+        super(storage, Test3)
+    }
+    /**
+     * 内部方法
+     */
+    s2b() {
+
+        throw new TypeError('s2b is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByValue() {
+
+        throw new TypeError('findByValue is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    findByTime() {
+
+        throw new TypeError('findByTime is not a function')
+    }
+    /**
+     * 内部方法
+     */
+    stringToBuffer() {
+        
+        throw new TypeError('stringToBuffer is not a function')
+    }
+
+}
+
+export const remark = Symbol('remark')
+
+export const close = () => storage.close()
+
+export const getStruct = name => struct(storage, remark, name)
+
+/**
+ * @type {import('./type').Storage}
+ */
+const store = Object.freeze({
+    admin: new Proxy([], {
+        get: new AdminSet()
+    }),
+    log: new Proxy([], {
+        get: new LogSet()
+    }),
+    test3: new Proxy([], {
+        get: new Test3Set()
+    }),
+})
+
+export default store

package/test/8/type.ts

@@ -0,0 +1,172 @@
+
+interface Admin {
+    
+    /**
+     * 
+     */
+    id: Number
+    /**
+     * 账号
+     */
+    uid: String
+    /**
+     * 密码
+     */
+    pwd: String
+    /**
+     * 是否有效
+     */
+    valid: Number
+    /**
+     * 登录时间
+     */
+    time: Number | Date
+}
+
+interface AdminSet extends Array<Admin> {
+    
+    indexById(id: Number): Array<Admin>
+    indexByUid(uid: String): Array<Admin>
+    indexByValid(valid: Number): Array<Admin>
+    indexByTime({after, before}): Array<Admin>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Admin>): Array<Admin>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Admin>): Array<Admin>
+    /**
+     * 分页查询
+     */
+    page(predicate: Function, index: Number | String, size: Number | String, params: Object): Array<Admin>
+    /**
+     * 移除数据
+     */
+    remove(...items: Array<Admin>): void
+    /**
+     * 联合查询，类似LEFT JOIN
+     */
+    eachFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+    /**
+     * 联合查询，类似INNER JOIN
+     */
+    filterFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+}
+
+interface Log {
+    
+    /**
+     * 
+     */
+    id: Number
+    /**
+     * 账号
+     */
+    uid: String
+    /**
+     * 类型
+     */
+    type: Number
+    /**
+     * 创建时间
+     */
+    time: Number | Date
+    /**
+     * 内容
+     */
+    content: String
+}
+
+interface LogSet extends Array<Log> {
+    
+    indexById(id: Number): Array<Log>
+    indexByUid(uid: String): Array<Log>
+    indexByType(type: Number): Array<Log>
+    indexByTime({after, before}): Array<Log>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Log>): Array<Log>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Log>): Array<Log>
+    /**
+     * 分页查询
+     */
+    page(predicate: Function, index: Number | String, size: Number | String, params: Object): Array<Log>
+    /**
+     * 移除数据
+     */
+    remove(...items: Array<Log>): void
+    /**
+     * 联合查询，类似LEFT JOIN
+     */
+    eachFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+    /**
+     * 联合查询，类似INNER JOIN
+     */
+    filterFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+}
+
+interface Test3 {
+    
+    /**
+     * 账
+	 *                 户
+     */
+    uid: String
+    /**
+     * 
+     */
+    pwd: String
+    /**
+     * 
+     */
+    test: String
+    /**
+     * 
+     */
+    str: String
+    /**
+     * 
+     */
+    test2: String
+}
+
+interface Test3Set extends Array<Test3> {
+    
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Test3>): Array<Test3>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Test3>): Array<Test3>
+    /**
+     * 分页查询
+     */
+    page(predicate: Function, index: Number | String, size: Number | String, params: Object): Array<Test3>
+    /**
+     * 移除数据
+     */
+    remove(...items: Array<Test3>): void
+    /**
+     * 联合查询，类似LEFT JOIN
+     */
+    eachFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+    /**
+     * 联合查询，类似INNER JOIN
+     */
+    filterFlat(array: Array<Object>, predicate: Function | String): Array<Object>
+}
+
+
+export interface Storage {
+    admin: AdminSet,
+    log: LogSet,
+    test3: Test3Set
+}

package/test/index.mjs

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

package/test.mjs

@@ -594,6 +594,11 @@ test('测试结构操作', async t => {
         deleteDir('test/7')
     }
 
+    if (existsSync('test/8')) {
+
+        deleteDir('test/8')
+    }
+
     await new Promise(resolve => {
 
         t.test('测试添加操作（appendSet）', _ => {
@@ -743,18 +748,46 @@ test('测试结构操作', async t => {
         })
     })
 
+    await new Promise(resolve => {
+
+        t.test('测试更新索引操作（updateIndex）', _ => {
+
+            const {updateIndex, submit} = upgrade('test', {version: 7, password: '123123'})
+
+            updateIndex('log', {
+                type: true,
+            })
+
+            submit().then(() => import('./test/7/index.mjs?password=123123')).then(m => {
+
+                const storage = m.default
+
+                const result = storage.log.indexByType(0)
+
+                assert.strictEqual(
+                    JSON.stringify(result),
+                    '[{"content":"login","id":2,"time":1640966400000,"type":0,"uid":"test"},{"content":"test","id":1,"time":1641052800000,"type":0,"uid":"test"}]')
+
+                m.close()
+
+                resolve()
+
+            }).catch(e => console.error(e))
+        })
+    })
+
     await new Promise(resolve => {
 
         t.test('测试压缩操作', _ => {
 
             const {submit} = upgrade('test', {
-                version: 7,
+                version: 8,
                 prod: true,
                 password: '123123',
                 newPwd: '111111'
             })
 
-            submit().then(() => import('./test/7/index.mjs?password=111111')).then(m => {
+            submit().then(() => import('./test/8/index.mjs?password=111111')).then(m => {
 
                 const storage = m.default