@k3000/store 1.7.0 → 1.9.0

package/test/7/type.ts

@@ -5,22 +5,22 @@ interface Admin {
      * 
      */
     id: Number
-    /**
-     * 账号
-     */
-    uid: String
     /**
      * 密码
      */
     pwd: String
-    /**
-     * 是否有效
-     */
-    valid: Number
     /**
      * 登录时间
      */
     time: Number | Date
+    /**
+     * 账号
+     */
+    uid: String
+    /**
+     * 是否有效
+     */
+    valid: Number
 }
 
 // @ts-ignore
@@ -58,26 +58,26 @@ interface AdminSet extends Array<Admin> {
 
 interface Log {
     
+    /**
+     * 内容
+     */
+    content: String
     /**
      * 
      */
     id: Number
     /**
-     * 账号
+     * 创建时间
      */
-    uid: String
+    time: Number | Date
     /**
      * 类型
      */
     type: Number
     /**
-     * 创建时间
-     */
-    time: Number | Date
-    /**
-     * 内容
+     * 账号
      */
-    content: String
+    uid: String
 }
 
 // @ts-ignore
@@ -115,11 +115,6 @@ interface LogSet extends Array<Log> {
 
 interface Test3 {
     
-    /**
-     * 账
-	 *                 户
-     */
-    uid: String
     /**
      * 
      */
@@ -127,15 +122,20 @@ interface Test3 {
     /**
      * 
      */
-    test: String
+    str: String
     /**
      * 
      */
-    str: String
+    test: String
     /**
      * 
      */
     test2: String
+    /**
+     * 账
+	 *                 户
+     */
+    uid: String
 }
 
 // @ts-ignore

package/test/8/buffer/683

@@ -0,0 +1 @@
+abc

package/test/8/buffer/684

@@ -0,0 +1 @@
+你好😊

package/test/8/index.mjs

@@ -5,16 +5,16 @@ import {struct} from '../../generator.mjs'
 
 const storage = new Storage(import.meta.url)
 
+const $content = 'content'
 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 $test = 'test'
 const $test2 = 'test2'
+const $time = 'time'
+const $type = 'type'
+const $uid = 'uid'
+const $valid = 'valid'
 
 class Admin extends Entity {
 
@@ -237,21 +237,21 @@ class AdminSet extends Entities {
 
     indexById(id, id_2) {
 
-        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined || id == id_2) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
         return super.findByRange($id, uInt32BEToBuffer(id, $id), uInt32BEToBuffer(id_2, $id))
     }
 
     indexByUid(uid, uid_2) {
 
-        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
+        if (uid_2 === undefined || uid == uid_2) return super.findByValue($uid, super.s2b(uid, $uid))
 
         return super.findByRange($uid, super.s2b(uid, $uid), super.s2b(uid_2, $uid))
     }
 
     indexByValid(valid, valid_2) {
 
-        if (valid_2 === undefined) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+        if (valid_2 === undefined || valid == valid_2) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
 
         return super.findByRange($valid, super.uintToBuffer(valid, $valid), super.uintToBuffer(valid_2, $valid))
     }
@@ -305,21 +305,21 @@ class LogSet extends Entities {
 
     indexById(id, id_2) {
 
-        if (id_2 === undefined) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+        if (id_2 === undefined || id == id_2) return super.findByValue($id, uInt32BEToBuffer(id, $id))
 
         return super.findByRange($id, uInt32BEToBuffer(id, $id), uInt32BEToBuffer(id_2, $id))
     }
 
     indexByUid(uid, uid_2) {
 
-        if (uid_2 === undefined) return super.findByValue($uid, super.s2b(uid, $uid))
+        if (uid_2 === undefined || uid == uid_2) return super.findByValue($uid, super.s2b(uid, $uid))
 
         return super.findByRange($uid, super.s2b(uid, $uid), super.s2b(uid_2, $uid))
     }
 
     indexByType(type, type_2) {
 
-        if (type_2 === undefined) return super.findByValue($type, super.uintToBuffer(type, $type))
+        if (type_2 === undefined || type == type_2) return super.findByValue($type, super.uintToBuffer(type, $type))
 
         return super.findByRange($type, super.uintToBuffer(type, $type), super.uintToBuffer(type_2, $type))
     }

package/test/8/type.ts

@@ -5,22 +5,22 @@ interface Admin {
      * 
      */
     id: Number
-    /**
-     * 账号
-     */
-    uid: String
     /**
      * 密码
      */
     pwd: String
-    /**
-     * 是否有效
-     */
-    valid: Number
     /**
      * 登录时间
      */
     time: Number | Date
+    /**
+     * 账号
+     */
+    uid: String
+    /**
+     * 是否有效
+     */
+    valid: Number
 }
 
 // @ts-ignore
@@ -58,26 +58,26 @@ interface AdminSet extends Array<Admin> {
 
 interface Log {
     
+    /**
+     * 内容
+     */
+    content: String
     /**
      * 
      */
     id: Number
     /**
-     * 账号
+     * 创建时间
      */
-    uid: String
+    time: Number | Date
     /**
      * 类型
      */
     type: Number
     /**
-     * 创建时间
-     */
-    time: Number | Date
-    /**
-     * 内容
+     * 账号
      */
-    content: String
+    uid: String
 }
 
 // @ts-ignore
@@ -115,11 +115,6 @@ interface LogSet extends Array<Log> {
 
 interface Test3 {
     
-    /**
-     * 账
-	 *                 户
-     */
-    uid: String
     /**
      * 
      */
@@ -127,15 +122,20 @@ interface Test3 {
     /**
      * 
      */
-    test: String
+    str: String
     /**
      * 
      */
-    str: String
+    test: String
     /**
      * 
      */
     test2: String
+    /**
+     * 账
+	 *                 户
+     */
+    uid: String
 }
 
 // @ts-ignore

package/test/9/buffer/683

@@ -0,0 +1 @@
+abc

package/test/9/buffer/684

@@ -0,0 +1 @@
+你好😊

package/test/9/index.mjs

@@ -0,0 +1,390 @@
+
+import {Entities, Entity, Storage, b2d, d2b, b2s, position, uInt32BEToBuffer, int32BEToBuffer,
+doubleBEToBuffer, bigint32BEToBuffer, bigUint32BEToBuffer, readInt24BE, readUint24BE, Store, MaxTime} from '../../architect.mjs'
+import {struct} from '../../generator.mjs'
+
+const storage = new Storage(import.meta.url)
+
+const $content = 'content'
+const $id = 'id'
+const $pwd = 'pwd'
+const $str = 'str'
+const $test = 'test'
+const $test2 = 'test2'
+const $time = 'time'
+const $type = 'type'
+const $uid = 'uid'
+const $valid = 'valid'
+
+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.set($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, id_2) {
+
+        if (id_2 === undefined || id == id_2) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, uInt32BEToBuffer(id, $id), uInt32BEToBuffer(id_2, $id))
+    }
+
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined || uid == uid_2) return super.findByValue($uid, super.s2b(uid, $uid))
+
+        return super.findByRange($uid, super.s2b(uid, $uid), super.s2b(uid_2, $uid))
+    }
+
+    indexByValid(valid, valid_2) {
+
+        if (valid_2 === undefined || valid == valid_2) return super.findByValue($valid, super.uintToBuffer(valid, $valid))
+
+        return super.findByRange($valid, super.uintToBuffer(valid, $valid), super.uintToBuffer(valid_2, $valid))
+    }
+
+    indexByTime(after = {}, before) {
+    
+        if (typeof after === "object" && Reflect.has(after, 'before')) {
+        
+            before = after.before
+            after = after.after
+        }
+
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
+    }
+}
+
+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, id_2) {
+
+        if (id_2 === undefined || id == id_2) return super.findByValue($id, uInt32BEToBuffer(id, $id))
+
+        return super.findByRange($id, uInt32BEToBuffer(id, $id), uInt32BEToBuffer(id_2, $id))
+    }
+
+    indexByUid(uid, uid_2) {
+
+        if (uid_2 === undefined || uid == uid_2) return super.findByValue($uid, super.s2b(uid, $uid))
+
+        return super.findByRange($uid, super.s2b(uid, $uid), super.s2b(uid_2, $uid))
+    }
+
+    indexByTime(after = {}, before) {
+    
+        if (typeof after === "object" && Reflect.has(after, 'before')) {
+        
+            before = after.before
+            after = after.after
+        }
+
+        return super.findByRange($time, d2b(after || 0), d2b(before || MaxTime))
+    }
+}
+
+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