kerria 0.4.0 → 0.4.2

package/dist/{index.d.ts → index.d.mts}

@@ -46,7 +46,7 @@ interface KerriaContext {
 declare function useCurrentContext(): KerriaContext;
 declare function createKerria(sign: string, setup: (ctx: KerriaContext) => void): {
   build: () => Promise<void>;
-  watch: () => Promise<void>;
+  watch: () => () => Promise<void[]>;
 };
 //#endregion
 export { KerriaContext, LoadInfo, SourceInfo, UseLoadOptions, UseSourceOptions, createKerria, useCurrentContext, useLoad, useSource };

package/dist/{index.js → index.mjs}

@@ -22,13 +22,11 @@ function readJsonSync(path) {
 }
 function writeJson(path, data) {
 	mkdirSync(dirname(path), { recursive: true });
-	const json = JSON.stringify(data);
-	return writeFile(path, json);
+	return writeFile(path, JSON.stringify(data));
 }
 function writeJsonSync(path, data) {
 	mkdirSync(dirname(path), { recursive: true });
-	const json = JSON.stringify(data);
-	return writeFileSync(path, json);
+	return writeFileSync(path, JSON.stringify(data));
 }
 
 //#endregion
@@ -46,12 +44,9 @@ function createKerria(sign, setup) {
 	currentContext = ctx;
 	setup(ctx);
 	currentContext = null;
-	ctx.sourceInfos.sort((a, b) => {
-		return a.kind - b.kind;
-	});
-	const cacheDir = pkg.cache("kerria", { create: true });
-	const cachePath = join(cacheDir, `${sign}.json`);
-	const caches = existsSync(cachePath) && readJsonSync(cachePath) || {};
+	ctx.sourceInfos.sort((a, b) => a.kind - b.kind);
+	const cachePath = join(pkg.cache("kerria", { create: true }), `${sign}.json`);
+	const caches = existsSync(cachePath) ? readJsonSync(cachePath) : {};
 	async function build() {
 		for (const info of ctx.sourceInfos) {
 			const paths = await glob(info.patterns, { absolute: true });
@@ -60,29 +55,37 @@ function createKerria(sign, setup) {
 		outputLoads();
 		consola.success(`[${sign}] Build`);
 	}
-	async function watch() {
-		for (const info of ctx.sourceInfos) chokidar.watch(info.folders, {
-			depth: info.deep ? Infinity : 0,
-			ignoreInitial: true
-		}).on("all", async (event, filename) => {
-			const path = filename.replaceAll("\\", "/");
-			if (!path.endsWith(info.ext)) return false;
-			else if (!info.filter(path)) return false;
-			else if (event === "change" && !await parse(path, info)) return false;
-			else if (event === "add" && !await add(path, info)) return false;
-			else if (event === "unlink" && !unlink(path, info)) return false;
-			outputLoads();
-			consola.success(`[${sign}] ${capitalize(event)} "${path}"`);
-		});
+	function watch() {
+		const watchers = [];
+		for (const info of ctx.sourceInfos) {
+			const watcher = chokidar.watch(info.folders, {
+				depth: info.deep ? Infinity : 0,
+				ignoreInitial: true
+			});
+			watchers.push(watcher);
+			watcher.on("all", async (event, filename) => {
+				const path = filename.replaceAll("\\", "/");
+				if (!path.endsWith(info.ext)) return false;
+				else if (!info.filter(path)) return false;
+				else if (event === "change" && !await parse(path, info)) return false;
+				else if (event === "add" && !await add(path, info)) return false;
+				else if (event === "unlink" && !unlink(path, info)) return false;
+				outputLoads();
+				consola.success(`[${sign}] ${capitalize(event)} "${path}"`);
+			});
+		}
 		for (const info of ctx.loadInfos) {
 			if (!info.src) continue;
-			chokidar.watch(info.src, { ignoreInitial: true }).on("change", async () => {
+			const watcher = chokidar.watch(info.src, { ignoreInitial: true });
+			watchers.push(watcher);
+			watcher.on("change", async () => {
 				const newVal = await readJson(info.src);
 				info.value = info.update?.(newVal, info.value) ?? newVal;
 				info.output();
 				consola.success(`[${sign}] Change "${info.src}"`);
 			});
 		}
+		return () => Promise.all(watchers.map((watcher) => watcher.close()));
 	}
 	async function parse(path, info) {
 		const stats = await stat(path);
@@ -103,10 +106,9 @@ function createKerria(sign, setup) {
 		} else unlink(path, info);
 		return true;
 	}
-	async function add(path, info) {
-		const cache = caches[path];
-		if (cache) return false;
-		return await parse(path, info);
+	function add(path, info) {
+		if (path in caches) return false;
+		return parse(path, info);
 	}
 	function unlink(path, info) {
 		const cache = caches[path];
@@ -140,8 +142,7 @@ function useLoad(name, options) {
 		value: src ? readJsonSync(src) : defaultValue,
 		update,
 		output() {
-			const data = output?.(info.value) ?? info.value;
-			writeJsonSync(out, data);
+			writeJsonSync(out, output?.(info.value) ?? info.value);
 		}
 	};
 	ctx.loadInfos.push(info);
@@ -168,12 +169,10 @@ function useSource(kind, options) {
 		deep,
 		skip,
 		filter(path) {
-			const depth = path.split("/").length - folders[0].split("/").length;
-			return skip < depth;
+			return skip < path.split("/").length - folders[0].split("/").length;
 		},
-		async output(path, data) {
-			const outPath = path.replace(base, dist).replace(info.ext, ".json");
-			await writeJson(outPath, data);
+		output(path, data) {
+			return writeJson(path.replace(base, dist).replace(info.ext, ".json"), data);
 		}
 	};
 	ctx.sourceInfos.push(info);

package/package.json

@@ -1,35 +1,36 @@
 {
   "name": "kerria",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Composable source processor",
   "author": "KazariEX",
   "license": "MIT",
   "repository": "KazariEX/kerria",
   "keywords": [],
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.mjs",
+    "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "chokidar": "^4.0.3",
+    "chokidar": "^5.0.0",
     "consola": "^3.4.2",
     "empathic": "^2.0.0",
     "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.14"
+    "tinyglobby": "^0.2.15"
   },
   "devDependencies": {
-    "@types/node": "^24.3.0",
+    "@types/node": "^25.0.3",
     "@zinkawaii/eslint-config": "^0.4.1",
     "@zinkawaii/tsconfig": "^0.0.2",
-    "bumpp": "^10.2.3",
-    "eslint": "^9.33.0",
-    "tsdown": "^0.14.1"
+    "bumpp": "^10.3.2",
+    "eslint": "^9.39.2",
+    "tsdown": "^0.18.4"
   },
   "scripts": {
     "build": "tsdown",