@isograph/disposable-types 0.5.2 → 0.5.4

package/.turbo/turbo-compile-libs.log

@@ -1,11 +1,11 @@
-../..                                    |  WARN  Unsupported engine: wanted: {"node":"22.9.0"} (current: {"node":"v22.21.1","pnpm":"10.15.0"})
+../..                                    |  WARN  Unsupported engine: wanted: {"node":"24.12.0"} (current: {"node":"v22.23.2","pnpm":"10.15.0"})
 
-> @isograph/disposable-types@0.5.2 compile-libs /home/runner/work/isograph/isograph/libs/isograph-disposable-types
+> @isograph/disposable-types@0.5.4 compile-libs /home/runner/work/isograph/isograph/libs/isograph-disposable-types
 > tsdown
 
-ℹ tsdown v0.15.10 powered by rolldown v1.0.0-beta.44
-ℹ Using tsdown config: /home/runner/work/isograph/isograph/tsdown.config.ts
-(node:2360) [MODULE_TYPELESS_PACKAGE_JSON] Warning: Module type of file:///home/runner/work/isograph/isograph/tsdown.config.ts is not specified and it doesn't parse as CommonJS.
+ℹ tsdown v0.20.1 powered by rolldown v1.0.0-rc.1
+ℹ config file: /home/runner/work/isograph/isograph/tsdown.config.ts 
+(node:2562) [MODULE_TYPELESS_PACKAGE_JSON] Warning: Module type of file:///home/runner/work/isograph/isograph/tsdown.config.ts?no-cache=3ba88d2d-00bd-4924-9c08-6ff7c6478888 is not specified and it doesn't parse as CommonJS.
 Reparsing as ES module because module syntax was detected. This incurs a performance overhead.
 To eliminate this warning, add "type": "module" to /home/runner/work/isograph/isograph/package.json.
 (Use `node --trace-warnings ...` to show where the warning was created)

package/.turbo/turbo-tsc.log

@@ -0,0 +1,5 @@
+../..                                    |  WARN  Unsupported engine: wanted: {"node":"24.12.0"} (current: {"node":"v22.23.2","pnpm":"10.15.0"})
+
+> @isograph/disposable-types@0.5.4 tsc /home/runner/work/isograph/isograph/libs/isograph-disposable-types
+> tsc
+

package/dist/index.cjs

@@ -0,0 +1,20 @@
+
+//#region src/index.ts
+function joinCleanups(...pairs) {
+	const items = pairs.map(([item]) => item);
+	const dispose = () => {
+		let error;
+		pairs.reduceRight((_, [, cleanup]) => {
+			try {
+				cleanup();
+			} catch (e) {
+				error ??= e;
+			}
+		}, void 0);
+		if (error !== void 0) throw error;
+	};
+	return [items, dispose];
+}
+
+//#endregion
+exports.joinCleanups = joinCleanups;

package/dist/index.d.cts

@@ -0,0 +1,9 @@
+//#region src/index.d.ts
+type CleanupFn = () => void;
+type ItemCleanupPair<T> = [T, CleanupFn];
+type Factory<T> = () => ItemCleanupPair<T>;
+type ItemsOf<T extends readonly ItemCleanupPair<unknown>[]> = { [I in keyof T]: T[I] extends ItemCleanupPair<infer V> ? V : never };
+declare function joinCleanups<const T extends readonly ItemCleanupPair<unknown>[]>(...pairs: T): ItemCleanupPair<ItemsOf<T>>;
+//#endregion
+export { CleanupFn, Factory, ItemCleanupPair, joinCleanups };
+//# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/index.ts"],"mappings":";KAAY,SAAA;AAAA,KACA,eAAA,OAAsB,CAAA,EAAG,SAAA;AAAA,KACzB,OAAA,YAAmB,eAAA,CAAgB,CAAA;AAAA,KAE1C,OAAA,oBAA2B,eAAA,6BAClB,CAAA,GAAI,CAAA,CAAE,CAAA,UAAW,eAAA,YAA2B,CAAA;AAAA,iBAG1C,YAAA,0BACW,eAAA,YAAA,CAAA,GACtB,KAAA,EAAO,CAAA,GAAI,eAAA,CAAgB,OAAA,CAAQ,CAAA"}

package/dist/index.d.mts

@@ -2,6 +2,8 @@
 type CleanupFn = () => void;
 type ItemCleanupPair<T> = [T, CleanupFn];
 type Factory<T> = () => ItemCleanupPair<T>;
