rebuildjs 0.55.2 → 0.56.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.55.2",
+  "version": "0.56.0",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",

package/server/build/index.d.ts

@@ -1,4 +1,4 @@
-import type { ctx__be_T, ctx__get_T, ctx__set_T, nullish, rmemo__wait_ret_T, sig_T } from 'ctx-core/rmemo'
+import type { ctx__be_T, ctx__get_T, ctx__set_T, nullish, rmemo__wait_ret_T, rmemo_T, sig_T } from 'ctx-core/rmemo'
 import type { BuildContext, BuildOptions, Plugin } from 'esbuild'
 import type { has_app_T } from '../ctx/index.js'
 import type { rebuildjs_metafile_T } from '../metafile_l0/index.js'
@@ -10,18 +10,21 @@ export declare const persist__metafile__build_id_:ctx__get_T<string|undefined, '
 export declare const persist__metafile__ready$_:ctx__be_T<sig_T<boolean>, 'app'>
 export declare const persist__metafile__ready_:ctx__get_T<boolean, 'app'>
 export declare function build_id__refresh():string
+export declare const rebuildjs__esbuild__build_id$_:ctx__be_T<sig_T<string>, 'app'>
+export declare const rebuildjs__esbuild__build_id_:ctx__get_T<string, 'app'>
+export declare const rebuildjs__esbuild__build_id__set:ctx__set_T<string, 'app'>
+export declare const rebuildjs__esbuild__done$_:ctx__be_T<sig_T<boolean>, 'app'>
+export declare const rebuildjs__esbuild__done_:ctx__get_T<boolean, 'app'>
+export declare function rebuildjs__esbuild__done__wait(timeout?:number):rmemo__wait_ret_T<unknown>
+export declare const rebuildjs__ready__add__ready$__a1$_:ctx__be_T<sig_T<rebuildjs__ready__add__ready$__T[]>, 'app'>
+export declare const rebuildjs__ready__add__ready$__a1_:ctx__get_T<rebuildjs__ready__add__ready$__T[], 'app'>
+export declare const rebuildjs__ready__add__ready$__a1__set:ctx__set_T<rebuildjs__ready__add__ready$__T[], 'app'>
 export declare const rebuildjs__build_id$_:ctx__be_T<sig_T<string>, 'app'>
 export declare const rebuildjs__build_id_:ctx__get_T<string, 'app'>
 export declare const rebuildjs__build_id__set:ctx__set_T<string, 'app'>
-export declare const rebuildjs_core__ready$_:ctx__be_T<sig_T<boolean>, 'app'>
-export declare const rebuildjs_core__ready_:ctx__get_T<boolean, 'app'>
-export declare function rebuildjs_core__ready__wait(timeout?:number):rmemo__wait_ret_T<unknown>
-export declare const rebuildjs__ready__add__ready__a1$_:ctx__be_T<sig_T<rebuildjs__ready__add__ready__T[]>, 'app'>
-export declare const rebuildjs__ready__add__ready__a1_:ctx__get_T<rebuildjs__ready__add__ready__T[], 'app'>
-export declare const rebuildjs__ready__add__ready__a1__set:ctx__set_T<rebuildjs__ready__add__ready__T[], 'app'>
 export declare const rebuildjs__ready$_:ctx__be_T<sig_T<boolean>, 'app'>
 export declare const rebuildjs__ready_:ctx__get_T<boolean, 'app'>
-export declare function rebuildjs__ready__add(ready_:rebuildjs__ready__add__ready__T):rebuildjs__ready__add__ready__T[]
+export declare function rebuildjs__ready__add(ready$_:rebuildjs__ready__add__ready$__T):rebuildjs__ready__add__ready$__T[]
 export declare function rebuildjs__ready__wait(timeout?:number):rmemo__wait_ret_T<unknown>
 export declare function rebuildjs_browser__build(config?:rebuildjs_build_config_T):Promise<BuildContext>
 export declare function rebuildjs_server__build(config?:rebuildjs_build_config_T):Promise<BuildContext>
@@ -41,4 +44,4 @@ export type rebuildjs_build_config_T =
 export type rebuildjs_plugin_config_T = {
 	watch?:boolean
 }
