@k3000/store 1.5.4 → 1.5.5

package/generator.mjs

@@ -938,7 +938,7 @@ function submit() {
     clipTypeTs(this.typePath, this.curr.struct)
     clipIndexMjs(this.currPath, this.curr.struct)
 
-    const version = readdirSync(this.dir).map(v => parseFloat(v) || 0).sort(sort).pop()
+    const version = readdirSync(this.dir).map(v => parseFloat(v) || 0).sort().pop()
 
     writeFileSync(`${this.dir}index.mjs`, `
 const index = import.meta.url.indexOf('?')
@@ -1195,6 +1195,7 @@ const clipIndex = (name, key, k, v) => {
 
 const clipConst = struct => Array.from(new Set(Object.values(struct)
     .map(struct => Object.keys(struct)).flat()))
+    .sort()
     .map(key => `const $${key} = '${key}'`)
     .join('\n')
 
@@ -1210,11 +1211,7 @@ const clipProperties = (name, key, update, [k, v]) => `
                 }` : clipIndex(name, key, k, v)},
             },`
 
-const sort = (a, b) => a - b
-
-const sort2 = (a, b) => a > b ? 1 : a < b ? -1 : 0
-
-const sort3 = ([a], [b]) => a > b ? 1 : a < b ? -1 : 0
+const sort2 = ([a], [b]) => a.localeCompare(b)
 
 const clipEntity = ([key, value]) => {
 
@@ -1228,7 +1225,7 @@ class ${name} extends Entity {
     static name = '${key}'
     
     static create(_) {
-${Object.entries(value).sort(sort3).map(clipStatic.bind(null, name)).filter(str => str).join('\n')}
+${Object.entries(value).sort(sort2).map(clipStatic.bind(null, name)).filter(str => str).join('\n')}
         return _
     }
 
@@ -1241,7 +1238,7 @@ ${Object.entries(value).sort(sort3).map(clipStatic.bind(null, name)).filter(str
                 enumerable: false,
                 configurable: false,
                 get: () => this[position],
-            },${Object.entries(value).sort(sort3).map(clipProperties.bind(null, name, key, update)).join('')}
+            },${Object.entries(value).sort(sort2).map(clipProperties.bind(null, name, key, update)).join('')}
         })
     }
 ${update ? `
@@ -1339,7 +1336,7 @@ const clipTypeTs = (path, struct) => writeFileSync(path, `${Object.entries(struc
 
         return `
 interface ${key} {
-    ${Object.entries(value).map(([key, value]) => `
+    ${Object.entries(value).sort(sort2).map(([key, value]) => `
     /**
      * ${commentRemark(value.remark)}
      */
@@ -1448,7 +1445,7 @@ export default function upgrade(name, {
         mkdirSync(dir)
     }
 
-    let v = readdirSync(dir).map(v => parseFloat(v) || 0).sort(sort).pop()
+    let v = readdirSync(dir).map(v => parseFloat(v) || 0).sort().pop()
 
     let prev
 

package/package.json

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