@k3000/store 0.1.2 → 0.2.1

package/generator.mjs

@@ -416,13 +416,26 @@ export const Float = remark => new class Float extends Type {
 
 }()
 
-export const String = remark => new class String extends Type {
+/**
+ * @param {number | string} size
+ * @constructor
+ */
+export const String = size => new class String extends Type {
 
     constructor() {
 
-        super(typeMap.string, remark);
+        if (Number.isInteger(size)) {
+
+            super(typeMap.string);
+
+            super.length(SCOPE, size)
+
+        } else {
+
+            super(typeMap.string, size);
 
-        super.length(SCOPE, TypeLen.string)
+            super.length(SCOPE, TypeLen.string)
+        }
     }
 
     index(support = true) {
@@ -769,6 +782,9 @@ export default storage
         return Promise.all([import(this.prevPath + this.prevUrlParams), import(this.currPath + this.currUrlParams)])
             .then(([prev, curr]) => {
 
+                const prevClose = prev.close
+                const currClose = curr.close
+
                 prev = prev.default
                 curr = curr.default
 
@@ -781,8 +797,8 @@ export default storage
                     curr[name].push(...prev[name])
                 }
 
-                prev.close()
-                curr.close()
+                prevClose()
+                currClose()
             })
 
     } else {
@@ -932,11 +948,11 @@ const gen = {
 
 const clipStatic = (name, [key, value]) => {
 
-    if (!Reflect.has(value, 'value')) return `\t\t\t${key},`
+    if (!Reflect.has(value, 'value')) return ''
 
     let valueStr = ''
 
-    if (Reflect.has(value, 'step')) return `\t\t\t${key}: storage.updateValue(${key}, ${name}.name, $${key}),`
+    if (Reflect.has(value, 'step')) return `\t\t_.${key} = storage.updateValue(_.${key}, ${name}.name, $${key})`
 
     switch (value.type) {
 
@@ -968,7 +984,7 @@ const clipStatic = (name, [key, value]) => {
             valueStr = ' || ' + value.value
     }
 
-    return `\t\t\t${key}${valueStr ? `: ${key}${valueStr}` : ''},`
+    return valueStr ? `\t\t_.${key} = _.${key}${valueStr}` : ''
 }
 
 const clipIndex = (name, key, k, v) => {
@@ -977,15 +993,15 @@ const clipIndex = (name, key, k, v) => {
 
     if (v.type === typeMap.int) {
 
-        main = `super.intToBuffer(${k}, $${k})`
+        main = `super.intToBuffer(value, $${k})`
 
     } else if (v.type === typeMap.uint) {
 
-        main = `super.uintToBuffer(${k}, $${k})`
+        main = `super.uintToBuffer(value, $${k})`
 
     } else {
 
-        main = `${gen.set[v.type]}(${k}${v.type === typeMap.buffer
+        main = `${gen.set[v.type]}(value${v.type === typeMap.buffer
         || v.type === typeMap.text ? `, $${k}` : v.type === typeMap.string
             ? `, $${k}` : ''})`
     }
@@ -1011,7 +1027,7 @@ const clipProperties = (name, key, update, [k, v]) => `
                 configurable: false,
                 get: () => ${gen.get[v.type](`super.get($${k})`, v.type === typeMap.buffer
 || v.type === typeMap.text ? `$${k}` : v.length)},
-                set: ${k} => ${update && k !== update[0] ? `{
+                set: value => ${update && k !== update[0] ? `{
                     ${clipIndex(name, key, k, v)}
                     this.#update()
                 }` : clipIndex(name, key, k, v)},
@@ -1034,13 +1050,9 @@ class ${name} extends Entity {
 
     static name = '${key}'
     
-    static create({
-            ${Object.keys(value).sort(sort2).join(',\n\t\t\t')}
-        }) {
-    
-        return {
-${Object.entries(value).sort(sort3).map(clipStatic.bind(null, name)).join('\n')}
-        }
+    static create(_) {
+${Object.entries(value).sort(sort3).map(clipStatic.bind(null, name)).filter(str => str).join('\n')}
+        return _
     }
 
     constructor(...arg) {

package/package.json

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

package/test/0/index.mjs

@@ -6,14 +6,10 @@ const storage = new Storage(import.meta.url)
 
 export const remark = Symbol('remark')
 
-export function getStruct() {
+export const close = () => storage.close()
 
-    return struct(storage, remark)
-}
+export const getStruct = () => struct(storage, remark)
 
 export default new class extends Store {
 
-    close() {
-        storage.close()
-    }
 }

package/test/1/index.mjs

@@ -25,21 +25,12 @@ class Admin extends Entity {
 
     static name = 'admin'
     
-    static create({
-            id,
-			pwd,
-			time,
-			uid,
-			valid
-        }) {
-    
-        return {
-			id: storage.updateValue(id, Admin.name, $id),
-			pwd: pwd || '123456',
-			time: time || new Date(),
-			uid,
-			valid: valid || 0,
-        }
+    static create(_) {
+		_.id = storage.updateValue(_.id, Admin.name, $id)
+		_.pwd = _.pwd || '123456'
+		_.time = _.time || new Date()
+		_.valid = _.valid || 0
+        return _
     }
 
     constructor(...arg) {
@@ -56,8 +47,8 @@ class Admin extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($id).readUInt32BE(0),
-                set: id => {
-                    super.set2($id, uInt32BEToBuffer(id))
+                set: value => {
+                    super.set2($id, uInt32BEToBuffer(value))
                     this.#update()
                 },
             },
@@ -65,8 +56,8 @@ class Admin extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => b2s(super.get($pwd)),
-                set: pwd => {
-                    super.set($pwd, super.s2b(pwd, $pwd))
+                set: value => {
+                    super.set($pwd, super.s2b(value, $pwd))
                     this.#update()
                 },
             },
@@ -74,14 +65,14 @@ class Admin extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => b2d(super.get($time)),
-                set: time => super.set2($time, d2b(time)),
+                set: value => super.set2($time, d2b(value)),
             },
             uid: {
                 enumerable: true,
                 configurable: false,
                 get: () => b2s(super.get($uid)),
-                set: uid => {
-                    super.set2($uid, super.s2b(uid, $uid))
+                set: value => {
+                    super.set2($uid, super.s2b(value, $uid))
                     this.#update()
                 },
             },
@@ -89,8 +80,8 @@ class Admin extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($valid).readUint8(0),
-                set: valid => {
-                    super.set2($valid, super.uintToBuffer(valid, $valid))
+                set: value => {
+                    super.set2($valid, super.uintToBuffer(value, $valid))
                     this.#update()
                 },
             },
@@ -108,21 +99,10 @@ class Log extends Entity {
 
     static name = 'log'
     
-    static create({
-            content,
-			id,
-			time,
-			type,
-			uid
-        }) {
-    
-        return {
-			content,
-			id: storage.updateValue(id, Log.name, $id),
-			time: time || new Date(),
-			type,
-			uid,
-        }
+    static create(_) {
+		_.id = storage.updateValue(_.id, Log.name, $id)
+		_.time = _.time || new Date()
+        return _
     }
 
     constructor(...arg) {
@@ -139,31 +119,31 @@ class Log extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => b2s(super.get($content)),
-                set: content => super.set($content, super.s2b(content, $content)),
+                set: value => super.set($content, super.s2b(value, $content)),
             },
             id: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($id).readUInt32BE(0),
-                set: id => super.set2($id, uInt32BEToBuffer(id)),
+                set: value => super.set2($id, uInt32BEToBuffer(value)),
             },
             time: {
                 enumerable: true,
                 configurable: false,
                 get: () => b2d(super.get($time)),
-                set: time => super.set2($time, d2b(time)),
+                set: value => super.set2($time, d2b(value)),
             },
             type: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($type).readUint16BE(0),
-                set: type => super.set($type, super.uintToBuffer(type, $type)),
+                set: value => super.set($type, super.uintToBuffer(value, $type)),
             },
             uid: {
                 enumerable: true,
                 configurable: false,
                 get: () => b2s(super.get($uid)),
-                set: uid => super.set2($uid, super.s2b(uid, $uid)),
+                set: value => super.set2($uid, super.s2b(value, $uid)),
             },
         })
     }
@@ -174,31 +154,9 @@ class Test extends Entity {
 
     static name = 'test'
     
-    static create({
-            bigUint,
-			bigint,
-			buffer,
-			float,
-			id,
-			int,
-			string,
-			text,
-			time,
-			uint
-        }) {
-    
-        return {
-			bigUint,
-			bigint,
-			buffer,
-			float,
-			id: storage.updateValue(id, Test.name, $id),
-			int,
-			string,
-			text,
-			time,
-			uint,
-        }
+    static create(_) {
+		_.id = storage.updateValue(_.id, Test.name, $id)
+        return _
     }
 
     constructor(...arg) {
@@ -215,61 +173,61 @@ class Test extends Entity {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($bigUint).readBigUInt64BE(0),
-                set: bigUint => super.set($bigUint, bigUint32BEToBuffer(bigUint)),
+                set: value => super.set($bigUint, bigUint32BEToBuffer(value)),
             },
             bigint: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($bigint).readBigInt64BE(0),
-                set: bigint => super.set($bigint, bigint32BEToBuffer(bigint)),
+                set: value => super.set($bigint, bigint32BEToBuffer(value)),
             },
             buffer: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($buffer)[0] ? super.readFileSync($buffer) : null,
-                set: buffer => super.set($buffer, super.buffer(buffer, $buffer)),
+                set: value => super.set($buffer, super.buffer(value, $buffer)),
             },
             float: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($float).readDoubleBE(0),
-                set: float => super.set($float, doubleBEToBuffer(float)),
+                set: value => super.set($float, doubleBEToBuffer(value)),
             },
             id: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($id).readUInt32BE(0),
-                set: id => super.set2($id, uInt32BEToBuffer(id)),
+                set: value => super.set2($id, uInt32BEToBuffer(value)),
             },
             int: {
                 enumerable: true,
                 configurable: false,
                 get: () => readInt24BE(super.get($int)),
-                set: int => super.set($int, super.intToBuffer(int, $int)),
+                set: value => super.set($int, super.intToBuffer(value, $int)),
             },
             string: {
                 enumerable: true,
                 configurable: false,
                 get: () => b2s(super.get($string)),
-                set: string => super.set($string, super.s2b(string, $string)),
+                set: value => super.set($string, super.s2b(value, $string)),
             },
             text: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($text)[0] ? super.readFileSync($text).toString() : '',
-                set: text => super.set($text, super.textToBuffer(text, $text)),
+                set: value => super.set($text, super.textToBuffer(value, $text)),
             },
             time: {
                 enumerable: true,
                 configurable: false,
                 get: () => b2d(super.get($time)),
-                set: time => super.set($time, d2b(time)),
+                set: value => super.set($time, d2b(value)),
             },
             uint: {
                 enumerable: true,
                 configurable: false,
                 get: () => super.get($uint).readUInt32BE(0),
-                set: uint => super.set($uint, super.uintToBuffer(uint, $uint)),
+                set: value => super.set($uint, super.uintToBuffer(value, $uint)),
             },
         })
     }
@@ -427,18 +385,14 @@ class TestSet extends Entities {
 
 export const remark = Symbol('remark')
 
-export function getStruct() {
+export const close = () => storage.close()
 
-    return struct(storage, remark)
-}
+export const getStruct = () => struct(storage, remark)
 
 /**
  * @type {import('./type').Storage}
  */
 const store = Object.freeze({
-    close() {
-        storage.close()
-    },
     admin: new Proxy([], {
         get: new AdminSet()
     }),

package/test/1/type.ts

@@ -1,5 +1,3 @@
-interface BigInt {}
-interface Buffer {}
 
 interface Admin {
     
@@ -163,7 +161,6 @@ interface TestSet extends Array<Test> {
 
 
 export interface Storage {
-    close(): void
     admin: AdminSet,
     log: LogSet,
     test: TestSet