8000 batch invalidations by tombl · Pull Request #204 · tombl/dhtml · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions examples/kanban/src/util/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ interface RouterConfig<Context> {
routes: Record<string, PageHandler<string, Context>>
context: Context
}
interface RouterConfigP<Context, Routes extends { [Path in keyof Routes & string]: PageHandler<Path, Context> }>
extends RouterConfig<Context> {
interface RouterConfigP<
Context,
Routes extends { [Path in keyof Routes & string]: PageHandler<Path, Context> },
> extends RouterConfig<Context> {
routes: Routes
}

Expand Down
39 changes: 19 additions & 20 deletions examples/todomvc/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,27 @@ class TodoItem {
checked=${this.completed}
=> {
e.preventDefault()
this.completed = e.target.checked
transition(() => {
invalidate(this)
invalidate(this.app)
transition(async () => {
this.completed = e.target.checked
await invalidate(this, this.app)
})
}}
/>
<label
=> {
transition(() => {
transition(async () => {
this.editing = true
invalidate(this)
await invalidate(this)
})
}}
>${this.title}</label
>
<button
class="destroy"
=> {
transition(() => {
transition(async () => {
this.app.remove(this.id)
invalidate(this.app)
await invalidate(this.app)
})
}}
></button>
Expand All @@ -83,21 +82,21 @@ class TodoItem {
=> {
const value = e.target.value.trim()
if (value) {
transition(() => {
transition(async () => {
this.title = value
this.editing = false
invalidate(this)
await invalidate(this)
})
}
}}
=> {
if (e.key === 'Enter') {
const value = e.target.value.trim()
if (value) {
transition(() => {
transition(async () => {
this.title = value
this.editing = false
invalidate(this)
await invalidate(this)
})
}
}
Expand Down Expand Up @@ -136,10 +135,10 @@ class App {
if (event.key === 'Enter') {
const value = event.target.value.trim()
if (value) {
transition(() => {
transition(async () => {
this.todos.push(new TodoItem(this, value))
event.target.value = ''
invalidate(this)
await invalidate(this)
})
}
}
Expand All @@ -156,9 +155,9 @@ class App {
type="checkbox"
checked=${activeCount === 0}
=> {
transition(() => {
transition(async () => {
for (const todo of this.todos) todo.completed = e.target.checked
invalidate(this)
await invalidate(this)
})
}}
/>
Expand Down Expand Up @@ -187,9 +186,9 @@ class App {
href="#"
${classes(this.filter === filter && 'selected')}
=> {
transition(() => {
transition(async () => {
this.filter = filter
invalidate(this)
await invalidate(this)
})
}}
>${filter}</a
Expand All @@ -201,9 +200,9 @@ class App {
? html`<button
class="clear-completed"
=> {
transition(() => {
transition(async () => {
this.todos = this.todos.filter(todo => !todo.completed)
invalidate(this)
await invalidate(this)
})
}}
>
Expand Down
11 changes: 9 additions & 2 deletions scripts/test/browser-runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import { fileURLToPath } from 'node:url'
import * as puppeteer from 'puppeteer'
import type { Runtime } from './main.ts'

export async function create_browser_runtime(): Promise<Runtime> {
export interface BrowserRuntimeOptions {
collect_coverage?: boolean
}

export async function create_browser_runtime(options: BrowserRuntimeOptions = {}): Promise<Runtime> {
const collect_coverage = options.collect_coverage ?? true

const browser = await puppeteer.launch({
// headless: false,
// devtools: true,
Expand Down Expand Up @@ -88,7 +94,7 @@ export async function create_browser_runtime(): Promise<Runtime> {
const { port1, port2 } = new MessageChannel()
await page.exposeFunction('__postMessage', (data: any) => port1.postMessage(data))

await page.coverage.startJSCoverage({ includeRawScriptCoverage: true })
if (collect_coverage) await page.coverage.startJSCoverage({ includeRawScriptCoverage: true })
await page.goto(`http://${addr}/@runner`)

const page.waitForFunction(() => window.__onmessage)
Expand All @@ -97,6 +103,7 @@ export async function create_browser_runtime(): Promise<Runtime> {
return {
port: port2,
async coverage() {
if (!collect_coverage) return []
const coverage = await page.coverage.stopJSCoverage()
return coverage.map(c => c.rawScriptCoverage!)
},
Expand Down
11 changes: 7 additions & 4 deletions scripts/test/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ const results: TestResult[] = []
const coverage: Coverage[] = []

for (const [runtime, files] of Object.entries(all_files)) {
const rt = runtime === 'node' ? await create_node_runtime() : await create_browser_runtime()
const collect_coverage = !args.values.bench
const rt =
runtime === 'node'
? await create_node_runtime({ collect_coverage })
: await create_browser_runtime({ collect_coverage })
await using _ = rt // workaround for https://issues.chromium.org/issues/409478039

const client = createBirpc<ClientFunctions, ServerFunctions>(
Expand Down Expand Up @@ -78,10 +82,9 @@ for (const [runtime, files] of Object.entries(all_files)) {
await client.run_benchmarks({ filter })
} else {
await client.run_tests({ filter })
await client.stop_coverage()
coverage.push(...(await rt.coverage()))
}

await client.stop_coverage()
coverage.push(...(await rt.coverage()))
}

if (args.values.bench) {
Expand Down
14 changes: 10 additions & 4 deletions scripts/test/node-runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import type { Runtime } from './main.ts'

export async function create_node_runtime(): Promise<Runtime> {
const coverage_dir = await fs.mkdtemp(path.join(os.tmpdir(), 'coverage-'))
export interface NodeRuntimeOptions {
collect_coverage?: boolean
}

export async function create_node_runtime(options: NodeRuntimeOptions = {}): Promise<Runtime> {
const collect_coverage = options.collect_coverage ?? true
const coverage_dir = collect_coverage ? await fs.mkdtemp(path.join(os.tmpdir(), 'coverage-')) : null
const child = child_process.fork(fileURLToPath(import.meta.resolve('./runtime.ts')), {
env: { NODE_V8_COVERAGE: coverage_dir },
env: collect_coverage ? { ...process.env, NODE_V8_COVERAGE: coverage_dir! } : process.env,
stdio: 'inherit',
})

Expand All @@ -22,14 +27,15 @@ export async function create_node_runtime(): Promise<Runtime> {
return {
port: port2,
async coverage() {
if (!collect_coverage || !coverage_dir) return []
const [filename] = await fs.readdir(coverage_dir)
const { result } = JSON.parse(await fs.readFile(path.join(coverage_dir, filename), 'utf8'))
return result
},
async [Symbol.asyncDispose]() {
port1.close()
child.kill()
await fs.rm(coverage_dir, { recursive: true })
if (coverage_dir) await fs.rm(coverage_dir, { recursive: true })
},
}
}
18 changes: 15 additions & 3 deletions src/client/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export interface Controller {
}

export const controllers: WeakMap<Renderable, Controller> = new WeakMap()
const invalidated_controllers: Set<Controller> = new Set()
let invalidate_queued: null | Promise<void> = null

export function get_controller(renderable: Renderable): Controller {
let controller = controllers.get(renderable)
Expand All @@ -24,9 +26,19 @@ export function get_controller(renderable: Renderable): Controller {
return controller
}

export function invalidate(renderable: Renderable): void {
const controller = controllers.get(renderable)
controller?._invalidate.forEach(invalidate => invalidate())
export function invalidate(...renderables: Renderable[]): Promise<void> {
for (const renderable of renderables) invalidated_controllers.add(get_controller(renderable))

return (invalidate_queued ??= Promise.resolve()
.then(() => {
for (const controller of invalidated_controllers) {
invalidated_controllers.delete(controller)
controller._invalidate.forEach(invalidate => invalidate())
}
})
.finally(() => {
invalidate_queued = null
}))
}

export function onMount(renderable: Renderable, callback: () => Cleanup): void {
Expand Down
Loading
0