@inlang/sdk 0.34.7 → 0.34.8

package/dist/createMessagesQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMessagesQuery.d.ts","sourceRoot":"","sources":["../src/createMessagesQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAA;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAKnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AA4B/D,KAAK,6BAA6B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,QAAQ,EAAE,MAAM,eAAe,GAAG,SAAS,CAAA;IAC3C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,GAAG,SAAS,CAAA;IAC7E,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/C,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IACxC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;CACxC,CAAA;AACD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,GACnB,EAAE,6BAA6B,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CA+MpE"}
+{"version":3,"file":"createMessagesQuery.d.ts","sourceRoot":"","sources":["../src/createMessagesQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAA;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAKnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AA4B/D,KAAK,6BAA6B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,QAAQ,EAAE,MAAM,eAAe,GAAG,SAAS,CAAA;IAC3C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,GAAG,SAAS,CAAA;IAC7E,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/C,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IACxC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;CACxC,CAAA;AACD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,GACnB,EAAE,6BAA6B,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CA6MpE"}

package/dist/createMessagesQuery.js

@@ -53,13 +53,6 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
         const resolvedPluginApi = resolvedModules()?.resolvedPluginApi;
         if (!resolvedPluginApi)
             return;
-        const abortController = new AbortController();
-        // called between executions of effects as well as on disposal
-        onCleanup(() => {
-            // stop listening on fs events
-            abortController.abort();
-            delegate?.onCleanup();
-        });
         const fsWithWatcher = createNodeishFsWithWatcher({
             nodeishFs: nodeishFs,
             // this message is called whenever a file changes that was read earlier by this filesystem
@@ -75,7 +68,12 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
                     onLoadMessageResult();
                 });
             },
-            abortController,
+        });
+        // called between executions of effects as well as on disposal
+        onCleanup(() => {
+            // stop listening on fs events
+            fsWithWatcher.stopWatching();
+            delegate?.onCleanup();
         });
         if (!resolvedPluginApi.loadMessages) {
             onInitialMessageLoadResult(new Error("no loadMessages in resolved Modules found"));

package/dist/createNodeishFsWithWatcher.d.ts

@@ -8,6 +8,7 @@ import type { NodeishFilesystem } from "@lix-js/fs";
 export declare const createNodeishFsWithWatcher: (args: {
     nodeishFs: NodeishFilesystem;
     updateMessages: () => void;
-    abortController: AbortController;
-}) => NodeishFilesystem;
+}) => NodeishFilesystem & {
+    stopWatching: () => void;
+};
 //# sourceMappingURL=createNodeishFsWithWatcher.d.ts.map

package/dist/createNodeishFsWithWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNodeishFsWithWatcher.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,SAAU;IAChD,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,eAAe,EAAE,eAAe,CAAA;CAChC,KAAG,iBAgDH,CAAA"}
+{"version":3,"file":"createNodeishFsWithWatcher.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,SAAU;IAChD,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAA;CAC1B;kBACc,MAAM,IAAI;CA6DxB,CAAA"}

package/dist/createNodeishFsWithWatcher.js

