@k3000/store 1.0.2 → 1.1.0

package/generator.mjs

@@ -761,6 +761,17 @@ const commentRemark = (remark = '') => remark.replace(/\n/g, '\n\t * ')
 
 function submit() {
 
+    for (const name of this.updateSet.values()) {
+
+        this.curr.record.idle[name] = []
+        this.curr.record.record[name] = []
+
+        for (const key of Object.keys(this.curr.record.index[name])) {
+
+            this.curr.record.index[name][key] = []
+        }
+    }
+
     this.curr.updateStruct(this.curr.struct)
     this.curr.updateRecord(this.curr.record)
 
@@ -803,10 +814,6 @@ export default storage
 
                 for (const name of this.updateSet.values()) {
 
-                    curr[name].remove(...curr[name])
-
-                    this.curr.record.idle[name] = []
-
                     curr[name].push(...prev[name])
                 }
 

package/package.json

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

package/test/1/type.ts

@@ -29,6 +29,14 @@ interface AdminSet extends 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>
     /**
      * 分页查询
      */
@@ -76,6 +84,14 @@ interface LogSet extends Array<Log> {
     indexById(id: Number): Array<Log>
     indexByUid(uid: String): Array<Log>
     indexByTime({after, before}): Array<Log>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Log>): Array<Log>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Log>): Array<Log>
     /**
      * 分页查询
      */
@@ -141,6 +157,14 @@ interface Test {
 interface TestSet extends Array<Test> {
     
     indexById(id: Number): Array<Test>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Test>): Array<Test>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Test>): Array<Test>
     /**
      * 分页查询
      */

package/test2/0/index.mjs

@@ -0,0 +1,15 @@
+
+import {Storage, Store} from '../../architect.mjs'
+import {struct} from '../../generator.mjs'
+
+const storage = new Storage(import.meta.url)
+
+export const remark = Symbol('remark')
+
+export const close = () => storage.close()
+
+export const getStruct = name => struct(storage, remark, name)
+
+export default new class extends Store {
+
+}

package/test2/1/index.mjs

@@ -0,0 +1,111 @@
+
+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 $a1 = 'a1'
+const $a2 = 'a2'
+const $a3 = 'a3'
+
+class Qwe extends Entity {
+
+    static name = 'qwe'
+    
+    static create(_) {
+		_.a1 = storage.updateValue(_.a1, Qwe.name, $a1)
+        return _
+    }
+
+    constructor(...arg) {
+
+        super(storage, ...arg)
+        
+        return Object.defineProperties({}, {
+            [position]: {
+                enumerable: false,
+                configurable: false,
+                get: () => this[position],
+            },
+            a1: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($a1).readUInt32BE(0),
+                set: value => super.set2($a1, uInt32BEToBuffer(value)),
+            },
+            a2: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($a2)),
+                set: value => super.set($a2, super.s2b(value, $a2)),
+            },
+            a3: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($a3).readUInt32BE(0),
+                set: value => super.set($a3, super.uintToBuffer(value, $a3)),
+            },
+        })
+    }
+
+}
+
+
+class QweSet extends Entities {
+
+    constructor() {
+
+        super(storage, Qwe)
+    }
+    /**
+     * 内部方法
+     */
+    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')
+    }
+
+    indexByA1(a1) {
+
+        return super.findByValue($a1, uInt32BEToBuffer(a1, $a1))
+    }
+}
+
+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({
+    qwe: new Proxy([], {
+        get: new QweSet()
+    }),
+})
+
+export default store

package/test2/1/type.ts

@@ -0,0 +1,50 @@
+
+interface Qwe {
+    
+    /**
+     * 
+     */
+    a1: Number
+    /**
+     * 
+     */
+    a2: String
+    /**
+     * 
+     */
+    a3: Number
+}
+
+interface QweSet extends Array<Qwe> {
+    
+    indexByA1(a1: Number): Array<Qwe>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Qwe>): Array<Qwe>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Qwe>): Array<Qwe>
+    /**
+     * 分页查询
+     */
+    page(predicate: Function, index: Number | String, size: Number | String, params: Object): Array<Qwe>
+    /**
+     * 移除数据
+     */
+    remove(...items: Array<Qwe>): 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 {
+    qwe: QweSet
+}

