rebuildjs 0.24.3 → 0.26.0

package/_fixtures/metafiles.ts

@@ -0,0 +1,231 @@
+import { type rebuildjs_metafile_T } from '../metafile_l0/index.js'
+export const browser__metafile0 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+	},
+	outputs: {
+		'dist/browser--dev/index.browser-BRS0BRS0.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/browser--dev/index.browser-BRS0BRS0.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.browser.ts',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+			},
+			'bytes': 98
+		}
+	},
+	rebuildjs_target: 'browser',
+	build_id: '1703808862263-OuJG4giiT8K7+PMT4mK+Bg',
+}) as rebuildjs_metafile_T
+export const server__metafile0 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+	},
+	outputs: {
+		'dist/server--dev/index.server-SVR0SVR0.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/server--dev/index.server-SVR0SVR0.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.server.ts',
+			'cssBundle': 'dist/server--dev/index.server-SVR0SVR0.css',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+			},
+			'bytes': 98
+		}
+	},
+	rebuildjs_target: 'server',
+	build_id: '1703808862263-OuJG4giiT8K7+PMT4mK+Bg',
+}) as rebuildjs_metafile_T
+export const browser__metafile1 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path1': {
+			'bytes': 62,
+			'imports': [],
+			'format': 'esm'
+		}
+	},
+	outputs: {
+		'dist/browser--dev/index.browser-BRS1BRS1.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/browser--dev/index.browser-BRS1BRS1.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.browser.ts',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+				'../input/path1': {
+					'bytesInOutput': 50
+				},
+			},
+			'bytes': 148
+		},
+	},
+	"rebuildjs_target": "browser",
+	"build_id": "1703809126591-ihwT4FatSz6ubDMbQLEQNA",
+}) as rebuildjs_metafile_T
+export const server__metafile1 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path1': {
+			'bytes': 62,
+			'imports': [],
+			'format': 'esm'
+		}
+	},
+	outputs: {
+		'dist/server--dev/index.server-SVR1SVR1.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/server--dev/index.server-SVR1SVR1.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.server.ts',
+			'cssBundle': 'dist/server--dev/index.server-SVR1SVR1.css',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+				'../input/path1': {
+					'bytesInOutput': 50
+				},
+			},
+			'bytes': 148
+		},
+	},
+	"rebuildjs_target": "server",
+	"build_id": "1703809126591-ihwT4FatSz6ubDMbQLEQNA",
+}) as rebuildjs_metafile_T
+export const browser__metafile2 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path1': {
+			'bytes': 62,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path2': {
+			'bytes': 100,
+			'imports': [],
+			'format': 'esm'
+		}
+	},
+	outputs: {
+		'dist/browser--dev/index.browser-BRS2BRS2.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/browser--dev/index.browser-BRS2BRS2.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.browser.ts',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+				'../input/path1': {
+					'bytesInOutput': 50
+				},
+				'../input/path2': {
+					'bytesInOutput': 80
+				}
+			},
+			'bytes': 228
+		}
+	},
+	"rebuildjs_target": "browser",
+	"build_id": "1703809154281-B6Mt0emJRWqIylzx4ZlOBQ",
+}) as rebuildjs_metafile_T
+export const server__metafile2 = Object.freeze({
+	inputs: {
+		'../input/path0': {
+			'bytes': 224,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path1': {
+			'bytes': 62,
+			'imports': [],
+			'format': 'esm'
+		},
+		'../input/path2': {
+			'bytes': 100,
+			'imports': [],
+			'format': 'esm'
+		}
+	},
+	outputs: {
+		'dist/server--dev/index.server-SVR2SVR2.js.map': {
+			'imports': [],
+			'exports': [],
+			'inputs': {},
+			'bytes': 323
+		},
+		'dist/server--dev/index.server-SVR2SVR2.js': {
+			'imports': [],
+			'exports': [],
+			'entryPoint': 'src/app/index.server.ts',
+			'inputs': {
+				'../input/path0': {
+					'bytesInOutput': 98
+				},
+				'../input/path1': {
+					'bytesInOutput': 50
+				},
+				'../input/path2': {
+					'bytesInOutput': 80
+				}
+			},
+			'bytes': 228
+		}
+	},
+	"rebuildjs_target": "server",
+	"build_id": "1703809154281-B6Mt0emJRWqIylzx4ZlOBQ",
+}) as rebuildjs_metafile_T

