Merge pull request #89 from macalinao/igm/bug

macalinao · web-flow · commit da1add236798 · 2025-10-12T18:24:44.000+08:00
Fix bug with useGeneratedValue
diff --git a/.changeset/cruel-seas-pump.md b/.changeset/cruel-seas-pump.md
@@ -0,0 +1,12 @@
+---
+"@macalinao/solana-batch-accounts-loader": patch
+"@macalinao/dataloader-es": patch
+"@macalinao/react-quarry": patch
+"@macalinao/token-utils": patch
+"@macalinao/gill-extra": patch
+"@macalinao/zod-solana": patch
+"@macalinao/quarry": patch
+"@macalinao/grill": patch
+---
+
+Fix bun-types import
diff --git a/.changeset/four-lies-scream.md b/.changeset/four-lies-scream.md
@@ -0,0 +1,5 @@
+---
+"@macalinao/react-quarry": patch
+---
+
+Fix bug with useGeneratedValue (not aborted)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,15 +17,15 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: latest
+          bun-version: 1.2.23
 
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-
+            ${{ runner.os }}-buncache-
 
       - name: Install dependencies
         run: bun install --frozen-lockfile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,15 +31,15 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: latest
+          bun-version: 1.2.23
 
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-
+            ${{ runner.os }}-buncache-
 
       - name: Install Dependencies
         run: bun install --frozen-lockfile
diff --git a/bun.lock b/bun.lock
@@ -79,6 +79,9 @@
     "packages/dataloader-es": {
       "name": "@macalinao/dataloader-es",
       "version": "0.2.5",
+      "dependencies": {
+        "tslib": "^2.8.1",
+      },
       "devDependencies": {
         "@macalinao/eslint-config": "catalog:",
         "@macalinao/tsconfig": "catalog:",
diff --git a/devenv.lock b/devenv.lock
@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1759437797,
+        "lastModified": 1760162706,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "89ce1b7ac66ca381a335a60ad6acc723ef6f42f3",
+        "rev": "0d5ad578728fe4bce66eb4398b8b1e66deceb4e4",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1759523803,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
         "type": "github"
       },
       "original": {
@@ -74,10 +74,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759417375,
+        "lastModified": 1760164275,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c",
+        "rev": "362791944032cb532aabbeed7887a441496d5e6e",
         "type": "github"
       },
       "original": {
diff --git a/packages/dataloader-es/package.json b/packages/dataloader-es/package.json
@@ -56,5 +56,8 @@
       "eslint --fix --cache"
     ],
     "*.{json,jsonc,html}": "biome format --write --no-errors-on-unmatched"
+  },
+  "dependencies": {
+    "tslib": "^2.8.1"
   }
 }
diff --git a/packages/dataloader-es/src/dataLoader.ts b/packages/dataloader-es/src/dataLoader.ts
@@ -233,7 +233,6 @@ export class DataLoader<K, V, C = K> {
     // Cache hits are resolved, even though the batch failed.
     resolveCacheHits(batch);
     for (let i = 0; i < batch.keys.length; i++) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       this.clear(batch.keys[i]!);
 
       batch.callbacks[i]?.reject(error);
diff --git a/packages/dataloader-es/tsconfig.json b/packages/dataloader-es/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@macalinao/tsconfig/tsconfig.dom.json",
   "compilerOptions": {
-    "types": ["bun-types"]
+    "types": ["bun"]
   }
 }
diff --git a/packages/gill-extra/tsconfig.json b/packages/gill-extra/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "@macalinao/tsconfig/tsconfig.base.json",
   "compilerOptions": {
     "isolatedDeclarations": false,
-    "types": ["bun-types"]
+    "types": ["bun"]
   }
 }
diff --git a/packages/grill/tsconfig.json b/packages/grill/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "@macalinao/tsconfig/tsconfig.react.json",
   "compilerOptions": {
     "isolatedDeclarations": false,
-    "types": ["bun-types"]
+    "types": ["bun"]
   }
 }
diff --git a/packages/quarry/tsconfig.json b/packages/quarry/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@macalinao/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "types": ["bun-types"]
+    "types": ["bun"]
   }
 }
diff --git a/packages/react-quarry/src/hooks/use-generated-value.ts b/packages/react-quarry/src/hooks/use-generated-value.ts
@@ -17,7 +17,7 @@ export const useGeneratedValue = (get: () => number | null): number | null => {
     const ctrl = new AbortController();
     const doFrame = () => {
       setValue(get());
-      if (ctrl.signal.aborted) {
+      if (!ctrl.signal.aborted) {
         requestAnimationFrame(doFrame);
       }
     };
diff --git a/packages/react-quarry/tsconfig.json b/packages/react-quarry/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "./src",
-    "types": ["bun-types"]
+    "types": ["bun"]
   },
   "include": ["src/**/*"]
 }
diff --git a/packages/solana-batch-accounts-loader/tsconfig.json b/packages/solana-batch-accounts-loader/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@macalinao/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "types": ["bun-types"]
+    "types": ["bun"]
   }
 }
diff --git a/packages/token-utils/tsconfig.json b/packages/token-utils/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "@macalinao/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "types": ["bun-types"]
+    "types": ["bun"]
   },
   "include": ["src/**/*"]
 }
diff --git a/packages/zod-solana/tsconfig.json b/packages/zod-solana/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "@macalinao/tsconfig/tsconfig.dom.json",
   "compilerOptions": {
-    "types": ["bun-types"],
+    "types": ["bun"],
     "isolatedDeclarations": false
   }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@macalinao/react-quarry": patch
 +---
++
 +Fix bug with useGeneratedValue (not aborted)
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,8 @@`
`56`	`56`	`"eslint --fix --cache"`
`57`	`57`	`],`
`58`	`58`	`"*.{json,jsonc,html}": "biome format --write --no-errors-on-unmatched"`
	`59`	`+ },`
	`60`	`+ "dependencies": {`
	`61`	`+ "tslib": "^2.8.1"`
`59`	`62`	`}`
`60`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "@macalinao/tsconfig/tsconfig.dom.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "types": ["bun-types"]`
	`4`	`+ "types": ["bun"]`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"extends": "@macalinao/tsconfig/tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"isolatedDeclarations": false,`
`5`		`- "types": ["bun-types"]`
	`5`	`+ "types": ["bun"]`
`6`	`6`	`}`
`7`	`7`	`}`