rebuildjs 0.26.1 → 0.27.0

package/browser/index.js

@@ -18,22 +18,21 @@ export const [
 	browser__metafile_,
 	browser__metafile__set
 ] = /** @type {be_lock_memosig_triple_T<rebuildjs_metafile_T>} */
-	be_lock_memosig_triple_(()=>
-		undefined,
-	async (ctx, browser__metafile$)=>{
-		browser__metafile__waitfor_promise?.cancel?.()
-		let metafile_path
-		if (!browser__metafile$.lock) {
-			metafile_path = browser__metafile_path_(ctx)
-			browser__metafile__waitfor_promise = waitfor(
-				()=>file_exists_(metafile_path),
-				200
-			).catch(()=>false)
-			if (await browser__metafile__waitfor_promise && metafile_path === browser__metafile_path_(ctx)) {
-				browser__metafile$._ = await readFile(metafile_path).then(buf=>JSON.parse(buf + ''))
+	be_lock_memosig_triple_(()=>undefined,
+		async (ctx, browser__metafile$)=>{
+			browser__metafile__waitfor_promise?.cancel?.()
+			let metafile_path
+			if (!browser__metafile$.lock) {
+				metafile_path = browser__metafile_path_(ctx)
+				browser__metafile__waitfor_promise = waitfor(
+					()=>file_exists_(metafile_path),
+					200
+				).catch(()=>false)
+				if (await browser__metafile__waitfor_promise && metafile_path === browser__metafile_path_(ctx)) {
+					browser__metafile$._ = await readFile(metafile_path).then(buf=>JSON.parse(buf + ''))
+				}
 			}
-		}
-	}, { ns: 'app', id: 'browser__metafile' })
+		}, { ns: 'app', id: 'browser__metafile' })
 export function browser__metafile__persist() {
 	return nullish__none_([
 		browser__metafile_path_(app_ctx),

package/build/index.d.ts

@@ -1,21 +1,24 @@
-import type { ctx__be_T, ctx__get_T, ctx__set_T, sig_T } from 'ctx-core/rmemo'
+import type { ctx__be_T, ctx__get_T, ctx__set_T, rmemo__wait_ret_T, sig_T } from 'ctx-core/rmemo'
 import type { BuildContext, BuildOptions, Plugin } from 'esbuild'
 import type { has_app_T } from '../ctx/index.js'
 export declare const build_id$_:ctx__be_T<has_app_T, sig_T<string|undefined>, 'app'>
 export declare const build_id_:ctx__get_T<has_app_T, string|undefined>
 export declare const build_id__set:ctx__set_T<has_app_T, string|undefined>
+export declare const persist__metafile__build_id$_:ctx__be_T<has_app_T, sig_T<string|undefined>, 'app'>
+export declare const persist__metafile__build_id_:ctx__get_T<has_app_T, string|undefined>
+export declare const persist__metafile__ready$_:ctx__be_T<has_app_T, sig_T<boolean>, 'app'>
+export declare const persist__metafile__ready_:ctx__get_T<has_app_T, boolean>
 export declare function build_id__refresh():string
 export declare const rebuildjs__build_id$_:ctx__be_T<has_app_T, sig_T<string>, 'app'>
 export declare const rebuildjs__build_id_:ctx__get_T<has_app_T, string>
 export declare const rebuildjs__build_id__set:ctx__set_T<has_app_T, string>
 export declare const rebuildjs__ready$_:ctx__be_T<has_app_T, sig_T<boolean>, 'app'>
 export declare const rebuildjs__ready_:ctx__get_T<has_app_T, boolean>
-export declare function rebuildjs__ready__wait(timeout?:number):Promise<void>
+export declare function rebuildjs__ready__wait(timeout?:number):rmemo__wait_ret_T<unknown>
 export declare function browser__build(config?:rebuildjs_build_config_T):Promise<BuildContext>
 export declare function server__build(config?:rebuildjs_build_config_T):Promise<BuildContext>
 export declare function server__external_(config?:Partial<BuildOptions>):Promise<string[]>
 export declare function rebuildjs_plugin_():Plugin
-export declare class RebuildjsInterrupt extends Error {}
 export type rebuildjs_build_config_T =
 	Partial<BuildOptions>&{ rebuildjs?:rebuildjs_plugin_config_T }
 export type rebuildjs_plugin_config_T = {

package/build/index.js

@@ -1,18 +1,19 @@
 /// <reference types="../metafile_l0/index.d.ts" />
 /// <reference types="./index.d.ts" />
 import { file_exists__waitfor } from 'ctx-core/fs'
-import { nullish__none_, run } from 'ctx-core/function'
+import { Cancel, cancel__period_, nullish__none_, run, waitfor } from 'ctx-core/function'
 import { be, be_memo_pair_, be_sig_triple_, memo_, off, rmemo__wait } from 'ctx-core/rmemo'
 import { short_uuid_ } from 'ctx-core/uuid'
 import { context } from 'esbuild'
 import { fdir } from 'fdir'
-import { link, mkdir, rm } from 'node:fs/promises'
+import { link, mkdir, readFile, rm } from 'node:fs/promises'
 import { join, relative, resolve } from 'path'
 import { app_path_, browser_path_, cwd_, is_prod_, server__relative_path_, server_path_ } from '../app/index.js'
 import {
 	browser__metafile_,
 	browser__metafile__persist,
 	browser__metafile__set,
+	browser__metafile_path_,
 	browser__output__relative_path_
 } from '../browser/index.js'
 import { app_ctx } from '../ctx/index.js'
@@ -21,6 +22,7 @@ import {
 	server__metafile_,
 	server__metafile__persist,
 	server__metafile__set,
+	server__metafile_path_,
 	server__output__relative_path_M_middleware_ctx_
 } from '../server/index.js'
 export const [
@@ -35,6 +37,69 @@ export function build_id__refresh() {
 	build_id__set(app_ctx, build_id)
 	return build_id
 }
+export const [
+	persist__metafile__build_id$_,
+	persist__metafile__build_id_,
+] = be_memo_pair_(()=>undefined,
+	(ctx, persist__metafile__build_id$)=>{
+		const build_id = build_id_(ctx)
+		const metafile__build_id = metafile__build_id_(ctx)
+		const server__metafile_path = server__metafile_path_(ctx)
+		const browser__metafile_path = browser__metafile_path_(ctx)
+		if (metafile__build_id) {
+			const cancel__period = cancel__period_(0, cancel_)
+			run(async ()=>{
+				try {
+					await cmd(
+						file_exists__waitfor(server__metafile_path, 1000, cancel__period))
+					await cmd(
+						waitfor(()=>
+							readFile(server__metafile_path).then(buf=>
+								JSON.parse('' + buf)?.build_id === build_id),
+						1000,
+						cancel__period))
+					await cmd(
+						file_exists__waitfor(browser__metafile_path, 1000, cancel__period))
+					await cmd(
+						waitfor(()=>
+							readFile(browser__metafile_path).then(buf=>
+								JSON.parse('' + buf)?.build_id === build_id),
+						1000,
+						cancel__period))
+					persist__metafile__build_id$._ = build_id
+				} catch (err) {
+					if (err instanceof Cancel) return
+					throw err
+				}
+			})
+		}
+		async function cmd(promise) {
+			if (cancel_()) throw new Cancel
+			const rv = await promise
+			if (cancel_()) {
+				promise.cancel?.()
+				throw new Cancel
+			}
+			return rv
+		}
+		function cancel_() {
+			return (
+				build_id_(ctx) !== build_id
+				|| metafile__build_id_(ctx) !== metafile__build_id
+				|| server__metafile_path_(ctx) !== server__metafile_path
+				|| browser__metafile_path_(ctx) !== browser__metafile_path
+			)
+		}
+	},
+	{ id: 'persist__metafile__build_id', ns: 'app' })
+export const [
+	persist__metafile__ready$_,
+	persist__metafile__ready_,
+] = be_memo_pair_(ctx=>
+	nullish__none_([build_id_(ctx), persist__metafile__build_id_(ctx)],
+		(build_id, persist__metafile__build_id)=>
+			!!(build_id && build_id === persist__metafile__build_id)),
+{ id: 'persist__metafile__ready', ns: 'app' })
 export const [
 	rebuildjs__build_id$_,
 	rebuildjs__build_id_,
@@ -217,6 +282,7 @@ export function rebuildjs_plugin_() {
 						r()
 						return assets__link$
 						function r() {
+							if (!persist__metafile__ready_(ctx)) return
 							nullish__none_([
 								build_id_(ctx),
 								metafile__build_id_(ctx),
@@ -242,23 +308,22 @@ export function rebuildjs_plugin_() {
 												const browser_asset_path = join(
 													browser_path,
 													relative(server__relative_path, output__relative_path))
-												await cmd(()=>
+												await cmd(
 													rm(browser_asset_path, { force: true }))
-												await cmd(()=>
+												await cmd(
 													file_exists__waitfor(server_asset_path))
-												await cmd(()=>
+												await cmd(
 													link(server_asset_path, browser_asset_path))
 											}
 										} catch (err) {
-											if (err instanceof RebuildjsInterrupt) return
+											if (err instanceof Cancel) return
 											throw err
 										}
 										rebuildjs__build_id__set(ctx, build_id)
 									})
 								}
-								async function cmd(fn) {
-									if (cancel_()) throw new RebuildjsInterrupt()
-									const promise = fn()
+								async function cmd(promise) {
+									if (cancel_()) throw new Cancel()
 									promise.rebuildjs_cancel$ = run(memo_(rebuildjs_cancel$=>{
 										if (cancel_()) {
 											promise.cancel?.()
@@ -267,7 +332,7 @@ export function rebuildjs_plugin_() {
 										return rebuildjs_cancel$
 									}))
 									const ret = await promise
-									if (cancel_()) throw new RebuildjsInterrupt()
+									if (cancel_()) throw new Cancel()
 									return ret
 								}
 								function cancel_() {
@@ -336,8 +401,3 @@ async function browser__metafile__update(browser__metafile, build_id) {
 	}
 	await browser__metafile__persist()
 }
-export class RebuildjsInterrupt extends Error {
-	constructor() {
-		super('RebuildjsInterrupt')
-	}
-}

package/build/index.test.ts

@@ -6,7 +6,7 @@ import { rm } from 'node:fs/promises'
 import { dirname, join } from 'path'
 import { test } from 'uvu'
 import { equal, throws } from 'uvu/assert'
-import { browser__metafile0, server__metafile0 } from '../_fixtures/metafiles.js'
+import { browser__metafile0, browser__metafile1, server__metafile0, server__metafile1 } from '../_fixtures/metafiles.js'
 import { cwd__set } from '../app/index.js'
 import { browser__metafile_, browser__metafile__set } from '../browser/index.js'
 import { app_ctx } from '../ctx/index.js'
@@ -63,7 +63,7 @@ test('rebuildjs__build_id', ()=>{
 	// @ts-expect-error TS2345
 	throws(()=>rebuildjs__build_id_(ctx_()))
 })
-test('rebuildjs__ready', ()=>{
+test('rebuildjs__ready', async ()=>{
 	equal(rebuildjs__ready$_(app_ctx)(), false)
 	equal(rebuildjs__ready_(app_ctx), false)
 	const build_id = server__metafile0.build_id!
@@ -86,22 +86,26 @@ test('rebuildjs__ready', ()=>{
 })
 test('rebuildjs__ready__wait', async ()=>{
 	let done = false
-	rebuildjs__ready__wait()
-		.then(()=>done = true)
-	equal(done, false)
-	const build_id = server__metafile0.build_id!
-	build_id__set(app_ctx, build_id)
-	await sleep(0)
-	equal(done, false)
-	server__metafile__set(app_ctx, server__metafile0)
-	await sleep(0)
-	equal(done, false)
-	browser__metafile__set(app_ctx, browser__metafile0)
-	await sleep(0)
-	equal(done, false)
-	rebuildjs__build_id__set(app_ctx, build_id)
-	await sleep(0)
-	equal(done, true)
+	const promise = rebuildjs__ready__wait()
+	promise.then(()=>done = true)
+	try {
+		equal(done, false)
+		const build_id = server__metafile1.build_id!
+		build_id__set(app_ctx, build_id)
+		await sleep(0)
+		equal(done, false)
+		server__metafile__set(app_ctx, server__metafile1)
+		await sleep(0)
+		equal(done, false)
+		browser__metafile__set(app_ctx, browser__metafile1)
+		await sleep(0)
+		equal(done, false)
+		rebuildjs__build_id__set(app_ctx, build_id)
+		await sleep(0)
+		equal(done, true)
+	} finally {
+		await promise.cancel()
+	}
 })
 test('rebuildjs__ready__wait|timeout', async ()=>{
 	let err:Error|undefined = undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.26.1",
+  "version": "0.27.0",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",
@@ -53,7 +53,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "ctx-core": "^5.8.0",
+    "ctx-core": "^5.9.0",
     "elysia": "^0.8.6",
     "esbuild": "^0.19.11",
     "fdir": "^6.1.1",