+type ItemsOf<T extends readonly ItemCleanupPair<unknown>[]> = { [I in keyof T]: T[I] extends ItemCleanupPair<infer V> ? V : never };
+declare function joinCleanups<const T extends readonly ItemCleanupPair<unknown>[]>(...pairs: T): ItemCleanupPair<ItemsOf<T>>;
 //#endregion
-export { CleanupFn, Factory, ItemCleanupPair };
+export { CleanupFn, Factory, ItemCleanupPair, joinCleanups };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/index.ts"],"sourcesContent":[],"mappings":";KAAY,SAAA;AAAA,KACA,eADS,CAAA,CAAA,CAAA,GAAA,CACa,CADb,EACgB,SADhB,CAAA;AACT,KACA,OADA,CAAA,CAAA,CAAe,GAAA,GAAA,GACI,eADM,CACU,CADD,CAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/index.ts"],"mappings":";KAAY,SAAA;AAAA,KACA,eAAA,OAAsB,CAAA,EAAG,SAAA;AAAA,KACzB,OAAA,YAAmB,eAAA,CAAgB,CAAA;AAAA,KAE1C,OAAA,oBAA2B,eAAA,6BAClB,CAAA,GAAI,CAAA,CAAE,CAAA,UAAW,eAAA,YAA2B,CAAA;AAAA,iBAG1C,YAAA,0BACW,eAAA,YAAA,CAAA,GACtB,KAAA,EAAO,CAAA,GAAI,eAAA,CAAgB,OAAA,CAAQ,CAAA"}

package/dist/index.mjs

@@ -1 +1,20 @@
-export {  };
+//#region src/index.ts
+function joinCleanups(...pairs) {
+	const items = pairs.map(([item]) => item);
+	const dispose = () => {
+		let error;
+		pairs.reduceRight((_, [, cleanup]) => {
+			try {
+				cleanup();
+			} catch (e) {
+				error ??= e;
+			}
+		}, void 0);
+		if (error !== void 0) throw error;
+	};
+	return [items, dispose];
+}
+
+//#endregion
+export { joinCleanups };
+//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","names":[],"sources":["../src/index.ts"],"sourcesContent":["export type CleanupFn = () => void;\nexport type ItemCleanupPair<T> = [T, CleanupFn];\nexport type Factory<T> = () => ItemCleanupPair<T>;\n\ntype ItemsOf<T extends readonly ItemCleanupPair<unknown>[]> = {\n  [I in keyof T]: T[I] extends ItemCleanupPair<infer V> ? V : never;\n};\n\nexport function joinCleanups<\n  const T extends readonly ItemCleanupPair<unknown>[],\n>(...pairs: T): ItemCleanupPair<ItemsOf<T>> {\n  const items = pairs.map(([item]) => item) as ItemsOf<T>;\n  const dispose: CleanupFn = () => {\n    let error: unknown;\n    pairs.reduceRight((_, [, cleanup]) => {\n      try {\n        cleanup();\n      } catch (e) {\n        error ??= e;\n      }\n      return undefined;\n    }, undefined);\n    if (error !== undefined) {\n      throw error;\n    }\n  };\n  return [items, dispose];\n}\n"],"mappings":";AAQA,SAAgB,aAEd,GAAG,OAAuC;CAC1C,MAAM,QAAQ,MAAM,KAAK,CAAC,UAAU,KAAK;CACzC,MAAM,gBAA2B;EAC/B,IAAI;AACJ,QAAM,aAAa,GAAG,GAAG,aAAa;AACpC,OAAI;AACF,aAAS;YACF,GAAG;AACV,cAAU;;KAGX,OAAU;AACb,MAAI,UAAU,OACZ,OAAM;;AAGV,QAAO,CAAC,OAAO,QAAQ"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@isograph/disposable-types",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Common types for disposable items",
   "homepage": "https://isograph.dev",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.cts",
   "author": "Isograph Labs",
   "license": "MIT",
   "dependencies": {},
@@ -20,17 +20,17 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
   "scripts": {
     "compile-libs": "tsdown",
     "watch-libs": "tsdown --watch",
-    "test": "echo this package has no tests",
-    "test-watch": "echo this package has no tests",
-    "coverage": "echo this package has no coverage",
+    "test": "vitest run",
+    "test-watch": "vitest watch",
+    "coverage": "vitest run --coverage",
     "tsc": "tsc",
     "tsc-force": "tsc --build --clean && tsc --build --force"
   }

