tcdona_unilib 1.0.15 → 1.0.16

package/neverthrow.ts

@@ -10,6 +10,7 @@ export {
   fromPromise,
   fromSafePromise,
   fromThrowable,
+  fromAsyncThrowable,
   safeTry,
 } from 'neverthrow'
 export type { Result as ResultType } from 'neverthrow'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tcdona_unilib",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Unified dependency aggregation layer for shared libraries",
   "type": "module",
   "sideEffects": false,
@@ -74,7 +74,6 @@
     "exome": "^2.8.1",
     "hono": "^4.11.3",
     "hotkeys-js": "^4.0.0",
-    "js-yaml": "^4.1.1",
     "koka": "^1.0.9",
     "koka-domain": "^1.0.0",
     "magic-regexp": "^0.10.0",

package/staticMeta/file.yml.ts

@@ -1,9 +1,31 @@
 import { fs, YAML } from 'zx'
+
+/**
+ * 深度排序对象的所有键，数组本身不排序但会递归处理数组内的对象
+ */
+export const sortKeys = (value: unknown): unknown => {
+  if (value == null || typeof value !== 'object') return value
+  if (Array.isArray(value)) return value.map(sortKeys)
+  const sorted: Record<string, unknown> = {}
+  for (const key of Object.keys(value).sort()) {
+    sorted[key] = sortKeys((value as Record<string, unknown>)[key])
+  }
+  return sorted
+}
+
 /**
  * YAML 文件读写：无 data 参数时读取，有 data 参数时写入
  */
-export function yml(path: string, data?: unknown): unknown {
+export function yml(
+  path: string,
+  data?: unknown,
+  sorted: boolean = true,
+): unknown {
   if (typeof data !== 'undefined') {
+    // 针对 data 进行深度遍历，对里面的所有 kv 形式的对象的 key 进行排序
+    if (sorted === true) {
+      data = sortKeys(data)
+    }
     fs.writeFileSync(
       path,
       // @ts-expect-error YAML.stringify 类型定义有误
@@ -15,13 +37,3 @@ export function yml(path: string, data?: unknown): unknown {
     return YAML.parse(ymlContent)
   }
 }
-
-import { default as jsYAML } from 'js-yaml'
-export const yml2 = (path: string, data?: unknown): unknown => {
-  if (typeof data !== 'undefined') {
-    fs.writeFileSync(path, jsYAML.dump(data, { sortKeys: true }), 'utf-8')
-  } else {
-    const ymlContent = fs.readFileSync(path, 'utf-8')
-    return jsYAML.load(ymlContent)
-  }
-}