@@ -6,12 +6,22 @@
  */
 export const createNodeishFsWithWatcher = (args) => {
     const pathList = [];
+    let abortControllers = [];
+    const stopWatching = () => {
+        for (const ac of abortControllers) {
+            ac.abort();
+        }
+        // release references
+        abortControllers = [];
+    };
     const makeWatcher = (path) => {
         ;
         (async () => {
             try {
+                const ac = new AbortController();
+                abortControllers.push(ac);
                 const watcher = args.nodeishFs.watch(path, {
-                    signal: args.abortController.signal,
+                    signal: ac.signal,
                     persistent: false,
                 });
                 if (watcher) {
@@ -51,5 +61,6 @@ export const createNodeishFsWithWatcher = (args) => {
         writeFile: args.nodeishFs.writeFile,
         watch: args.nodeishFs.watch,
         stat: args.nodeishFs.stat,
+        stopWatching,
     };
 };

package/dist/createNodeishFsWithWatcher.test.js

@@ -4,13 +4,11 @@ import { createNodeishFsWithWatcher } from "./createNodeishFsWithWatcher.js";
 describe("watcher", () => {
     it("should trigger the update function when file changes", async () => {
         let counter = 0;
-        const abortController = new AbortController();
         const fs = createNodeishFsWithWatcher({
             nodeishFs: createNodeishMemoryFs(),
             updateMessages: () => {
                 counter++;
             },
-            abortController,
         });
         // establish watcher
         await fs.writeFile("file.txt", "a");
@@ -30,7 +28,7 @@ describe("watcher", () => {
         await new Promise((resolve) => setTimeout(resolve, 0));
         //check if update function was called
         expect(counter).toBe(2);
-        abortController.abort();
+        fs.stopWatching();
         // change file
         await fs.writeFile("file.txt", "b");
         await new Promise((resolve) => setTimeout(resolve, 0));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/sdk",
   "type": "module",
-  "version": "0.34.7",
+  "version": "0.34.8",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -37,13 +37,13 @@
     "@inlang/language-tag": "1.5.1",
     "@inlang/message": "2.1.0",
     "@inlang/message-lint-rule": "1.4.7",
+    "@inlang/module": "1.2.11",
     "@inlang/plugin": "2.4.11",
     "@inlang/project-settings": "2.4.2",
     "@inlang/result": "1.1.0",
-    "@inlang/module": "1.2.11",
     "@inlang/translatable": "1.3.1",
-    "@lix-js/client": "1.4.0",
-    "@lix-js/fs": "1.0.0"
+    "@lix-js/fs": "1.0.0",
+    "@lix-js/client": "1.4.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/src/createMessagesQuery.ts

@@ -103,14 +103,6 @@ export function createMessagesQuery({
 		const resolvedPluginApi = resolvedModules()?.resolvedPluginApi
 		if (!resolvedPluginApi) return
 
-		const abortController = new AbortController()
-		// called between executions of effects as well as on disposal
-		onCleanup(() => {
-			// stop listening on fs events
-			abortController.abort()
-			delegate?.onCleanup()
-		})
-
 		const fsWithWatcher = createNodeishFsWithWatcher({
 			nodeishFs: nodeishFs,
 			// this message is called whenever a file changes that was read earlier by this filesystem
@@ -133,7 +125,13 @@ export function createMessagesQuery({
 						onLoadMessageResult()
 					})
 			},
-			abortController,
+		})
+
+		// called between executions of effects as well as on disposal
+		onCleanup(() => {
+			// stop listening on fs events
+			fsWithWatcher.stopWatching()
+			delegate?.onCleanup()
 		})
 
 		if (!resolvedPluginApi.loadMessages) {

package/src/createNodeishFsWithWatcher.test.ts

@@ -6,14 +6,11 @@ describe("watcher", () => {
 	it("should trigger the update function when file changes", async () => {
 		let counter = 0
 
-		const abortController = new AbortController()
-
 		const fs = createNodeishFsWithWatcher({
 			nodeishFs: createNodeishMemoryFs(),
 			updateMessages: () => {
 				counter++
 			},
-			abortController,
 		})
 
 		// establish watcher
@@ -41,7 +38,7 @@ describe("watcher", () => {
 		//check if update function was called
 		expect(counter).toBe(2)
 
-		abortController.abort()
+		fs.stopWatching()
 
 		// change file
 		await fs.writeFile("file.txt", "b")

package/src/createNodeishFsWithWatcher.ts

@@ -9,15 +9,27 @@ import type { NodeishFilesystem } from "@lix-js/fs"
 export const createNodeishFsWithWatcher = (args: {
 	nodeishFs: NodeishFilesystem
 	updateMessages: () => void
-	abortController: AbortController
-}): NodeishFilesystem => {
+}): NodeishFilesystem & {
+	stopWatching: () => void
+} => {
 	const pathList: string[] = []
+	let abortControllers: AbortController[] = []
+
+	const stopWatching = () => {
+		for (const ac of abortControllers) {
+			ac.abort()
+		}
+		// release references
+		abortControllers = [];
+	}
 
 	const makeWatcher = (path: string) => {
 		;(async () => {
 			try {
+				const ac = new AbortController()
+				abortControllers.push(ac)
 				const watcher = args.nodeishFs.watch(path, {
-					signal: args.abortController.signal,
+					signal: ac.signal,
 					persistent: false,
 				})
 				if (watcher) {
@@ -57,5 +69,6 @@ export const createNodeishFsWithWatcher = (args: {
 		writeFile: args.nodeishFs.writeFile,
 		watch: args.nodeishFs.watch,
 		stat: args.nodeishFs.stat,
+		stopWatching,
 	}
 }