kerria 0.3.4 → 0.4.1

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

@@ -1,5 +1,5 @@
 //#region src/core/useLoad.d.ts
-interface LoadInfo extends Omit<UseLoadOptions, "defaultValue" | "beforeOutput"> {
+interface LoadInfo extends Omit<UseLoadOptions, "defaultValue" | "output"> {
   name: string;
   value: any;
   output: () => void;
@@ -8,8 +8,8 @@ interface UseLoadOptions {
   src?: string;
   out: string;
   defaultValue?: unknown;
-  onUpdate?: (newVal: any, oldVal: any) => any;
-  beforeOutput?: (val: any) => any;
+  update?: (newVal: any, oldVal: any) => any;
+  output?: (val: any) => any;
 }
 declare function useLoad(name: string, options: UseLoadOptions): LoadInfo;
 //#endregion
@@ -32,10 +32,10 @@ interface UseSourceOptions<T = any> {
   deep?: boolean;
   skip?: number;
   parse: (path: string, info: SourceInfo) => MaybePromise<T | null | void>;
+  cache?: (cache: T) => void;
   unlink?: (cache: T) => void;
-  onCacheHit?: (cache: T) => void;
 }
-declare function useSource<C extends object>(kind: number, options: UseSourceOptions<C>): SourceInfo;
+declare function useSource<T extends object>(kind: number, options: UseSourceOptions<T>): SourceInfo;
 //#endregion
 //#region src/core/kerria.d.ts
 interface KerriaContext {
@@ -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: () => () => 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,11 +44,8 @@ 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`);
+	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) {
@@ -60,36 +55,46 @@ 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.onUpdate?.(newVal, info.value) ?? newVal;
+				info.value = info.update?.(newVal, info.value) ?? newVal;
 				info.output();
 				consola.success(`[${sign}] Change "${info.src}"`);
 			});
 		}
+		return () => {
+			for (const watcher of watchers) watcher.close();
+		};
 	}
 	async function parse(path, info) {
 		const stats = await stat(path);
 		const hash = createHash("md5").update(stats.mtimeMs.toString()).digest("hex");
 		let cache = caches[path];
 		if (isDev && cache?.hash === hash) {
-			info.onCacheHit?.(cache);
+			info.cache?.(cache);
 			return false;
 		}
 		const data = await info.parse(path, info);
@@ -98,14 +103,13 @@ function createKerria(sign, setup) {
 				hash,
 				...data
 			};
-			info.onCacheHit?.(cache);
+			info.cache?.(cache);
 			caches[path] = cache;
 		} else unlink(path, info);
 		return true;
 	}
 	async function add(path, info) {
-		const cache = caches[path];
-		if (cache) return false;
+		if (caches[path]) return false;
 		return await parse(path, info);
 	}
 	function unlink(path, info) {
@@ -130,7 +134,7 @@ function createKerria(sign, setup) {
 //#region src/core/useLoad.ts
 function useLoad(name, options) {
 	const ctx = useCurrentContext();
-	const { defaultValue = {}, onUpdate, beforeOutput } = options;
+	const { defaultValue = {}, update, output } = options;
 	const src = options.src ? resolve(options.src) : void 0;
 	const out = resolve(options.out);
 	const info = {
@@ -138,14 +142,13 @@ function useLoad(name, options) {
 		src,
 		out,
 		value: src ? readJsonSync(src) : defaultValue,
-		onUpdate,
+		update,
 		output() {
-			const data = beforeOutput?.(info.value) ?? info.value;
-			writeJsonSync(out, data);
+			writeJsonSync(out, output?.(info.value) ?? info.value);
 		}
 	};
 	ctx.loadInfos.push(info);
-	onUpdate?.(info.value, void 0);
+	update?.(info.value, void 0);
 	return info;
 }
 
@@ -168,12 +171,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);
+			await writeJson(path.replace(base, dist).replace(info.ext, ".json"), data);
 		}
 	};
 	ctx.sourceInfos.push(info);

package/package.json

@@ -1,36 +1,36 @@
 {
   "name": "kerria",
   "type": "module",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "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": {
-    "@antfu/eslint-config": "^4.16.2",
-    "@types/node": "^24.0.10",
-    "@zinkawaii/eslint-config": "^0.3.0",
+    "@types/node": "^25.0.3",
+    "@zinkawaii/eslint-config": "^0.4.1",
     "@zinkawaii/tsconfig": "^0.0.2",
-    "bumpp": "^10.2.0",
-    "eslint": "^9.30.1",
-    "tsdown": "^0.12.9"
+    "bumpp": "^10.3.2",
+    "eslint": "^9.39.2",
+    "tsdown": "^0.18.4"
   },
   "scripts": {
     "build": "tsdown",