package/src/index.ts

@@ -1,3 +1,28 @@
 export type CleanupFn = () => void;
 export type ItemCleanupPair<T> = [T, CleanupFn];
 export type Factory<T> = () => ItemCleanupPair<T>;
+
+type ItemsOf<T extends readonly ItemCleanupPair<unknown>[]> = {
+  [I in keyof T]: T[I] extends ItemCleanupPair<infer V> ? V : never;
+};
+
+export function joinCleanups<
+  const T extends readonly ItemCleanupPair<unknown>[],
+>(...pairs: T): ItemCleanupPair<ItemsOf<T>> {
+  const items = pairs.map(([item]) => item) as ItemsOf<T>;
+  const dispose: CleanupFn = () => {
+    let error: unknown;
+    pairs.reduceRight((_, [, cleanup]) => {
+      try {
+        cleanup();
+      } catch (e) {
+        error ??= e;
+      }
+      return undefined;
+    }, undefined);
+    if (error !== undefined) {
+      throw error;
+    }
+  };
+  return [items, dispose];
+}

package/src/joinCleanups.test.ts

@@ -0,0 +1,97 @@
+import { assert, describe, expect, test } from 'vitest';
+import { joinCleanups } from './index';
+
+describe('joinCleanups', () => {
+  test('Disposes in reverse argument order', () => {
+    const order: string[] = [];
+    const [items, dispose] = joinCleanups(
+      [
+        'a',
+        () => {
+          order.push('a');
+        },
+      ],
+      [
+        'b',
+        () => {
+          order.push('b');
+        },
+      ],
+      [
+        'c',
+        () => {
+          order.push('c');
+        },
+      ],
+    );
+
+    expect(items).toEqual(['a', 'b', 'c']);
+    dispose();
+    expect(order).toEqual(['c', 'b', 'a']);
+  });
+
+  test('If a cleanup throws, remaining cleanups still run and the first error is rethrown', () => {
+    const order: string[] = [];
+    const errorB = new Error('b');
+    const [, dispose] = joinCleanups(
+      [
+        'a',
+        () => {
+          order.push('a');
+        },
+      ],
+      [
+        'b',
+        () => {
+          order.push('b');
+          throw errorB;
+        },
+      ],
+      [
+        'c',
+        () => {
+          order.push('c');
+        },
+      ],
+    );
+
+    let thrown: unknown;
+    try {
+      dispose();
+    } catch (e) {
+      thrown = e;
+    }
+
+    assert(thrown === errorB);
+    expect(order).toEqual(['c', 'b', 'a']);
+  });
+
+  test('If two cleanups throw, the first error in dispose order is rethrown', () => {
+    const errorA = new Error('a');
+    const errorC = new Error('c');
+    const [, dispose] = joinCleanups(
+      [
+        'a',
+        () => {
+          throw errorA;
+        },
+      ],
+      ['b', () => {}],
+      [
+        'c',
+        () => {
+          throw errorC;
+        },
+      ],
+    );
+
+    let thrown: unknown;
+    try {
+      dispose();
+    } catch (e) {
+      thrown = e;
+    }
+
+    assert(thrown === errorC);
+  });
+});

package/tsconfig.json

@@ -1,6 +1,4 @@
 {
-  "extends": "./tsconfig.pkg.json",
-  "compilerOptions": {
-    "noEmit": true
-  }
+  "extends": "../../tsconfig.build.json",
+  "include": ["./**/*.ts"]
 }

package/dist/index.d.ts

@@ -1,7 +0,0 @@
-//#region src/index.d.ts
-type CleanupFn = () => void;
-type ItemCleanupPair<T> = [T, CleanupFn];
-type Factory<T> = () => ItemCleanupPair<T>;
-//#endregion
-export { CleanupFn, Factory, ItemCleanupPair };
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"sourcesContent":[],"mappings":";KAAY,SAAA;AAAA,KACA,eADS,CAAA,CAAA,CAAA,GAAA,CACa,CADb,EACgB,SADhB,CAAA;AACT,KACA,OADA,CAAA,CAAA,CAAe,GAAA,GAAA,GACI,eADM,CACU,CADD,CAAA"}

package/tsconfig.pkg.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.build.json",
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "rootDir": "./src/",
-    "declaration": true,
-    "jsx": "react"
-  },
-  "include": ["./**/*.ts"]
-}