@k3000/store 1.1.0 → 1.1.2

package/architect.mjs

@@ -1,4 +1,5 @@
-import {dirname, resolve} from "node:path"
+import {dirname} from "node:path"
+import {fileURLToPath} from "node:url"
 import {openSync, closeSync, readFileSync, writeFileSync, readSync, writeSync, unlinkSync} from "node:fs"
 import {createCipheriv, createDecipheriv, createHash, scryptSync} from "node:crypto"
 
@@ -820,15 +821,13 @@ export class Storage {
 
     constructor(url, password, newPwd) {
 
-        url = decodeURI(url)
+        let dir = url.startsWith('file:///') ? dirname(fileURLToPath(url)) : url
 
-        let dir = url.endsWith('/') ? url : dirname(url) + '/'
+        dir = dir.replace(/\\/g, '/')
 
-        const root = resolve('/')
+        if (!dir.endsWith('/')) {
 
-        if (dir.startsWith('file:///')) {
-
-            dir = root.length > 1 ? dir.substring(7 + root.length) : dir.substring(7)
+            dir += '/'
         }
 
         this.#fd_data = openSync(dir + 'data', 'r+')

package/generator.mjs

@@ -579,6 +579,17 @@ function appendSet(name, set, remark = '') {
             } else if (this.types.includes(value)) {
 
                 value = value().toJSON()
+
+            } else if (typeof value.type === "string" || value.type instanceof String) {
+
+                value.length = value.length || TypeLen[value.type]
+
+                value.type = typeMap[value.type]
+
+                if (value.index) {
+
+                    value.index = []
+                }
             }
 
             console.log('  append col:', key)
@@ -615,6 +626,17 @@ function updateCol(name, set) {
             } else if (this.types.includes(value)) {
 
                 value = value().toJSON()
+
+            } else if (typeof value.type === "string" || value.type instanceof String) {
+
+                value.length = value.length || TypeLen[value.type]
+
+                value.type = typeMap[value.type]
+
+                if (value.index) {
+
+                    value.index = []
+                }
             }
 
             console.log(`  ${Reflect.has(this.curr.struct.base[name], key) ? 'update' : 'append'} col:`, key)

package/package.json

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

package/test2/0/index.mjs

@@ -1,15 +0,0 @@
-
-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

@@ -1,111 +0,0 @@
-
-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

@@ -1,50 +0,0 @@
-
-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

@@ -1,111 +0,0 @@
-
-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

@@ -1,50 +0,0 @@
-
-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

@@ -1,16 +0,0 @@
-
-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

@@ -1,43 +0,0 @@
-/*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()