@nsnanocat/util 2.5.16 → 2.5.17

package/getStorage.mjs

@@ -1,7 +1,7 @@
 import "./lib/argument.mjs";
 import { Console } from "./polyfill/Console.mjs";
 import { Lodash as _ } from "./polyfill/Lodash.mjs";
-import { Storage } from "./polyfill/Storage.js";
+import { Storage } from "./polyfill/Storage.mjs";
 
 /**
  * 存储配置读取与合并结果。

package/{index.mjs → index.js}

@@ -5,11 +5,11 @@ export * from "./lib/notification.mjs";
 export * from "./lib/time.mjs";
 export * from "./lib/wait.mjs";
 export * from "./polyfill/Console.mjs";
-export * from "./polyfill/fetch.js";
+export * from "./polyfill/fetch.mjs";
 export * from "./polyfill/Lodash.mjs";
 export * from "./polyfill/qs.mjs";
 export * from "./polyfill/StatusTexts.mjs";
-export * from "./polyfill/Storage.js";
+export * from "./polyfill/Storage.mjs";
 
 /**
  * 已标准化的 `$argument` 快照。

package/package.json

@@ -13,8 +13,9 @@
   ],
   "license": "Apache-2.0",
   "bugs": "https://github.com/NSNanoCat/util/issues",
-  "main": "index.mjs",
+  "main": "index.js",
   "types": "types/nsnanocat-util.d.ts",
+  "type": "module",
   "scripts": {
     "tsc:build": "npx tsc",
     "test": "node --test test/*.test.js",
@@ -27,7 +28,7 @@
     "url": "git+https://github.com/NSNanoCat/util.git"
   },
   "files": [
-    "index.mjs",
+    "index.js",
     "lib",
     "polyfill",
     "getStorage.mjs",
@@ -41,5 +42,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "2.5.16"
+  "version": "2.5.17"
 }

package/polyfill/{Storage.js → Storage.mjs}

@@ -284,22 +284,24 @@ export class Storage {
 	 * @param {string} dataFile 数据文件名 / Data file name.
 	 * @returns {Record<string, any>}
 	 */
-	static #loaddata(dataFile) {
-		if ($app !== "Node.js") return {};
-		// 优先复用全局运行时对象，不存在时再按需加载。
-		// Prefer reusing global runtime modules and lazily require when missing.
-		if (!globalThis.fs) globalThis.fs = require("fs");
-		if (!globalThis.path) globalThis.path = require("path");
-		const dataFilePathCandidates = [...new Set([globalThis.path.resolve(dataFile), globalThis.path.resolve(process.cwd(), dataFile)])];
-		const dataFilePath = dataFilePathCandidates.find(filePath => globalThis.fs.existsSync(filePath));
-		if (!dataFilePath) return {};
-		try {
-			const jsonData = globalThis.fs.readFileSync(dataFilePath, "utf8");
-			return jsonData ? JSON.parse(jsonData) : {};
-		} catch (e) {
-			return {};
-		}
-	}
+	static #loaddata = dataFile => {
+		if ($app === "Node.js") {
+			this.fs = this.fs ? this.fs : require("node:fs");
+			this.path = this.path ? this.path : require("node:path");
+			const curDirDataFilePath = this.path.resolve(dataFile);
+			const rootDirDataFilePath = this.path.resolve(process.cwd(), dataFile);
+			const isCurDirDataFile = this.fs.existsSync(curDirDataFilePath);
+			const isRootDirDataFile = !isCurDirDataFile && this.fs.existsSync(rootDirDataFilePath);
+			if (isCurDirDataFile || isRootDirDataFile) {
+				const datPath = isCurDirDataFile ? curDirDataFilePath : rootDirDataFilePath;
+				try {
+					return JSON.parse(this.fs.readFileSync(datPath));
+				} catch (e) {
+					return {};
+				}
+			} else return {};
+		} else return {};
+	};
 
 	/**
 	 * 将内存数据写入 Node.js 数据文件。
@@ -309,15 +311,22 @@ export class Storage {
 	 * @param {string} [dataFile=this.dataFile] 数据文件名 / Data file name.
 	 * @returns {void}
 	 */
-	static #writedata(dataFile = this.dataFile) {
-		if ($app !== "Node.js") return;
-		// 优先复用全局运行时对象，不存在时再按需加载。
-		// Prefer reusing global runtime modules and lazily require when missing.
-		if (!globalThis.fs) globalThis.fs = require("fs");
-		if (!globalThis.path) globalThis.path = require("path");
-		const dataFilePathCandidates = [...new Set([globalThis.path.resolve(dataFile), globalThis.path.resolve(process.cwd(), dataFile)])];
-		const dataFilePath = dataFilePathCandidates.find(filePath => globalThis.fs.existsSync(filePath)) ?? dataFilePathCandidates[0];
-		const jsonData = JSON.stringify(this.data);
-		globalThis.fs.writeFileSync(dataFilePath, jsonData);
-	}
+	static #writedata = (dataFile = this.dataFile) => {
+		if ($app === "Node.js") {
+			this.fs = this.fs ? this.fs : require("node:fs");
+			this.path = this.path ? this.path : require("node:path");
+			const curDirDataFilePath = this.path.resolve(dataFile);
+			const rootDirDataFilePath = this.path.resolve(process.cwd(), dataFile);
+			const isCurDirDataFile = this.fs.existsSync(curDirDataFilePath);
+			const isRootDirDataFile = !isCurDirDataFile && this.fs.existsSync(rootDirDataFilePath);
+			const jsondata = JSON.stringify(this.data);
+			if (isCurDirDataFile) {
+				this.fs.writeFileSync(curDirDataFilePath, jsondata);
+			} else if (isRootDirDataFile) {
+				this.fs.writeFileSync(rootDirDataFilePath, jsondata);
+			} else {
+				this.fs.writeFileSync(curDirDataFilePath, jsondata);
+			}
+		}
+	};
 }

package/polyfill/fetch.mts

@@ -0,0 +1,6 @@
+import { fetch as fetchRuntime } from "./fetch.mjs";
+import type { Fetch } from "./fetch.d.ts";
+
+export type { Fetch, FetchRequest, FetchResponse } from "./fetch.d.ts";
+
+export const fetch: Fetch = fetchRuntime as Fetch;

package/polyfill/index.d.ts

@@ -3,9 +3,9 @@
  * Aggregated exports for polyfill modules.
  */
 export { Console } from "./Console.mjs";
-export { fetch } from "./fetch.js";
-export type { Fetch, FetchRequest, FetchResponse } from "./fetch.js";
+export { fetch } from "./fetch.mjs";
+export type { Fetch, FetchRequest, FetchResponse } from "./fetch.mjs";
 export { Lodash } from "./Lodash.mjs";
 export { qs } from "./qs.mjs";
 export { StatusTexts } from "./StatusTexts.mjs";
-export { Storage } from "./Storage.js";
+export { Storage } from "./Storage.mjs";

package/polyfill/index.js

@@ -1,6 +1,6 @@
 export * from "./Console.mjs";
-export * from "./fetch.js";
+export * from "./fetch.mjs";
 export * from "./Lodash.mjs";
 export * from "./qs.mjs";
 export * from "./StatusTexts.mjs";
-export * from "./Storage.js";
+export * from "./Storage.mjs";