brustjs 0.1.37-alpha → 0.1.39-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/example/pokedex/components/ThemeToggle.tsx +11 -3
- package/package.json +7 -7
- package/runtime/cli/native-routes-emit.ts +22 -1
- package/runtime/index.js +52 -52
- package/runtime/index.ts +30 -0
- package/runtime/islands/build.ts +40 -30
- package/runtime/islands/chunk-id.ts +17 -0
- package/runtime/islands/island.tsx +18 -1
- package/runtime/native/index.ts +4 -1
- package/runtime/native/runtime.ts +33 -2
- package/runtime/store/signal.ts +40 -3
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
// /theme action which sets the `mode` cookie — so SSR matches on the next load.
|
|
12
12
|
import { Moon, Sun } from 'lucide-react'
|
|
13
13
|
import { client } from 'brustjs/client'
|
|
14
|
+
import type { BehaviorCtx } from 'brustjs/native'
|
|
14
15
|
import { computed, signal } from 'brustjs/store'
|
|
15
16
|
import type { Actions } from '../actions'
|
|
16
17
|
|
|
@@ -18,7 +19,7 @@ const api = client<Actions>()
|
|
|
18
19
|
|
|
19
20
|
// behavior → client bundle, registered as "themeToggle". Reads the initial mode
|
|
20
21
|
// straight off <html data-mode> (server already set it from the cookie).
|
|
21
|
-
export const behavior = () => {
|
|
22
|
+
export const behavior = ({ effect }: BehaviorCtx) => {
|
|
22
23
|
const mode = signal(
|
|
23
24
|
typeof document !== 'undefined' ? (document.documentElement.dataset.mode ?? 'dark') : 'dark',
|
|
24
25
|
)
|
|
@@ -28,10 +29,17 @@ export const behavior = () => {
|
|
|
28
29
|
const isDark = computed(() => mode() === 'dark')
|
|
29
30
|
const isLight = computed(() => mode() === 'light')
|
|
30
31
|
|
|
32
|
+
// Reactive sync (dogfooding ctx `effect`): reflect `mode` onto <html data-mode>
|
|
33
|
+
// whenever it changes — the toggle just flips the signal, the DOM follows. On
|
|
34
|
+
// mount this runs once and writes the value the server already set (a no-op, so
|
|
35
|
+
// no flash). Replaces the imperative `dataset.mode = …` that lived in toggle().
|
|
36
|
+
effect(() => {
|
|
37
|
+
document.documentElement.dataset.mode = mode()
|
|
38
|
+
})
|
|
39
|
+
|
|
31
40
|
async function toggle() {
|
|
32
41
|
const next = mode() === 'dark' ? 'light' : 'dark'
|
|
33
|
-
|
|
34
|
-
mode.set(next)
|
|
42
|
+
mode.set(next) // the effect flips <html data-mode> reactively
|
|
35
43
|
await api.theme.post({ mode: next }) // persist via cookie for the next SSR
|
|
36
44
|
}
|
|
37
45
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "brustjs",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.39-alpha",
|
|
4
4
|
"description": "Bun + Rust SSR framework — React on the server, Rust everywhere else (napi cdylib + per-worker SharedArrayBuffer).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -40,12 +40,12 @@
|
|
|
40
40
|
"typescript": "^6.0.3"
|
|
41
41
|
},
|
|
42
42
|
"optionalDependencies": {
|
|
43
|
-
"brustjs-darwin-x64": "0.1.
|
|
44
|
-
"brustjs-darwin-arm64": "0.1.
|
|
45
|
-
"brustjs-linux-x64-gnu": "0.1.
|
|
46
|
-
"brustjs-linux-arm64-gnu": "0.1.
|
|
47
|
-
"brustjs-linux-x64-musl": "0.1.
|
|
48
|
-
"brustjs-linux-arm64-musl": "0.1.
|
|
43
|
+
"brustjs-darwin-x64": "0.1.39-alpha",
|
|
44
|
+
"brustjs-darwin-arm64": "0.1.39-alpha",
|
|
45
|
+
"brustjs-linux-x64-gnu": "0.1.39-alpha",
|
|
46
|
+
"brustjs-linux-arm64-gnu": "0.1.39-alpha",
|
|
47
|
+
"brustjs-linux-x64-musl": "0.1.39-alpha",
|
|
48
|
+
"brustjs-linux-arm64-musl": "0.1.39-alpha"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"react": "^19.2.6",
|
|
@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node
|
|
|
2
2
|
import { createRequire } from 'node:module'
|
|
3
3
|
import { dirname, relative, resolve } from 'node:path'
|
|
4
4
|
import { buildDevClientTag } from '../dev/client.ts'
|
|
5
|
+
import { islandChunkBasename } from '../islands/chunk-id.ts'
|
|
5
6
|
import { DIRECTIVES_BOOTSTRAP, ISLANDS_IMPORTMAP_AND_BOOTSTRAP } from '../islands/importmap.ts'
|
|
6
7
|
|
|
7
8
|
/** Gather transitive component sources starting from a page source file.
|
|
@@ -920,6 +921,26 @@ export function reconcileIslandManifest(
|
|
|
920
921
|
|
|
921
922
|
writeFileSync(islandsJsonPath, JSON.stringify(enriched))
|
|
922
923
|
|
|
924
|
+
// Rewrite each marker's id from the plain component name to the
|
|
925
|
+
// content-addressed unique id (`<Name>_<hash(sourcePath)>`) — same id the
|
|
926
|
+
// chunk filename + the bootstrap use — so two same-name islands from different
|
|
927
|
+
// files get distinct markers → distinct chunks. Keyed by instance (the
|
|
928
|
+
// data-brust-props var carries it); the marker format is compiler-emitted and
|
|
929
|
+
// stable (see emit_jinja.rs).
|
|
930
|
+
const idByInstance = new Map<number, string>()
|
|
931
|
+
for (const e of enriched) {
|
|
932
|
+
const ref = pageImports.get(e.component)
|
|
933
|
+
if (ref) idByInstance.set(e.instance, islandChunkBasename(e.component, ref.spec))
|
|
934
|
+
}
|
|
935
|
+
let jinja = readFileSync(jinjaPath, 'utf8')
|
|
936
|
+
jinja = jinja.replace(
|
|
937
|
+
/data-brust-island="[^"]*"(\s+data-brust-props="\{\{ island_(\d+)_props \}\}")/g,
|
|
938
|
+
(whole, rest: string, nStr: string) => {
|
|
939
|
+
const id = idByInstance.get(Number(nStr))
|
|
940
|
+
return id ? `data-brust-island="${id}"${rest}` : whole
|
|
941
|
+
},
|
|
942
|
+
)
|
|
943
|
+
|
|
923
944
|
const baked = `{% raw %}${ISLANDS_IMPORTMAP_AND_BOOTSTRAP}{% endraw %}`
|
|
924
|
-
writeFileSync(jinjaPath,
|
|
945
|
+
writeFileSync(jinjaPath, jinja + baked)
|
|
925
946
|
}
|
package/runtime/index.js
CHANGED
|
@@ -77,8 +77,8 @@ function requireNative() {
|
|
|
77
77
|
try {
|
|
78
78
|
const binding = require('brustjs-android-arm64')
|
|
79
79
|
const bindingPackageVersion = require('brustjs-android-arm64/package.json').version
|
|
80
|
-
if (bindingPackageVersion !== '0.1.
|
|
81
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
80
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
81
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
82
82
|
}
|
|
83
83
|
return binding
|
|
84
84
|
} catch (e) {
|
|
@@ -93,8 +93,8 @@ function requireNative() {
|
|
|
93
93
|
try {
|
|
94
94
|
const binding = require('brustjs-android-arm-eabi')
|
|
95
95
|
const bindingPackageVersion = require('brustjs-android-arm-eabi/package.json').version
|
|
96
|
-
if (bindingPackageVersion !== '0.1.
|
|
97
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
96
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
97
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
98
98
|
}
|
|
99
99
|
return binding
|
|
100
100
|
} catch (e) {
|
|
@@ -114,8 +114,8 @@ function requireNative() {
|
|
|
114
114
|
try {
|
|
115
115
|
const binding = require('brustjs-win32-x64-gnu')
|
|
116
116
|
const bindingPackageVersion = require('brustjs-win32-x64-gnu/package.json').version
|
|
117
|
-
if (bindingPackageVersion !== '0.1.
|
|
118
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
117
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
118
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
119
119
|
}
|
|
120
120
|
return binding
|
|
121
121
|
} catch (e) {
|
|
@@ -130,8 +130,8 @@ function requireNative() {
|
|
|
130
130
|
try {
|
|
131
131
|
const binding = require('brustjs-win32-x64-msvc')
|
|
132
132
|
const bindingPackageVersion = require('brustjs-win32-x64-msvc/package.json').version
|
|
133
|
-
if (bindingPackageVersion !== '0.1.
|
|
134
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
133
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
134
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
135
135
|
}
|
|
136
136
|
return binding
|
|
137
137
|
} catch (e) {
|
|
@@ -147,8 +147,8 @@ function requireNative() {
|
|
|
147
147
|
try {
|
|
148
148
|
const binding = require('brustjs-win32-ia32-msvc')
|
|
149
149
|
const bindingPackageVersion = require('brustjs-win32-ia32-msvc/package.json').version
|
|
150
|
-
if (bindingPackageVersion !== '0.1.
|
|
151
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
150
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
151
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
152
152
|
}
|
|
153
153
|
return binding
|
|
154
154
|
} catch (e) {
|
|
@@ -163,8 +163,8 @@ function requireNative() {
|
|
|
163
163
|
try {
|
|
164
164
|
const binding = require('brustjs-win32-arm64-msvc')
|
|
165
165
|
const bindingPackageVersion = require('brustjs-win32-arm64-msvc/package.json').version
|
|
166
|
-
if (bindingPackageVersion !== '0.1.
|
|
167
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
166
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
167
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
168
168
|
}
|
|
169
169
|
return binding
|
|
170
170
|
} catch (e) {
|
|
@@ -182,8 +182,8 @@ function requireNative() {
|
|
|
182
182
|
try {
|
|
183
183
|
const binding = require('brustjs-darwin-universal')
|
|
184
184
|
const bindingPackageVersion = require('brustjs-darwin-universal/package.json').version
|
|
185
|
-
if (bindingPackageVersion !== '0.1.
|
|
186
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
185
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
186
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
187
187
|
}
|
|
188
188
|
return binding
|
|
189
189
|
} catch (e) {
|
|
@@ -198,8 +198,8 @@ function requireNative() {
|
|
|
198
198
|
try {
|
|
199
199
|
const binding = require('brustjs-darwin-x64')
|
|
200
200
|
const bindingPackageVersion = require('brustjs-darwin-x64/package.json').version
|
|
201
|
-
if (bindingPackageVersion !== '0.1.
|
|
202
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
201
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
202
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
203
203
|
}
|
|
204
204
|
return binding
|
|
205
205
|
} catch (e) {
|
|
@@ -214,8 +214,8 @@ function requireNative() {
|
|
|
214
214
|
try {
|
|
215
215
|
const binding = require('brustjs-darwin-arm64')
|
|
216
216
|
const bindingPackageVersion = require('brustjs-darwin-arm64/package.json').version
|
|
217
|
-
if (bindingPackageVersion !== '0.1.
|
|
218
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
217
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
218
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
219
219
|
}
|
|
220
220
|
return binding
|
|
221
221
|
} catch (e) {
|
|
@@ -234,8 +234,8 @@ function requireNative() {
|
|
|
234
234
|
try {
|
|
235
235
|
const binding = require('brustjs-freebsd-x64')
|
|
236
236
|
const bindingPackageVersion = require('brustjs-freebsd-x64/package.json').version
|
|
237
|
-
if (bindingPackageVersion !== '0.1.
|
|
238
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
237
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
238
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
239
239
|
}
|
|
240
240
|
return binding
|
|
241
241
|
} catch (e) {
|
|
@@ -250,8 +250,8 @@ function requireNative() {
|
|
|
250
250
|
try {
|
|
251
251
|
const binding = require('brustjs-freebsd-arm64')
|
|
252
252
|
const bindingPackageVersion = require('brustjs-freebsd-arm64/package.json').version
|
|
253
|
-
if (bindingPackageVersion !== '0.1.
|
|
254
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
253
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
254
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
255
255
|
}
|
|
256
256
|
return binding
|
|
257
257
|
} catch (e) {
|
|
@@ -271,8 +271,8 @@ function requireNative() {
|
|
|
271
271
|
try {
|
|
272
272
|
const binding = require('brustjs-linux-x64-musl')
|
|
273
273
|
const bindingPackageVersion = require('brustjs-linux-x64-musl/package.json').version
|
|
274
|
-
if (bindingPackageVersion !== '0.1.
|
|
275
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
274
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
275
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
276
276
|
}
|
|
277
277
|
return binding
|
|
278
278
|
} catch (e) {
|
|
@@ -287,8 +287,8 @@ function requireNative() {
|
|
|
287
287
|
try {
|
|
288
288
|
const binding = require('brustjs-linux-x64-gnu')
|
|
289
289
|
const bindingPackageVersion = require('brustjs-linux-x64-gnu/package.json').version
|
|
290
|
-
if (bindingPackageVersion !== '0.1.
|
|
291
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
290
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
291
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
292
292
|
}
|
|
293
293
|
return binding
|
|
294
294
|
} catch (e) {
|
|
@@ -305,8 +305,8 @@ function requireNative() {
|
|
|
305
305
|
try {
|
|
306
306
|
const binding = require('brustjs-linux-arm64-musl')
|
|
307
307
|
const bindingPackageVersion = require('brustjs-linux-arm64-musl/package.json').version
|
|
308
|
-
if (bindingPackageVersion !== '0.1.
|
|
309
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
308
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
309
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
310
310
|
}
|
|
311
311
|
return binding
|
|
312
312
|
} catch (e) {
|
|
@@ -321,8 +321,8 @@ function requireNative() {
|
|
|
321
321
|
try {
|
|
322
322
|
const binding = require('brustjs-linux-arm64-gnu')
|
|
323
323
|
const bindingPackageVersion = require('brustjs-linux-arm64-gnu/package.json').version
|
|
324
|
-
if (bindingPackageVersion !== '0.1.
|
|
325
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
324
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
325
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
326
326
|
}
|
|
327
327
|
return binding
|
|
328
328
|
} catch (e) {
|
|
@@ -339,8 +339,8 @@ function requireNative() {
|
|
|
339
339
|
try {
|
|
340
340
|
const binding = require('brustjs-linux-arm-musleabihf')
|
|
341
341
|
const bindingPackageVersion = require('brustjs-linux-arm-musleabihf/package.json').version
|
|
342
|
-
if (bindingPackageVersion !== '0.1.
|
|
343
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
342
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
343
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
344
344
|
}
|
|
345
345
|
return binding
|
|
346
346
|
} catch (e) {
|
|
@@ -355,8 +355,8 @@ function requireNative() {
|
|
|
355
355
|
try {
|
|
356
356
|
const binding = require('brustjs-linux-arm-gnueabihf')
|
|
357
357
|
const bindingPackageVersion = require('brustjs-linux-arm-gnueabihf/package.json').version
|
|
358
|
-
if (bindingPackageVersion !== '0.1.
|
|
359
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
358
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
359
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
360
360
|
}
|
|
361
361
|
return binding
|
|
362
362
|
} catch (e) {
|
|
@@ -373,8 +373,8 @@ function requireNative() {
|
|
|
373
373
|
try {
|
|
374
374
|
const binding = require('brustjs-linux-loong64-musl')
|
|
375
375
|
const bindingPackageVersion = require('brustjs-linux-loong64-musl/package.json').version
|
|
376
|
-
if (bindingPackageVersion !== '0.1.
|
|
377
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
376
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
377
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
378
378
|
}
|
|
379
379
|
return binding
|
|
380
380
|
} catch (e) {
|
|
@@ -389,8 +389,8 @@ function requireNative() {
|
|
|
389
389
|
try {
|
|
390
390
|
const binding = require('brustjs-linux-loong64-gnu')
|
|
391
391
|
const bindingPackageVersion = require('brustjs-linux-loong64-gnu/package.json').version
|
|
392
|
-
if (bindingPackageVersion !== '0.1.
|
|
393
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
392
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
393
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
394
394
|
}
|
|
395
395
|
return binding
|
|
396
396
|
} catch (e) {
|
|
@@ -407,8 +407,8 @@ function requireNative() {
|
|
|
407
407
|
try {
|
|
408
408
|
const binding = require('brustjs-linux-riscv64-musl')
|
|
409
409
|
const bindingPackageVersion = require('brustjs-linux-riscv64-musl/package.json').version
|
|
410
|
-
if (bindingPackageVersion !== '0.1.
|
|
411
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
410
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
411
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
412
412
|
}
|
|
413
413
|
return binding
|
|
414
414
|
} catch (e) {
|
|
@@ -423,8 +423,8 @@ function requireNative() {
|
|
|
423
423
|
try {
|
|
424
424
|
const binding = require('brustjs-linux-riscv64-gnu')
|
|
425
425
|
const bindingPackageVersion = require('brustjs-linux-riscv64-gnu/package.json').version
|
|
426
|
-
if (bindingPackageVersion !== '0.1.
|
|
427
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
426
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
427
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
428
428
|
}
|
|
429
429
|
return binding
|
|
430
430
|
} catch (e) {
|
|
@@ -440,8 +440,8 @@ function requireNative() {
|
|
|
440
440
|
try {
|
|
441
441
|
const binding = require('brustjs-linux-ppc64-gnu')
|
|
442
442
|
const bindingPackageVersion = require('brustjs-linux-ppc64-gnu/package.json').version
|
|
443
|
-
if (bindingPackageVersion !== '0.1.
|
|
444
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
443
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
444
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
445
445
|
}
|
|
446
446
|
return binding
|
|
447
447
|
} catch (e) {
|
|
@@ -456,8 +456,8 @@ function requireNative() {
|
|
|
456
456
|
try {
|
|
457
457
|
const binding = require('brustjs-linux-s390x-gnu')
|
|
458
458
|
const bindingPackageVersion = require('brustjs-linux-s390x-gnu/package.json').version
|
|
459
|
-
if (bindingPackageVersion !== '0.1.
|
|
460
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
459
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
460
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
461
461
|
}
|
|
462
462
|
return binding
|
|
463
463
|
} catch (e) {
|
|
@@ -476,8 +476,8 @@ function requireNative() {
|
|
|
476
476
|
try {
|
|
477
477
|
const binding = require('brustjs-openharmony-arm64')
|
|
478
478
|
const bindingPackageVersion = require('brustjs-openharmony-arm64/package.json').version
|
|
479
|
-
if (bindingPackageVersion !== '0.1.
|
|
480
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
479
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
480
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
481
481
|
}
|
|
482
482
|
return binding
|
|
483
483
|
} catch (e) {
|
|
@@ -492,8 +492,8 @@ function requireNative() {
|
|
|
492
492
|
try {
|
|
493
493
|
const binding = require('brustjs-openharmony-x64')
|
|
494
494
|
const bindingPackageVersion = require('brustjs-openharmony-x64/package.json').version
|
|
495
|
-
if (bindingPackageVersion !== '0.1.
|
|
496
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
495
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
496
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
497
497
|
}
|
|
498
498
|
return binding
|
|
499
499
|
} catch (e) {
|
|
@@ -508,8 +508,8 @@ function requireNative() {
|
|
|
508
508
|
try {
|
|
509
509
|
const binding = require('brustjs-openharmony-arm')
|
|
510
510
|
const bindingPackageVersion = require('brustjs-openharmony-arm/package.json').version
|
|
511
|
-
if (bindingPackageVersion !== '0.1.
|
|
512
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
511
|
+
if (bindingPackageVersion !== '0.1.39-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
512
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.39-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
513
513
|
}
|
|
514
514
|
return binding
|
|
515
515
|
} catch (e) {
|
package/runtime/index.ts
CHANGED
|
@@ -785,6 +785,36 @@ export const brust = {
|
|
|
785
785
|
}
|
|
786
786
|
}
|
|
787
787
|
|
|
788
|
+
// Worker: seed island.tsx's Component→id registry so a React `<Island>`
|
|
789
|
+
// marker carries the content-addressed id (`<Name>_<hash>`) — same-name
|
|
790
|
+
// parity for the React render path, mirroring the native jinja rewrite.
|
|
791
|
+
// Keyed by component IDENTITY (the imported default export), so two
|
|
792
|
+
// same-named components from different files get distinct markers/chunks.
|
|
793
|
+
{
|
|
794
|
+
const { configureIslandIdRegistry } = await import('./islands/island.tsx')
|
|
795
|
+
const islandsDir = prebuilt
|
|
796
|
+
? path.join(distDir!, 'islands')
|
|
797
|
+
: path.join(process.cwd(), '.brust', 'islands')
|
|
798
|
+
const srcManifest = path.join(islandsDir, '_island-sources.json')
|
|
799
|
+
if (existsSync(srcManifest)) {
|
|
800
|
+
try {
|
|
801
|
+
const sources = JSON.parse(await Bun.file(srcManifest).text()) as Record<string, string>
|
|
802
|
+
const entries: Array<[unknown, string]> = []
|
|
803
|
+
for (const [id, rel] of Object.entries(sources)) {
|
|
804
|
+
try {
|
|
805
|
+
const mod = await import(path.resolve(process.cwd(), rel))
|
|
806
|
+
if (mod.default) entries.push([mod.default, id])
|
|
807
|
+
} catch {
|
|
808
|
+
// Unreadable source — skip; the marker falls back to Component.name.
|
|
809
|
+
}
|
|
810
|
+
}
|
|
811
|
+
configureIslandIdRegistry(entries)
|
|
812
|
+
} catch {
|
|
813
|
+
// Malformed manifest — skip (markers fall back to Component.name).
|
|
814
|
+
}
|
|
815
|
+
}
|
|
816
|
+
}
|
|
817
|
+
|
|
788
818
|
// Render slots for this worker (set in serve() via the worker env). The
|
|
789
819
|
// SAB scales with the slot count so each slot's disjoint sub-region keeps
|
|
790
820
|
// the single-slot capacity; at K=1 this is byte-identical to before.
|
package/runtime/islands/build.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { createHash } from 'node:crypto'
|
|
2
1
|
import { readFileSync } from 'node:fs'
|
|
3
2
|
import { mkdir, rm, writeFile } from 'node:fs/promises'
|
|
4
3
|
import { isAbsolute, relative, resolve } from 'node:path'
|
|
5
4
|
import type { BunPlugin } from 'bun'
|
|
6
5
|
import { scanImports } from '../cli/native-routes-emit.ts'
|
|
6
|
+
import { islandChunkBasename } from './chunk-id.ts'
|
|
7
7
|
|
|
8
8
|
export interface IslandsBuildResult {
|
|
9
9
|
/** Absolute path to the output directory passed to brust's Rust side. */
|
|
@@ -35,19 +35,13 @@ export interface BuildIslandsOptions {
|
|
|
35
35
|
* `component={Ident}`. A tag with no `component` is a hard error (F3:
|
|
36
36
|
* never silently skip an island).
|
|
37
37
|
* 3. Resolve each captured ident through that page's OWN imports.
|
|
38
|
-
* 4.
|
|
39
|
-
*
|
|
38
|
+
* 4. Key by the content-addressed {@link islandChunkBasename} (`<Name>_<hash>`),
|
|
39
|
+
* NOT the bare name — so two DIFFERENT files exporting a same-named component
|
|
40
|
+
* produce two distinct chunks. Same name + same file dedups (same id). The
|
|
41
|
+
* marker carries this same id (native: reconcileIslandManifest rewrite;
|
|
42
|
+
* React: the Component→id registry seeded at worker boot), so there is no
|
|
43
|
+
* app-unique-name requirement.
|
|
40
44
|
*/
|
|
41
|
-
/** Content-addressed island chunk basename = `<Name>_<8hex(sha256 cwd-relative
|
|
42
|
-
* source path)>`. Stable + app-unique (mirrors the directive chunk scheme) so
|
|
43
|
-
* the URL is content-busting-stable; the bootstrap resolves the plain marker id
|
|
44
|
-
* to this via the `_islands.js` map. */
|
|
45
|
-
export function islandChunkBasename(name: string, absSourcePath: string): string {
|
|
46
|
-
const rel = relative(process.cwd(), absSourcePath).replaceAll('\\', '/')
|
|
47
|
-
const hash = createHash('sha256').update(rel).digest('hex').slice(0, 8)
|
|
48
|
-
return `${name}_${hash}`
|
|
49
|
-
}
|
|
50
|
-
|
|
51
45
|
export function scanIslandChunks(routesEntryFile: string): Map<string, string> {
|
|
52
46
|
const chunks = new Map<string, string>()
|
|
53
47
|
const visited = new Set<string>()
|
|
@@ -91,16 +85,10 @@ export function scanIslandChunks(routesEntryFile: string): Map<string, string> {
|
|
|
91
85
|
`(expected \`import ${ident} from "..."\`)`,
|
|
92
86
|
)
|
|
93
87
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
throw new Error(
|
|
99
|
-
`island component name "${ident}" is used by two different files ` +
|
|
100
|
-
`(${existing} and ${src}); island component names must be app-unique`,
|
|
101
|
-
)
|
|
102
|
-
}
|
|
103
|
-
// existing === src → same component reused; dedupe (skip).
|
|
88
|
+
// Key by the content-addressed id: same name + same file → one chunk
|
|
89
|
+
// (dedup); same name + DIFFERENT file → two distinct ids → two chunks.
|
|
90
|
+
// Collisions are impossible (the id embeds a hash of the source path).
|
|
91
|
+
chunks.set(islandChunkBasename(ident, src), src)
|
|
104
92
|
}
|
|
105
93
|
}
|
|
106
94
|
|
|
@@ -135,10 +123,12 @@ export async function buildIslands(
|
|
|
135
123
|
// those imports to the scoped name map (otherwise Bun emits the CSS as an asset).
|
|
136
124
|
const externals = ['react', 'react/jsx-runtime', 'react-dom/client']
|
|
137
125
|
const plugins = options.plugins ?? []
|
|
138
|
-
//
|
|
139
|
-
//
|
|
140
|
-
//
|
|
126
|
+
// The map is keyed by the content-addressed id (scanIslandChunks), which IS the
|
|
127
|
+
// chunk basename — the data-brust-island marker carries that same id, so the
|
|
128
|
+
// bootstrap loads the right chunk directly.
|
|
141
129
|
const chunks: Record<string, string> = {}
|
|
130
|
+
const sources: Record<string, string> = {}
|
|
131
|
+
const urlsByName = new Map<string, string[]>()
|
|
142
132
|
let count = 0
|
|
143
133
|
for (const [id, entry] of islands) {
|
|
144
134
|
if (!isValidIslandId(id)) {
|
|
@@ -147,21 +137,41 @@ export async function buildIslands(
|
|
|
147
137
|
`allowed: [A-Za-z0-9_-]+ (matches the server's filename safety check)`,
|
|
148
138
|
)
|
|
149
139
|
}
|
|
150
|
-
const file = `${
|
|
140
|
+
const file = `${id}.js`
|
|
151
141
|
await buildOne([entry], outDir, file, externals, plugins)
|
|
152
|
-
|
|
142
|
+
const url = `/_brust/islands/${file}`
|
|
143
|
+
chunks[id] = url
|
|
144
|
+
// PROJECT-RELATIVE source path (no leaked abs build path); the worker
|
|
145
|
+
// rehydrates it against cwd to build the Component→id registry.
|
|
146
|
+
sources[id] = relative(process.cwd(), entry).replaceAll('\\', '/')
|
|
147
|
+
const name = id.replace(/_[a-f0-9]{8}$/, '')
|
|
148
|
+
const list = urlsByName.get(name)
|
|
149
|
+
if (list) list.push(url)
|
|
150
|
+
else urlsByName.set(name, [url])
|
|
153
151
|
count++
|
|
154
152
|
}
|
|
153
|
+
// Also expose each chunk by its plain Component name when that name is
|
|
154
|
+
// UNAMBIGUOUS (one source) — a defensive fallback for a marker that carries
|
|
155
|
+
// the bare name (e.g. the registry wasn't seeded). Ambiguous names are omitted:
|
|
156
|
+
// those markers carry the unique id (native rewrite / React registry).
|
|
157
|
+
for (const [name, urls] of urlsByName) {
|
|
158
|
+
if (urls.length === 1 && !(name in chunks)) chunks[name] = urls[0]!
|
|
159
|
+
}
|
|
155
160
|
|
|
156
161
|
// id → chunk URL map, served at /_brust/islands/_islands.js. The bootstrap
|
|
157
|
-
// loads it once and resolves a marker's
|
|
158
|
-
//
|
|
162
|
+
// loads it once and resolves a marker's id to its chunk (legacy
|
|
163
|
+
// `/_brust/islands/<id>.js` fallback). ESM default export.
|
|
159
164
|
await writeFile(
|
|
160
165
|
resolve(outDir, '_islands.js'),
|
|
161
166
|
`export default ${JSON.stringify(chunks)}\n`,
|
|
162
167
|
'utf-8',
|
|
163
168
|
)
|
|
164
169
|
|
|
170
|
+
// id → project-relative source path. The worker imports each at boot and maps
|
|
171
|
+
// the default export (component fn) → id, seeding island.tsx's registry so the
|
|
172
|
+
// React render path emits the content-addressed marker (same-name parity).
|
|
173
|
+
await writeFile(resolve(outDir, '_island-sources.json'), JSON.stringify(sources), 'utf-8')
|
|
174
|
+
|
|
165
175
|
// 4. Bootstrap (react + react-dom/client external; uses importmap).
|
|
166
176
|
const bootstrapSrc = resolve(import.meta.dir, 'bootstrap.ts')
|
|
167
177
|
await buildOne([bootstrapSrc], outDir, '_bootstrap.js', externals)
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto'
|
|
2
|
+
import { relative } from 'node:path'
|
|
3
|
+
|
|
4
|
+
/** Content-addressed island id / chunk basename = `<Name>_<8hex(sha256
|
|
5
|
+
* cwd-relative source path)>`. The SINGLE name contract (mirrors the directive
|
|
6
|
+
* chunk scheme): the chunk filename, the `data-brust-island` marker (native
|
|
7
|
+
* rewrite in reconcileIslandManifest + the React island-id onLoad plugin), and
|
|
8
|
+
* the bootstrap import all derive from this — so two same-named components from
|
|
9
|
+
* different files get distinct ids and never collide.
|
|
10
|
+
*
|
|
11
|
+
* Lives in its own module (no `scanImports` dep) so both `islands/build.ts` and
|
|
12
|
+
* `cli/native-routes-emit.ts` can import it without a circular dependency. */
|
|
13
|
+
export function islandChunkBasename(name: string, absSourcePath: string): string {
|
|
14
|
+
const rel = relative(process.cwd(), absSourcePath).replaceAll('\\', '/')
|
|
15
|
+
const hash = createHash('sha256').update(rel).digest('hex').slice(0, 8)
|
|
16
|
+
return `${name}_${hash}`
|
|
17
|
+
}
|
|
@@ -62,6 +62,19 @@ export function createIslandUsedBox(): IslandUsedBox {
|
|
|
62
62
|
return { used: false }
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
// Component function → content-addressed island id (`<Name>_<hash>`). Populated
|
|
66
|
+
// at worker boot (configureIslandIdRegistry) by importing each island source and
|
|
67
|
+
// mapping its default export. Keyed by FUNCTION IDENTITY, so two same-named
|
|
68
|
+
// components from different files map to distinct ids — giving the React render
|
|
69
|
+
// path the same same-name parity the native jinja rewrite gives native routes.
|
|
70
|
+
// Empty in unit tests / when no manifest → markers fall back to Component.name.
|
|
71
|
+
let islandIdRegistry: Map<unknown, string> = new Map()
|
|
72
|
+
|
|
73
|
+
/** Seed the Component→id registry (worker boot). */
|
|
74
|
+
export function configureIslandIdRegistry(entries: Iterable<[unknown, string]>): void {
|
|
75
|
+
islandIdRegistry = new Map(entries)
|
|
76
|
+
}
|
|
77
|
+
|
|
65
78
|
/** Carries the per-render {@link IslandUsedBox} down to every `<Island>`. The
|
|
66
79
|
* renderer wraps the tree in a Provider with a fresh box; an `<Island>` rendered
|
|
67
80
|
* with no Provider (e.g. a standalone `renderToString` outside the React render
|
|
@@ -83,7 +96,11 @@ export function Island<P extends object>({
|
|
|
83
96
|
// rendered without a Provider (standalone renderToString).
|
|
84
97
|
const usedBox = useContext(IslandUsedContext)
|
|
85
98
|
if (usedBox) usedBox.used = true
|
|
86
|
-
|
|
99
|
+
// Marker id: the content-addressed island id (`<Name>_<hash>`) from the
|
|
100
|
+
// registry (keyed by component identity → same-name parity), falling back to
|
|
101
|
+
// the plain Component name when the registry isn't seeded (unit test, or a
|
|
102
|
+
// component not in the manifest — the _islands.js name→url map resolves it).
|
|
103
|
+
const resolvedId = islandIdRegistry.get(Component) ?? Component.name
|
|
87
104
|
if (!resolvedId) {
|
|
88
105
|
throw new Error(
|
|
89
106
|
'<Island> component has no `.name`; the island id is derived from ' +
|
package/runtime/native/index.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
// brustjs/native — directive runtime registration surface. React-free, dom-only.
|
|
2
|
-
// Authors do NOT import
|
|
2
|
+
// Authors do NOT import the runtime FUNCTIONS directly; the build-generated
|
|
3
|
+
// _directives.js entry does. The TYPES below ARE for authors — annotate a
|
|
4
|
+
// `behavior`'s ctx (e.g. `({ effect }: BehaviorCtx) => …`).
|
|
3
5
|
export { register, start } from './runtime.ts'
|
|
6
|
+
export type { Behavior, BehaviorCtx, Instance } from './runtime.ts'
|
|
@@ -4,7 +4,22 @@ import { batch, effect, isComputed, isSignal, signal } from '../store/index.ts'
|
|
|
4
4
|
import type { Signal } from '../store/index.ts'
|
|
5
5
|
|
|
6
6
|
export type Instance = Record<string, unknown>
|
|
7
|
-
|
|
7
|
+
|
|
8
|
+
/** What a `behavior` receives. Beyond `el`/`props`, two lifecycle helpers whose
|
|
9
|
+
* teardown auto-joins the component's disposer set (run on unmount / SPA-nav swap):
|
|
10
|
+
* - `effect(fn)` — a reactive effect (React `useEffect` semantics: `fn` may return
|
|
11
|
+
* a cleanup that runs before each re-run and on unmount). Use it
|
|
12
|
+
* for side-effects on signal change (sync localStorage, the DOM
|
|
13
|
+
* outside the component, timers). Returns the disposer too.
|
|
14
|
+
* - `onCleanup(fn)` — register a one-shot teardown for unmount (e.g. removeEventListener). */
|
|
15
|
+
export interface BehaviorCtx {
|
|
16
|
+
el: HTMLElement
|
|
17
|
+
props: unknown
|
|
18
|
+
// biome-ignore lint/suspicious/noConfusingVoidType: React useEffect return shape (`void | Destructor`) — see store `effect`.
|
|
19
|
+
effect: (fn: () => void | (() => void)) => () => void
|
|
20
|
+
onCleanup: (fn: () => void) => void
|
|
21
|
+
}
|
|
22
|
+
export type Behavior = (ctx: BehaviorCtx) => Instance
|
|
8
23
|
|
|
9
24
|
interface Mounted {
|
|
10
25
|
disposers: Array<() => void>
|
|
@@ -79,9 +94,25 @@ function mountElement(el: HTMLElement): void {
|
|
|
79
94
|
console.warn(`[brust] x-props on "${name}" is not valid JSON`)
|
|
80
95
|
}
|
|
81
96
|
}
|
|
82
|
-
|
|
97
|
+
// Build the disposer set and register the element as mounted BEFORE invoking the
|
|
98
|
+
// behavior, so (a) the ctx `effect`/`onCleanup` helpers can register teardown
|
|
99
|
+
// (a ctx effect runs immediately during behavior(), pushing its disposer here),
|
|
100
|
+
// and (b) a behavior that synchronously triggers a re-entrant mount of THIS
|
|
101
|
+
// element (e.g. a ctx effect whose signal write reaches scanAndMount) hits the
|
|
102
|
+
// `mounted.has(el)` guard above instead of creating a second, leaked Mounted.
|
|
83
103
|
const m: Mounted = { disposers: [] }
|
|
84
104
|
mounted.set(el, m)
|
|
105
|
+
// ctxEffect/onCleanup typed via BehaviorCtx so the `void | Destructor` shape is
|
|
106
|
+
// declared in one place (the interface) — no inline void-union to suppress here.
|
|
107
|
+
const ctxEffect: BehaviorCtx['effect'] = (fn) => {
|
|
108
|
+
const dispose = effect(fn)
|
|
109
|
+
m.disposers.push(dispose)
|
|
110
|
+
return dispose
|
|
111
|
+
}
|
|
112
|
+
const onCleanup: BehaviorCtx['onCleanup'] = (fn) => {
|
|
113
|
+
m.disposers.push(fn)
|
|
114
|
+
}
|
|
115
|
+
const instance = behavior({ el, props, effect: ctxEffect, onCleanup })
|
|
85
116
|
bindTree(el, instance, m.disposers)
|
|
86
117
|
if (typeof instance.init === 'function') {
|
|
87
118
|
try {
|
package/runtime/store/signal.ts
CHANGED
|
@@ -147,18 +147,41 @@ export function computed<T>(fn: () => T): Computed<T> {
|
|
|
147
147
|
return read
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
-
|
|
150
|
+
// `fn` may return a cleanup function (React `useEffect` semantics): it runs once
|
|
151
|
+
// before each re-run, and once when the effect is disposed. Cleanups run UNTRACKED
|
|
152
|
+
// (activeConsumer nulled) so a signal read inside a cleanup never registers a spurious
|
|
153
|
+
// dependency. A `void` return is unchanged — the existing no-cleanup path.
|
|
154
|
+
// biome-ignore lint/suspicious/noConfusingVoidType: `void | Destructor` is the React useEffect return shape — a callback with no `return` infers `void`, so swapping to `undefined` would type-error every cleanup-less caller.
|
|
155
|
+
export function effect(fn: () => void | (() => void)): () => void {
|
|
156
|
+
// biome-ignore lint/suspicious/noConfusingVoidType: holds `fn()`'s `void | (() => void)` result; `undefined` here would reject a `void` assignment.
|
|
157
|
+
let cleanup: void | (() => void)
|
|
158
|
+
// Run the pending cleanup with dependency tracking suspended.
|
|
159
|
+
const runCleanup = () => {
|
|
160
|
+
if (typeof cleanup !== 'function') return
|
|
161
|
+
const c = cleanup
|
|
162
|
+
cleanup = undefined
|
|
163
|
+
const prev = ctx.activeConsumer
|
|
164
|
+
ctx.activeConsumer = null
|
|
165
|
+
try {
|
|
166
|
+
c()
|
|
167
|
+
} catch (e) {
|
|
168
|
+
console.error('[brust] effect cleanup threw:', e)
|
|
169
|
+
} finally {
|
|
170
|
+
ctx.activeConsumer = prev
|
|
171
|
+
}
|
|
172
|
+
}
|
|
151
173
|
const self: Consumer = {
|
|
152
174
|
deps: new Set(),
|
|
153
175
|
running: false,
|
|
154
176
|
run() {
|
|
155
177
|
if (self.running) return
|
|
156
178
|
self.running = true
|
|
179
|
+
runCleanup() // previous run's cleanup fires before the new run
|
|
157
180
|
clearDeps(self)
|
|
158
181
|
const prev = ctx.activeConsumer
|
|
159
182
|
ctx.activeConsumer = self
|
|
160
183
|
try {
|
|
161
|
-
fn()
|
|
184
|
+
cleanup = fn()
|
|
162
185
|
} finally {
|
|
163
186
|
ctx.activeConsumer = prev
|
|
164
187
|
self.running = false
|
|
@@ -166,5 +189,19 @@ export function effect(fn: () => void): () => void {
|
|
|
166
189
|
},
|
|
167
190
|
}
|
|
168
191
|
self.run()
|
|
169
|
-
return () =>
|
|
192
|
+
return () => {
|
|
193
|
+
// Guard the dispose path with the same re-entrancy flag as run(): a cleanup
|
|
194
|
+
// that writes a signal this effect still depends on (clearDeps runs AFTER
|
|
195
|
+
// runCleanup) would otherwise synchronously re-notify and re-run the body of
|
|
196
|
+
// an already-disposed effect. The flag drops that re-entrant run; a second
|
|
197
|
+
// dispose() is then a no-op (cleanup already consumed, deps already cleared).
|
|
198
|
+
if (self.running) return
|
|
199
|
+
self.running = true
|
|
200
|
+
try {
|
|
201
|
+
runCleanup() // final cleanup on dispose
|
|
202
|
+
clearDeps(self)
|
|
203
|
+
} finally {
|
|
204
|
+
self.running = false
|
|
205
|
+
}
|
|
206
|
+
}
|
|
170
207
|
}
|