-export type rebuildjs__ready__add__ready__T = (ctx:has_app_T)=>boolean
+export type rebuildjs__ready__add__ready$__T = ctx__be_T<rmemo_T<boolean>, 'app'>

package/server/build/index.js

@@ -1,6 +1,6 @@
 /// <reference types="../metafile_l0/index.d.ts" />
-import { file_exists_, file_exists__waitfor } from 'ctx-core/fs'
 /// <reference types="./index.d.ts" />
+import { file_exists_, file_exists__waitfor } from 'ctx-core/fs'
 import {
 	be,
 	be_memo_pair_,
@@ -51,9 +51,9 @@ export const [
 	build_id$_,
 	build_id_,
 	build_id__set,
-] = be_sig_triple_(()=>
-	undefined,
-{ id: 'build_id', ns: 'app' })
+] = be_sig_triple_(
+	()=>undefined,
+	{ id: 'build_id', ns: 'app' })
 export function build_id__refresh() {
 	const build_id = Date.now() + '-' + short_uuid_()
 	build_id__set(app_ctx, build_id)
@@ -121,52 +121,59 @@ export const [
 			!!(build_id && build_id === persist__metafile__build_id)),
 { id: 'persist__metafile__ready', ns: 'app' })
 export const [
-	rebuildjs__build_id$_,
-	rebuildjs__build_id_,
-	rebuildjs__build_id__set,
+	rebuildjs__esbuild__build_id$_,
+	rebuildjs__esbuild__build_id_,
+	rebuildjs__esbuild__build_id__set,
 ] = be_sig_triple_(()=>undefined,
-	{ id: 'rebuildjs_plugin__build_id', ns: 'app' })
+	{ id: 'rebuildjs__esbuild__build_id', ns: 'app' })
 export const [
-	rebuildjs_core__ready$_,
-	rebuildjs_core__ready_,
+	rebuildjs__esbuild__done$_,
+	rebuildjs__esbuild__done_,
 ] = be_memo_pair_(ctx=>
 	!!(
 		build_id_(ctx)
 			&& build_id_(ctx) === metafile__build_id_(ctx)
-			&& build_id_(ctx) === rebuildjs__build_id_(ctx)),
-{ id: 'rebuildjs_core__ready', ns: 'app' })
+			&& build_id_(ctx) === rebuildjs__esbuild__build_id_(ctx)),
+{ id: 'rebuildjs__esbuild__done', ns: 'app' })
 /**
  * @param {number}[timeout]
  * @returns {Promise<void>}}
  */
