@k3000/store 0.4.0 → 0.6.0

package/architect.mjs

@@ -8,7 +8,7 @@ import {createCipheriv, createDecipheriv, createHash, scryptSync} from "node:cry
  * @param {Function | String} predicate
  * @return {Array}
  */
-Array.prototype.eachFlat = function (array, predicate) {
+Array.prototype.eachFlat = function (array, predicate, map) {
 
     if (typeof predicate === "string") {
 
@@ -17,15 +17,30 @@ Array.prototype.eachFlat = function (array, predicate) {
         predicate = (a, b) => a[key] === b[key]
     }
 
-    return this.map(item => {
+    if (typeof map === "function") {
 
-        const result = array.filter(entry => predicate(item, entry))
+        return this.map(item => {
 
-        if (result.length === 0) return item
+            const result = array.filter(entry => predicate(item, entry))
 
-        return result.map(entry => ({...entry, ...item}))
+            if (result.length === 0) return item
 
-    }).flat()
+            return result.map(entry => map({...entry, ...item}, entry))
+
+        }).flat()
+
+    } else {
+
+        return this.map(item => {
+
+            const result = array.filter(entry => predicate(item, entry))
+
+            if (result.length === 0) return item
+
+            return result.map(entry => ({...entry, ...item}))
+
+        }).flat()
+    }
 }
 
 /**
@@ -34,7 +49,7 @@ Array.prototype.eachFlat = function (array, predicate) {
  * @param {Function | String} predicate
  * @return {Array}
  */
-Array.prototype.filterFlat = function (array, predicate) {
+Array.prototype.filterFlat = function (array, predicate, map) {
 
     if (typeof predicate === "string") {
 
@@ -43,10 +58,20 @@ Array.prototype.filterFlat = function (array, predicate) {
         predicate = (a, b) => a[key] === b[key]
     }
 
-    return this.map(item => array
-        .filter(entry => predicate(item, entry))
-        .map(entry => ({...entry, ...item}))
-    ).flat()
+    if (typeof map === "function") {
+
+        return this.map(item => array
+            .filter(entry => predicate(item, entry))
+            .map(entry => map(item, entry))
+        ).flat()
+
+    } else {
+
+        return this.map(item => array
+            .filter(entry => predicate({...entry, ...item}, entry))
+            .map(entry => ({...entry, ...item}))
+        ).flat()
+    }
 }
 
 /**
@@ -414,6 +439,11 @@ export class Entities extends Array {
         }
     }
 
+    get name() {
+
+        return this.#name
+    }
+
     #recycle(index) {
 
         let i
@@ -856,7 +886,14 @@ export class Storage {
 
                 item.needsSave = false
 
-                writeSync(this.#fd_data, item.value, 0, item.value.length, position)
+                try {
+
+                    writeSync(this.#fd_data, item.value, 0, item.value.length, position)
+
+                } catch (e) {
+
+                    console.error(e)
+                }
             }
         }
 
@@ -890,7 +927,14 @@ export class Storage {
 
         buffer.writeUint32BE(number, 0)
 
-        writeSync(this.#fd_index, buffer, 0, 4, position)
+        try {
+
+            writeSync(this.#fd_index, buffer, 0, 4, position)
+
+        } catch (e) {
+
+            console.error(e)
+        }
     }
 
     #updateId(id = 0) {
@@ -928,18 +972,32 @@ export class Storage {
 
         this.#writeNumber(object.length, 4 + position)
 
-        writeSync(this.#fd_index, object, 0, object.length, 8 + position)
+        try {
+
+            writeSync(this.#fd_index, object, 0, object.length, 8 + position)
+
+        } catch (e) {
+
+            console.error(e)
+        }
     }
 
     #getId() {
 
         const buffer = Buffer.alloc(4)
 
-        readSync(this.#fd_index, buffer, {
-            offset: 0,
-            length: 4,
-            position: 0,
-        })
+        try {
+
+            readSync(this.#fd_index, buffer, {
+                offset: 0,
+                length: 4,
+                position: 0,
+            })
+
+        } catch (e) {
+
+            console.error(e)
+        }
 
         return buffer.readUInt32BE(0)
     }
@@ -948,7 +1006,14 @@ export class Storage {
 
         const buffer = Buffer.alloc(4)
 
-        readSync(this.#fd_index, buffer, 0, 4, 4 + position)
+        try {
+
+            readSync(this.#fd_index, buffer, 0, 4, 4 + position)
+
+        } catch (e) {
+
+            console.error(e)
+        }
 
         return buffer.readUInt32BE(0)
     }
@@ -957,7 +1022,14 @@ export class Storage {
 
         const buffer = Buffer.alloc(length)
 
-        readSync(this.#fd_index, buffer, 0, length, 8 + position)
+        try {
+
+            readSync(this.#fd_index, buffer, 0, length, 8 + position)
+
+        } catch (e) {
+
+            console.error(e)
+        }
 
         return JSON.parse(this.#cipher.decrypt(buffer).toString() || '{}')
     }
@@ -1024,7 +1096,14 @@ export class Storage {
 
             const value = Buffer.alloc(length)
 
-            readSync(this.#fd_data, value, 0, length, position)
+            try {
+
+                readSync(this.#fd_data, value, 0, length, position)
+
+            } catch (e) {
+
+                console.error(e)
+            }
 
             this.#values.set(position, {
                 value,
@@ -1060,7 +1139,14 @@ export class Storage {
 
             const val = Buffer.alloc(length)
 
-            readSync(this.#fd_data, val, 0, length, position)
+            try {
+
+                readSync(this.#fd_data, val, 0, length, position)
+
+            } catch (e) {
+
+                console.error(e)
+            }
 
             const needsSave = !val.equals(value)
 

package/generator.mjs

@@ -236,6 +236,13 @@ export const Uint = size => new class Uint extends Type {
         return super.step(SCOPE, step > 0 ? step : 1);
     }
 
+    length(length) {
+
+        length = Number.parseInt(length) || TypeLen.int
+
+        return super.length(SCOPE, length > 0 && length < TypeLen.int ? length : TypeLen.int);
+    }
+
 }()
 
 /**
@@ -287,6 +294,13 @@ export const Int = size => new class Int extends Type {
         return super.step(SCOPE, step === 0 ? 1 : step);
     }
 
+    length(length) {
+
+        length = Number.parseInt(length) || TypeLen.int
+
+        return super.length(SCOPE, length > 0 && length < TypeLen.int ? length : TypeLen.int);
+    }
+
 }()
 
 export const BigUint = remark => new class BigUint extends Type {
@@ -479,7 +493,7 @@ export const Text = remark => new class Text extends Type {
 
 }()
 
-export const struct = (storage, remark) => {
+export const struct = (storage, remark, name) => {
 
     const struct = {}, base = storage.struct.base
 
@@ -520,6 +534,12 @@ export const struct = (storage, remark) => {
         }
     }
 
+    if (name) return {
+        name,
+        struct: struct[name],
+        remark: storage.struct.extra[name].remark
+    }
+
     return struct
 }
 
@@ -755,24 +775,17 @@ function submit() {
     writeFileSync(`${this.dir}index.mjs`, `
 const index = import.meta.url.indexOf('?')
 
-const url = \`./${version}/index.mjs\${index > -1 ? import.meta.url.substring(index) : ''}\`
+export const modules = await import(\`./${version}/index.mjs\${index > -1 ? import.meta.url.substring(index) : ''}\`)
 
-let remark0, close0, getStruct0
+export const close = modules.close
+export const remark = modules.remark
+export const version = ${version}
+export const getStruct = modules.getStruct
 
 /**
  * @type {import('./${version}/type').Storage}
  */
-const storage = await new Promise((resolve, reject) => import(url)
-    .then(modules => {
-        remark0 = modules.remark
-        close0 = modules.close
-        getStruct0 = modules.getStruct
-        resolve(modules.default)
-    }).catch(error => reject(error)))
-
-export const remark = remark0
-export const close = close0
-export const getStruct = getStruct0
+export const storage = modules.default
 
 export default storage
 `)
@@ -838,7 +851,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 export default new class extends Store {
 
@@ -1211,7 +1224,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}
@@ -1234,6 +1247,7 @@ export default store
  * @param {string} newPwd
  * @param {string} password
  * @param {number} version
+ * @param {Storage} store
  * @return {import('./type').Gen}
  * @example
  * const {submit} = upgrade('test')
@@ -1243,6 +1257,7 @@ export default function upgrade(name, {
     newPwd,
     password = '',
     version = 1,
+    store,
 } = {}) {
 
     const dir = name[name.length - 1] === '/' ? name : name + '/'
@@ -1256,7 +1271,11 @@ export default function upgrade(name, {
 
     let prev
 
-    if (v === undefined) {
+    if (store) {
+
+        prev = store
+
+    } else if (v === undefined) {
 
         v = 0
 

package/package.json

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

package/test/0/index.mjs

@@ -8,7 +8,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 export default new class extends Store {
 

package/test/1/index.mjs

@@ -387,7 +387,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/2/index.mjs

@@ -474,7 +474,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/3/index.mjs

@@ -481,7 +481,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/4/index.mjs

@@ -481,7 +481,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/5/index.mjs

@@ -481,7 +481,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/6/index.mjs

@@ -341,7 +341,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/7/index.mjs

@@ -341,7 +341,7 @@ export const remark = Symbol('remark')
 
 export const close = () => storage.close()
 
-export const getStruct = () => struct(storage, remark)
+export const getStruct = name => struct(storage, remark, name)
 
 /**
  * @type {import('./type').Storage}

package/test/index.mjs

@@ -1,23 +1,16 @@
 
 const index = import.meta.url.indexOf('?')
 
-const url = `./7/index.mjs${index > -1 ? import.meta.url.substring(index) : ''}`
+export const modules = await import(`./7/index.mjs${index > -1 ? import.meta.url.substring(index) : ''}`)
 
-let remark0, close0, getStruct0
+export const close = modules.close
+export const remark = modules.remark
+export const version = 7
+export const getStruct = modules.getStruct
 
 /**
  * @type {import('./7/type').Storage}
  */
-const storage = await new Promise((resolve, reject) => import(url)
-    .then(modules => {
-        remark0 = modules.remark
-        close0 = modules.close
-        getStruct0 = modules.getStruct
-        resolve(modules.default)
-    }).catch(error => reject(error)))
-
-export const remark = remark0
-export const close = close0
-export const getStruct = getStruct0
+export const storage = modules.default
 
 export default storage