package/_fixtures/src/app/index.browser.css

@@ -0,0 +1,3 @@
+div.pass {
+	font-weight: bold;
+}

package/_fixtures/src/app/index.browser.ts

@@ -0,0 +1,4 @@
+import './index.browser.css'
+window.addEventListener('load', ()=>{
+	document.querySelector('div')!.classList.add('pass')
+})

package/_fixtures/src/app/index.server.css

@@ -0,0 +1,3 @@
+div.pass {
+	color: green;
+}

package/_fixtures/src/app/index.server.ts

@@ -0,0 +1,29 @@
+import './index.server.css'
+import { assets_ } from '../../../asset/index.js'
+import { type middleware_ctx_T, route_ctx_ } from '../../../ctx/index.js'
+export default (middleware_ctx:middleware_ctx_T)=>{
+	return (request:Request)=>{
+		const route_ctx = route_ctx_(middleware_ctx)
+		return new Response(
+			'<html>' +
+			'<head>' +
+			assets_(route_ctx).css_a.map(css=>
+				'<link rel="stylesheet" type="text/css" href="' + css + '"></link>'
+			).join('') +
+			assets_(route_ctx).script_a.map(script=>
+				'<script type="module" src="' + script + '"></script>'
+			).join('') +
+			'</head>' +
+			'<body>' +
+			'<div>' +
+			request.url +
+			'</div>' +
+			'</body>' +
+			'</html>',
+			{
+				headers: {
+					'Content-Type': 'text/html;charset=UTF-8'
+				}
+			})
+	}
+}

package/_fixtures/src/index.ts

@@ -0,0 +1,9 @@
+import { is_entry_file_ } from 'ctx-core/fs'
+import { browser__build, server__build } from '../../build/index.js'
+is_entry_file_(import.meta.url, process.argv[1])
+	.then(async is_entry_file=>{
+		if (is_entry_file) {
+			await server__build()
+			await browser__build()
+		}
+	})

package/build/index.d.ts

@@ -5,6 +5,12 @@ export declare const build_id$_:ctx__be_T<has_app_T, sig_T<string|undefined>, 'a
 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 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 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[]>

package/build/index.js

@@ -2,7 +2,7 @@
 /// <reference types="./index.d.ts" />
 import { file_exists__waitfor } from 'ctx-core/fs'
 import { nullish__none_, run } from 'ctx-core/function'
-import { be, be_sig_triple_, memo_ } from 'ctx-core/rmemo'
+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'
@@ -35,6 +35,31 @@ export function build_id__refresh() {
 	build_id__set(app_ctx, build_id)
 	return build_id
 }