-export function rebuildjs_core__ready__wait(timeout) {
+export function rebuildjs__esbuild__done__wait(timeout) {
 	return rmemo__wait(
-		rebuildjs_core__ready$_(app_ctx),
+		rebuildjs__esbuild__done$_(app_ctx),
 		ready=>ready,
 		timeout ?? 5000)
 }
 export const [
-	rebuildjs__ready__add__ready__a1$_,
-	rebuildjs__ready__add__ready__a1_,
-	rebuildjs__ready__add__ready__a1__set,
+	rebuildjs__ready__add__ready$__a1$_,
+	rebuildjs__ready__add__ready$__a1_,
+	rebuildjs__ready__add__ready$__a1__set,
 ] = be_sig_triple_(
 	()=>[],
-	{ id: 'Uc', ns: 'app' })
-export function rebuildjs__ready__add(ready_) {
-	let rebuildjs__ready__add_a1 = rebuildjs__ready__add__ready__a1_(app_ctx)
-	if (!rebuildjs__ready__add_a1.includes(ready_)) {
-		rebuildjs__ready__add_a1 = [...rebuildjs__ready__add_a1, ready_]
-		rebuildjs__ready__add__ready__a1__set(app_ctx, rebuildjs__ready__add_a1)
+	{ id: 'rebuildjs__ready__add__ready__a1', ns: 'app' })
+export function rebuildjs__ready__add(ready$_) {
+	let rebuildjs__ready__add_a1 = rebuildjs__ready__add__ready$__a1_(app_ctx)
+	if (!rebuildjs__ready__add_a1.includes(ready$_)) {
+		rebuildjs__ready__add_a1 = [...rebuildjs__ready__add_a1, ready$_]
+		rebuildjs__ready__add__ready$__a1__set(app_ctx, rebuildjs__ready__add_a1)
 	}
 	return rebuildjs__ready__add_a1
 }
+export const [
+	rebuildjs__build_id$_,
+	rebuildjs__build_id_,
+	rebuildjs__build_id__set,
+] = be_sig_triple_(()=>undefined,
+	{ id: 'rebuildjs__build_id', ns: 'app' })
 export const [
 	rebuildjs__ready$_,
 	rebuildjs__ready_,
 ] = be_memo_pair_(ctx=>
 	!!(
-		rebuildjs_core__ready_(ctx)
-	&& rebuildjs__ready__add__ready__a1_(ctx).every(ready_=>ready_(ctx))),
+		rebuildjs__esbuild__done_(ctx)
+			&& rebuildjs__build_id_(ctx) === build_id_(ctx)
+			&& rebuildjs__ready__add__ready$__a1_(ctx).every(ready$_=>ready$_(ctx)())),
 { id: 'rebuildjs__ready', ns: 'app' })
 /**
  * @param {number}[timeout]
@@ -361,6 +368,7 @@ export function rebuildjs_plugin_() {
 						}
 					}
 				}
+				rebuildjs__esbuild__build_id__set(app_ctx, build_id_(app_ctx))
 			})
 		}
 		// Prevent GC
@@ -400,12 +408,18 @@ export function rebuildjs_plugin_() {
 									run(async ()=>{
 										try {
 											await esbuild_cssBundle__cp()
+											await Promise.all(
+												rebuildjs__ready__add__ready$__a1_(ctx).map(ready$_=>
+													cmd(rmemo__wait(
+														ready$_(ctx),
+														ready=>ready,
+														5_000))))
 											await rebuildjs__assets__link()
+											rebuildjs__build_id__set(ctx, build_id)
 										} catch (err) {
 											if (err instanceof Cancel) return
 											throw err
 										}
-										rebuildjs__build_id__set(ctx, build_id)
 									})
 								}
 								async function esbuild_cssBundle__cp() {
@@ -418,7 +432,9 @@ export function rebuildjs_plugin_() {
 													({ cssBundle, esbuild_cssBundle } = metafile.outputs[output__relative_path])
 													if (cssBundle && esbuild_cssBundle) {
 														const cssBundle_path = join(cwd_(ctx), cssBundle)
+														const cssBundle_map_path = cssBundle_path + '.map'
 														const esbuild_cssBundle_path = join(cwd_(ctx), esbuild_cssBundle)
+														const esbuild_cssBundle_map_path = esbuild_cssBundle_path + '.map'
 														if (!await file_exists_(esbuild_cssBundle_path)) {
 															await file_exists__waitfor(async ()=>{
 																await cmd(
@@ -426,12 +442,12 @@ export function rebuildjs_plugin_() {
 																return true
 															})
 														}
-														if (!await file_exists_(esbuild_cssBundle_path + '.map')) {
+														if (!await file_exists_(esbuild_cssBundle_map_path)) {
 															await file_exists__waitfor(async ()=>{
 																await cmd(
 																	cp(
-																		cssBundle_path + '.map',
-																		esbuild_cssBundle_path + '.map'))
+																		cssBundle_map_path,
+																		esbuild_cssBundle_map_path))
 																return true
 															})
 														}
@@ -447,9 +463,9 @@ export function rebuildjs_plugin_() {
 										const _basename = basename(output__relative_path)
 										if (
 											_basename.endsWith('.js')
-											|| _basename.endsWith('.mjs')
-											|| _basename.endsWith('.js.map')
-											|| _basename.endsWith('.mjs.map')
+												|| _basename.endsWith('.mjs')
+												|| _basename.endsWith('.js.map')
+												|| _basename.endsWith('.mjs.map')
 										) continue
 										const server_asset_path = join(cwd, output__relative_path)
 										const browser_asset_path = join(

package/server/build/index.test.ts

@@ -1,8 +1,8 @@
-import { ctx_ } from 'ctx-core/be'
+import { be_, ctx_ } from 'ctx-core/be'
 import { file_exists_ } from 'ctx-core/fs'
 import { sleep } from 'ctx-core/function'
-import { ns_be_sig_triple_ } from 'ctx-core/rmemo'
-import { BuildContext } from 'esbuild'
+import { memo_, type memo_T, ns_be_sig_triple_ } from 'ctx-core/rmemo'
+import { type BuildContext } from 'esbuild'
 import { readFile, rm } from 'node:fs/promises'
 import { basename, dirname, join } from 'node:path'
 import { test } from 'uvu'
@@ -14,7 +14,7 @@ import {
 	server__metafile1
 } from '../../_fixtures/metafiles.js'
 import { cwd_, cwd__set } from '../app/index.js'
-import { app_ctx, has_app_T } from '../ctx/index.js'
+import { app_ctx } from '../ctx/index.js'
 import { browser__metafile_, browser__metafile__set } from '../rebuildjs_browser/index.js'
 import { server__metafile_, server__metafile__set } from '../rebuildjs_server/index.js'
 import {
@@ -22,20 +22,20 @@ import {
 	build_id_,
 	build_id__refresh,
 	build_id__set,
-	rebuildjs__build_id$_,
-	rebuildjs__build_id_,
 	rebuildjs__build_id__set,
+	rebuildjs__esbuild__build_id$_,
+	rebuildjs__esbuild__build_id_,
+	rebuildjs__esbuild__build_id__set,
+	rebuildjs__esbuild__done$_,
+	rebuildjs__esbuild__done_,
 	rebuildjs__ready$_,
 	rebuildjs__ready_,
 	rebuildjs__ready__add,
-	rebuildjs__ready__add__ready__a1$_,
-	rebuildjs__ready__add__ready__a1_,
-	rebuildjs__ready__add__ready__a1__set,
+	rebuildjs__ready__add__ready$__a1$_,
+	rebuildjs__ready__add__ready$__a1_,
+	rebuildjs__ready__add__ready$__a1__set,
 	rebuildjs__ready__wait,
 	rebuildjs_browser__build,
-	rebuildjs_core__ready$_,
-	rebuildjs_core__ready_,
-	rebuildjs_core__ready__wait,
 	rebuildjs_server__build
 } from './index.js'
 test.after.each(()=>{
@@ -64,64 +64,69 @@ test('build_id__refresh', ()=>{
 		true)
 })
 test('rebuildjs__build_id', ()=>{
-	equal(rebuildjs__build_id$_(app_ctx)(), undefined)
-	equal(rebuildjs__build_id_(app_ctx), undefined)
+	equal(rebuildjs__esbuild__build_id$_(app_ctx)(), undefined)
+	equal(rebuildjs__esbuild__build_id_(app_ctx), undefined)
 	build_id__refresh()
 	equal(typeof build_id_(app_ctx), 'string')
-	rebuildjs__build_id__set(app_ctx, build_id_(app_ctx)!)
-	equal(rebuildjs__build_id$_(app_ctx)(), build_id_(app_ctx)!)
-	equal(rebuildjs__build_id_(app_ctx), build_id_(app_ctx)!)
+	rebuildjs__esbuild__build_id__set(app_ctx, build_id_(app_ctx)!)
+	equal(rebuildjs__esbuild__build_id$_(app_ctx)(), build_id_(app_ctx)!)
+	equal(rebuildjs__esbuild__build_id_(app_ctx), build_id_(app_ctx)!)
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs__build_id$_(ctx_()))
+	throws(()=>rebuildjs__esbuild__build_id$_(ctx_()))
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs__build_id_(ctx_()))
+	throws(()=>rebuildjs__esbuild__build_id_(ctx_()))
 })
 test('rebuildjs_core__ready', async ()=>{
-	equal(rebuildjs_core__ready$_(app_ctx)(), false)
-	equal(rebuildjs_core__ready_(app_ctx), false)
+	equal(rebuildjs__esbuild__done$_(app_ctx)(), false)
+	equal(rebuildjs__esbuild__done_(app_ctx), false)
 	const build_id = server__metafile0.build_id!
 	build_id__set(app_ctx, build_id)
-	equal(rebuildjs_core__ready$_(app_ctx)(), false)
-	equal(rebuildjs_core__ready_(app_ctx), false)
+	equal(rebuildjs__esbuild__done$_(app_ctx)(), false)
+	equal(rebuildjs__esbuild__done_(app_ctx), false)
 	server__metafile__set(app_ctx, server__metafile0)
-	equal(rebuildjs_core__ready$_(app_ctx)(), false)
-	equal(rebuildjs_core__ready_(app_ctx), false)
+	equal(rebuildjs__esbuild__done$_(app_ctx)(), false)
+	equal(rebuildjs__esbuild__done_(app_ctx), false)
 	browser__metafile__set(app_ctx, browser__metafile0)
-	equal(rebuildjs_core__ready$_(app_ctx)(), false)
-	equal(rebuildjs_core__ready_(app_ctx), false)
-	rebuildjs__build_id__set(app_ctx, build_id)
-	equal(rebuildjs_core__ready$_(app_ctx)(), true)
-	equal(rebuildjs_core__ready_(app_ctx), true)
+	equal(rebuildjs__esbuild__done$_(app_ctx)(), false)
+	equal(rebuildjs__esbuild__done_(app_ctx), false)
+	rebuildjs__esbuild__build_id__set(app_ctx, build_id)
+	equal(rebuildjs__esbuild__done$_(app_ctx)(), true)
+	equal(rebuildjs__esbuild__done_(app_ctx), true)
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs_core__ready$_(ctx_()))
+	throws(()=>rebuildjs__esbuild__done$_(ctx_()))
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs_core__ready_(ctx_()))
+	throws(()=>rebuildjs__esbuild__done_(ctx_()))
 })
 test('rebuildjs__ready__add__ready__a1,rebuildjs__ready__add', async ()=>{
-	equal(rebuildjs__ready__add__ready__a1$_(app_ctx)(), [])
-	equal(rebuildjs__ready__add__ready__a1_(app_ctx), [])
-	const ready1_ = (ctx:has_app_T)=>!!ctx
-	rebuildjs__ready__add__ready__a1__set(app_ctx, [ready1_])
-	equal(rebuildjs__ready__add__ready__a1$_(app_ctx)(), [ready1_])
-	equal(rebuildjs__ready__add__ready__a1_(app_ctx), [ready1_])
-	const ready2_ = (ctx:has_app_T)=>!!ctx
-	rebuildjs__ready__add(ready2_)
-	equal(rebuildjs__ready__add__ready__a1$_(app_ctx)(), [ready1_, ready2_])
-	equal(rebuildjs__ready__add__ready__a1_(app_ctx), [ready1_, ready2_])
+	equal(rebuildjs__ready__add__ready$__a1$_(app_ctx)(), [])
+	equal(rebuildjs__ready__add__ready$__a1_(app_ctx), [])
+	const ready1$_ = be_<memo_T<boolean>, 'app'>(
+		()=>memo_(()=>true),
+		{ ns: 'app' })
+	rebuildjs__ready__add__ready$__a1__set(app_ctx, [ready1$_])
+	equal(rebuildjs__ready__add__ready$__a1$_(app_ctx)(), [ready1$_])
+	equal(rebuildjs__ready__add__ready$__a1_(app_ctx), [ready1$_])
+
+	const ready2$_ = be_<memo_T<boolean>, 'app'>(
+		()=>memo_(()=>true),
+		{ ns: 'app' })
+	rebuildjs__ready__add(ready2$_)
+	equal(rebuildjs__ready__add__ready$__a1$_(app_ctx)(), [ready1$_, ready2$_])
+	equal(rebuildjs__ready__add__ready$__a1_(app_ctx), [ready1$_, ready2$_])
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs__ready__add__ready__a1$_(ctx_()))
+	throws(()=>rebuildjs__ready__add__ready$__a1$_(ctx_()))
 	// @ts-expect-error TS2345
-	throws(()=>rebuildjs__ready__add__ready__a1_(ctx_()))
+	throws(()=>rebuildjs__ready__add__ready$__a1_(ctx_()))
 })
 test('rebuildjs__ready', async ()=>{
 	const [
+		plugin__ready$_,
 		,
-		plugin__ready_,
 		plugin__ready__set
 	] = ns_be_sig_triple_(
 		'app',
 		()=>false)
-	rebuildjs__ready__add(plugin__ready_)
+	rebuildjs__ready__add(plugin__ready$_)
 	equal(rebuildjs__ready$_(app_ctx)(), false)
 	equal(rebuildjs__ready_(app_ctx), false)
 	const build_id = server__metafile0.build_id!
@@ -134,10 +139,13 @@ test('rebuildjs__ready', async ()=>{
 	browser__metafile__set(app_ctx, browser__metafile0)
 	equal(rebuildjs__ready$_(app_ctx)(), false)
 	equal(rebuildjs__ready_(app_ctx), false)
-	rebuildjs__build_id__set(app_ctx, build_id)
+	rebuildjs__esbuild__build_id__set(app_ctx, build_id)
 	equal(rebuildjs__ready$_(app_ctx)(), false)
 	equal(rebuildjs__ready_(app_ctx), false)
 	plugin__ready__set(app_ctx, true)
+	equal(rebuildjs__ready$_(app_ctx)(), false)
+	equal(rebuildjs__ready_(app_ctx), false)
+	rebuildjs__build_id__set(app_ctx, build_id)
 	equal(rebuildjs__ready$_(app_ctx)(), true)
 	equal(rebuildjs__ready_(app_ctx), true)
 	// @ts-expect-error TS2345
@@ -148,14 +156,14 @@ test('rebuildjs__ready', async ()=>{
 test('rebuildjs_core__ready__wait', async ()=>{
 	let done = false
 	const [
+		plugin__ready$_,
 		,
-		plugin__ready_,
 		plugin__ready__set
 	] = ns_be_sig_triple_(
 		'app',
 		()=>false)
-	rebuildjs__ready__add(plugin__ready_)
-	const promise = rebuildjs_core__ready__wait()
+	rebuildjs__ready__add(plugin__ready$_)
+	const promise = rebuildjs__ready__wait()
 	promise.then(()=>done = true)
 	try {
 		equal(done, false)
@@ -169,11 +177,14 @@ test('rebuildjs_core__ready__wait', async ()=>{
 		browser__metafile__set(app_ctx, browser__metafile1)
 		await sleep(0)
 		equal(done, false)
-		rebuildjs__build_id__set(app_ctx, build_id)
+		rebuildjs__esbuild__build_id__set(app_ctx, build_id)
 		await sleep(0)
-		equal(done, true)
+		equal(done, false)
 		plugin__ready__set(app_ctx, true)
 		await sleep(0)
+		equal(done, false)
+		rebuildjs__build_id__set(app_ctx, build_id)
+		await sleep(0)
 		equal(done, true)
 	} finally {
 		await promise.cancel()
@@ -182,13 +193,13 @@ test('rebuildjs_core__ready__wait', async ()=>{
 test('rebuildjs__ready__wait', async ()=>{
 	let done = false
 	const [
+		plugin__ready$_,
 		,
-		plugin__ready_,
 		plugin__ready__set
 	] = ns_be_sig_triple_(
 		'app',
 		()=>false)
-	rebuildjs__ready__add(plugin__ready_)
+	rebuildjs__ready__add(plugin__ready$_)
 	const promise = rebuildjs__ready__wait()
 	promise.then(()=>done = true)
 	try {
@@ -203,11 +214,14 @@ test('rebuildjs__ready__wait', async ()=>{
 		browser__metafile__set(app_ctx, browser__metafile1)
 		await sleep(0)
 		equal(done, false)
-		rebuildjs__build_id__set(app_ctx, build_id)
+		rebuildjs__esbuild__build_id__set(app_ctx, build_id)
 		await sleep(0)
 		equal(done, false)
 		plugin__ready__set(app_ctx, true)
 		await sleep(0)
+		equal(done, false)
+		rebuildjs__build_id__set(app_ctx, build_id)
+		await sleep(0)
 		equal(done, true)
 	} finally {
 		await promise.cancel()