package/test2/2/index.mjs

@@ -0,0 +1,111 @@
+
+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 $a1 = 'a1'
+const $a2 = 'a2'
+const $a3 = 'a3'
+
+class Qwe extends Entity {
+
+    static name = 'qwe'
+    
+    static create(_) {
+		_.a1 = storage.updateValue(_.a1, Qwe.name, $a1)
+        return _
+    }
+
+    constructor(...arg) {
+
+        super(storage, ...arg)
+        
+        return Object.defineProperties({}, {
+            [position]: {
+                enumerable: false,
+                configurable: false,
+                get: () => this[position],
+            },
+            a1: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($a1).readUInt32BE(0),
+                set: value => super.set2($a1, uInt32BEToBuffer(value)),
+            },
+            a2: {
+                enumerable: true,
+                configurable: false,
+                get: () => b2s(super.get($a2)),
+                set: value => super.set($a2, super.s2b(value, $a2)),
+            },
+            a3: {
+                enumerable: true,
+                configurable: false,
+                get: () => super.get($a3).readUInt32BE(0),
+                set: value => super.set($a3, super.uintToBuffer(value, $a3)),
+            },
+        })
+    }
+
+}
+
+
+class QweSet extends Entities {
+
+    constructor() {
+
+        super(storage, Qwe)
+    }
+    /**
+     * 内部方法
+     */
+    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')
+    }
+
+    indexByA1(a1) {
+
+        return super.findByValue($a1, uInt32BEToBuffer(a1, $a1))
+    }
+}
+
+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({
+    qwe: new Proxy([], {
+        get: new QweSet()
+    }),
+})
+
+export default store

package/test2/2/type.ts

@@ -0,0 +1,50 @@
+
+interface Qwe {
+    
+    /**
+     * 
+     */
+    a1: Number
+    /**
+     * 
+     */
+    a2: String
+    /**
+     * 
+     */
+    a3: Number
+}
+
+interface QweSet extends Array<Qwe> {
+    
+    indexByA1(a1: Number): Array<Qwe>
+    /**
+     * 重写push方法
+     */
+    push(...item: Array<Qwe>): Array<Qwe>
+    /**
+     * 重写unshift方法
+     */
+    unshift(...item: Array<Qwe>): Array<Qwe>
+    /**
+     * 分页查询
+     */
+    page(predicate: Function, index: Number | String, size: Number | String, params: Object): Array<Qwe>
+    /**
+     * 移除数据
+     */
+    remove(...items: Array<Qwe>): 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 {
+    qwe: QweSet
+}

package/test2/index.mjs

@@ -0,0 +1,16 @@
+
+const index = import.meta.url.indexOf('?')
+
+export const modules = await import(`./2/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 getStruct = modules.getStruct
+
+/**
+ * @type {import('./2/type').Storage}
+ */
+export const storage = modules.default
+
+export default storage

package/test2.mjs

@@ -0,0 +1,43 @@
+/*import upgrade, {Id, String, Uint} from "./generator.mjs?test=true";
+
+const {appendSet, submit} = upgrade('test2')
+
+appendSet('qwe', {
+    a1: Id,
+    a2: String(16),
+    a3: Uint,
+})
+
+submit()*/
+
+/*import store, {close} from './test2/index.mjs'
+
+// store.qwe.push({
+//     a2: '00000000000000000000',
+//     a3: 10001,
+// })
+//
+// store.qwe.push({
+//     a2: '00000000000000000000',
+//     a3: 10001,
+// })
+
+console.log(JSON.stringify(store.qwe, null, 2))
+
+close()*/
+
+/*import upgrade, {String} from "./generator.mjs?test=true";
+
+const {updateCol, submit} = upgrade('test2')
+
+updateCol('qwe', {
+    a2: String(32),
+})
+
+submit()*/
+
+import store, {close} from './test2/index.mjs'
+
+console.log(JSON.stringify(store.qwe, null, 2))
+
+close()