+export const [
+	rebuildjs__build_id$_,
+	rebuildjs__build_id_,
+	rebuildjs__build_id__set,
+] = be_sig_triple_(()=>undefined,
+	{ id: 'rebuildjs_plugin__build_id', ns: 'app' })
+export const [
+	rebuildjs__ready$_,
+	rebuildjs__ready_,
+] = be_memo_pair_(ctx=>
+	!!(
+		build_id_(ctx)
+			&& build_id_(ctx) === metafile__build_id_(ctx)
+			&& build_id_(ctx) === rebuildjs__build_id_(ctx)),
+{ id: 'rebuildjs__ready', ns: 'app' })
+/**
+ * @param {number}[timeout]
+ * @returns {Promise<void>}}
+ */
+export function rebuildjs__ready__wait(timeout) {
+	return rmemo__wait(
+		rebuildjs__ready$_(app_ctx),
+		ready=>ready,
+		timeout ?? 5000)
+}
 /**
  * @param {import('esbuild').Plugin}config
  * @returns {Promise<void>}
@@ -228,11 +253,20 @@ export function rebuildjs_plugin_() {
 											if (err instanceof RebuildjsInterrupt) return
 											throw err
 										}
+										rebuildjs__build_id__set(ctx, build_id)
 									})
 								}
 								async function cmd(fn) {
 									if (cancel_()) throw new RebuildjsInterrupt()
-									const ret = await fn()
+									const promise = fn()
+									promise.rebuildjs_cancel$ = run(memo_(rebuildjs_cancel$=>{
+										if (cancel_()) {
+											promise.cancel?.()
+											off(rebuildjs_cancel$)
+										}
+										return rebuildjs_cancel$
+									}))
+									const ret = await promise
 									if (cancel_()) throw new RebuildjsInterrupt()
 									return ret
 								}

package/build/index.test.ts

@@ -6,12 +6,25 @@ 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 { cwd__set } from '../app/index.js'
-import { browser__metafile_ } from '../browser/index.js'
+import { browser__metafile_, browser__metafile__set } from '../browser/index.js'
 import { app_ctx } from '../ctx/index.js'
-import { metafile__wait } from '../metafile/index.js'
-import { server__metafile_ } from '../server/index.js'
-import { browser__build, build_id$_, build_id_, build_id__refresh, build_id__set, server__build } from './index.js'
+import { server__metafile_, server__metafile__set } from '../server/index.js'
+import {
+	browser__build,
+	build_id$_,
+	build_id_,
+	build_id__refresh,
+	build_id__set,
+	rebuildjs__build_id$_,
+	rebuildjs__build_id_,
+	rebuildjs__build_id__set,
+	rebuildjs__ready$_,
+	rebuildjs__ready_,
+	rebuildjs__ready__wait,
+	server__build
+} from './index.js'
 test.after.each(()=>{
 	app_ctx.s.app.clear()
 })
@@ -37,6 +50,68 @@ test('build_id__refresh', ()=>{
 		parseInt(build_id.split('-')[0]) > Date.now() - 1000,
 		true)
 })
+test('rebuildjs__build_id', ()=>{
+	equal(rebuildjs__build_id$_(app_ctx)(), undefined)
+	equal(rebuildjs__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)!)
+	// @ts-expect-error TS2345
+	throws(()=>rebuildjs__build_id$_(ctx_()))
+	// @ts-expect-error TS2345
+	throws(()=>rebuildjs__build_id_(ctx_()))
+})
+test('rebuildjs__ready', ()=>{
+	equal(rebuildjs__ready$_(app_ctx)(), false)
+	equal(rebuildjs__ready_(app_ctx), false)
+	const build_id = server__metafile0.build_id!
+	build_id__set(app_ctx, build_id)
+	equal(rebuildjs__ready$_(app_ctx)(), false)
+	equal(rebuildjs__ready_(app_ctx), false)
+	server__metafile__set(app_ctx, server__metafile0)
+	equal(rebuildjs__ready$_(app_ctx)(), false)
+	equal(rebuildjs__ready_(app_ctx), false)
+	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)
+	equal(rebuildjs__ready$_(app_ctx)(), true)
+	equal(rebuildjs__ready_(app_ctx), true)
+	// @ts-expect-error TS2345
+	throws(()=>rebuildjs__ready$_(ctx_()))
+	// @ts-expect-error TS2345
+	throws(()=>rebuildjs__ready_(ctx_()))
+})
+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)
+})
+test('rebuildjs__ready__wait|timeout', async ()=>{
+	let err:Error|undefined = undefined
+	try {
+		await rebuildjs__ready__wait(0)
+	} catch (_err) {
+		err = _err as Error
+	}
+	equal(err!.message, 'Timeout 0ms')
+})
 test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 	const test_dir = dirname(new URL(import.meta.url).pathname)
 	const cwd = join(test_dir, '../_fixtures')
@@ -47,7 +122,7 @@ test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 	try {
 		server__build_context = await server__build()
 		browser__build_context = await browser__build()
-		await metafile__wait()
+		await rebuildjs__ready__wait()
 		equal(await file_exists_(join(cwd, 'dist')), true)
 		equal(await file_exists_(join(cwd, 'dist', 'browser--dev')), true)
 		equal(await file_exists_(join(cwd, 'dist', 'server--dev')), true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.24.3",
+  "version": "0.26.0",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",
@@ -26,6 +26,7 @@
     "*.d.ts",
     "*.js",
     "*.json",
+    "_fixtures",
     "app",
     "asset",
     "browser",
@@ -52,7 +53,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "ctx-core": "^5.6.1",
+    "ctx-core": "^5.8.0",
     "elysia": "^0.8.6",
     "esbuild": "^0.19.11",
     "fdir": "^6.1.1",

package/tsconfig.json

@@ -6,8 +6,7 @@
 		"target": "ESNext",
 		"strict": true
 	},
-	"exclude": [
-		"node_modules"
-	],
+	"include": ["_fixtures/**/*"],
+	"exclude": ["node_modules"],
 	"references": []
 }