rebuildjs 0.20.0 → 0.20.2

package/browser/index.js

@@ -1,5 +1,5 @@
 import { file_exists_ } from 'ctx-core/fs'
-import { nullish__none_ } from 'ctx-core/function'
+import { nullish__none_, waitfor } from 'ctx-core/function'
 import { be_lock_memosig_triple_, be_memo_pair_ } from 'ctx-core/rmemo'
 import { readFile } from 'node:fs/promises'
 import { join, relative } from 'path'
@@ -11,6 +11,7 @@ export const [
 ] = be_memo_pair_(ctx=>
 	join(browser_path_(ctx), 'metafile.json'),
 { ns: 'app', id: 'browser__metafile_path' })
+let browser__metafile__waitfor_promise
 export const [
 	browser__metafile$_,
 	browser__metafile_,
@@ -18,12 +19,18 @@ export const [
 ] = be_lock_memosig_triple_(()=>
 	undefined,
 async (ctx, browser__metafile$)=>{
+	browser__metafile$() // ensure the subscriber is run when browser__metafile$ changes
 	let metafile_path
-	if (
-		!browser__metafile$.lock
-			&& await file_exists_(metafile_path = browser__metafile_path_(ctx))
-	) {
-		browser__metafile$._ = JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
+	browser__metafile__waitfor_promise?.cancel?.()
+	if (!browser__metafile$.lock) {
+		metafile_path = browser__metafile_path_(ctx)
+		browser__metafile__waitfor_promise = waitfor(
+			()=>file_exists_(browser__metafile_path_(ctx)),
+			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' })
 export const [

package/browser/index.test.ts

@@ -55,7 +55,7 @@ test('browser__metafile', async ()=>{
 			browser__metafile$_: _browser__metafile$_,
 			browser__metafile_: _browser__metafile_,
 			browser__metafile__set: _browser__metafile__set,
-		} = await esmock('./index.js', {}, {
+		} = await esmock.p('./index.js', import.meta.url, {}, {
 			'ctx-core/rmemo': rmemo,
 			'ctx-core/fs': {
 				file_exists_: async (path:string)=>{
@@ -64,6 +64,8 @@ test('browser__metafile', async ()=>{
 				}
 			},
 			'node:fs/promises': {
+				// TODO: use this when https://github.com/iambumblehead/esmock/issues/281 is addressed
+				// access: async ()=>{},
 				readFile: async (path:string)=>{
 					readFile_path = path
 					switch (path) {
@@ -78,7 +80,10 @@ test('browser__metafile', async ()=>{
 	}
 	equal(_browser__metafile$_(app_ctx)._, undefined)
 	equal(_browser__metafile_(app_ctx), undefined)
-	await rmemo__wait(_browser__metafile$_(app_ctx), m=>m, 100)
+	await rmemo__wait(
+		_browser__metafile$_(app_ctx),
+		m=>m,
+		100)
 	equal(_browser__metafile$_(app_ctx)._, browser_metafile0)
 	equal(_browser__metafile_(app_ctx), browser_metafile0)
 	equal(file_exists__path, '/cwd/dist0/browser/metafile.json')
@@ -86,13 +91,19 @@ test('browser__metafile', async ()=>{
 	equal(_browser__metafile$_(app_ctx)._, browser_metafile0)
 	equal(_browser__metafile_(app_ctx), browser_metafile0)
 	dist_path__set(app_ctx, '/cwd/dist1')
-	await rmemo__wait(_browser__metafile$_(app_ctx), m=>deep_equal(m, browser_metafile1), 100)
+	await rmemo__wait(
+		_browser__metafile$_(app_ctx),
+		m=>deep_equal(m, browser_metafile1),
+		100)
 	equal(_browser__metafile$_(app_ctx)._, browser_metafile1)
 	equal(_browser__metafile_(app_ctx), browser_metafile1)
 	equal(file_exists__path, '/cwd/dist1/browser/metafile.json')
 	equal(readFile_path, '/cwd/dist1/browser/metafile.json')
 	dist_path__set(app_ctx, '/cwd/dist0')
-	await rmemo__wait(_browser__metafile$_(app_ctx), m=>deep_equal(m, browser_metafile0), 100)
+	await rmemo__wait(
+		_browser__metafile$_(app_ctx),
+		m=>deep_equal(m, browser_metafile0),
+		100)
 	equal(_browser__metafile$_(app_ctx)._, browser_metafile0)
 	equal(_browser__metafile_(app_ctx), browser_metafile0)
 	equal(file_exists__path, '/cwd/dist0/browser/metafile.json')
@@ -103,7 +114,10 @@ test('browser__metafile', async ()=>{
 	dist_path__set(app_ctx, '/cwd/dist1')
 	let error_msg:string|undefined = undefined
 	try {
-		await rmemo__wait(_browser__metafile$_(app_ctx), m=>deep_equal(m, browser_metafile1), 100)
+		await rmemo__wait(
+			_browser__metafile$_(app_ctx),
+			m=>deep_equal(m, browser_metafile1),
+			100)
 	} catch (e) {
 		error_msg = (e as Error).message
 	}

package/ctx/index.test.ts

@@ -1,5 +1,5 @@
-import { Ctx } from 'ctx-core/be'
-import { Equal, Expect } from 'ctx-core/test'
+import { type Ctx } from 'ctx-core/be'
+import type { Equal, Expect } from 'ctx-core/test'
 import { test } from 'uvu'
 import { app_ctx, middleware_ctx_, route_ctx_ } from './index.js'
 test.after.each(()=>{
@@ -18,8 +18,8 @@ test('middleware_ctx_', ()=>{
 })
 test('route_ctx_', ()=>{
 	const route_ctx = route_ctx_(middleware_ctx_())
-    /* eslint-disable @typescript-eslint/no-unused-vars */
-    type test_route_ctx = Expect<Equal<typeof route_ctx, Ctx<''|'app'|'middleware'|'route'>>>
-    /* eslint-enable @typescript-eslint/no-unused-vars */
+	/* eslint-disable @typescript-eslint/no-unused-vars */
+	type test_route_ctx = Expect<Equal<typeof route_ctx, Ctx<''|'app'|'middleware'|'route'>>>
+	/* eslint-enable @typescript-eslint/no-unused-vars */
 })
 test.run()

package/metafile/index.js

@@ -8,6 +8,6 @@ export async function metafile__wait(timeout = 5000) {
 	val=>val !== undefined,
 	timeout
 	).catch(err=>{
-		throw Error('browser & server metafile timeout', { cause: err })
+		throw Error('metafile__wait|browser & server metafile timeout', { cause: err })
 	})
 }

package/metafile/index.test.ts

@@ -31,7 +31,7 @@ test('metafile__wait|failure', async ()=>{
 	} catch (_err) {
 		err = _err as Error
 	}
-	equal(err?.message, 'browser & server metafile timeout')
+	equal(err?.message, 'metafile__wait|browser & server metafile timeout')
 	equal((err?.cause as Error)?.message, 'Timeout 0ms')
 })
 test.run()

package/middleware/index.test.ts

@@ -1,4 +1,4 @@
-import { Equal, Expect } from 'ctx-core/test'
+import type { Equal, Expect } from 'ctx-core/test'
 import { test } from 'uvu'
 import { equal } from 'uvu/assert'
 import { app_ctx, middleware_ctx_T } from '../ctx/index.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",
@@ -51,7 +51,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "ctx-core": "^5.3.1",
+    "ctx-core": "^5.4.0",
     "elysia": "^0.7.30",
     "esbuild": "^0.19.10",
     "fdir": "^6.1.1",

package/server/index.js

@@ -1,5 +1,5 @@
 import { file_exists_ } from 'ctx-core/fs'
-import { nullish__none_, tup } from 'ctx-core/function'
+import { nullish__none_, tup, waitfor } from 'ctx-core/function'
 import { be_lock_memosig_triple_, be_memo_pair_, be_sig_triple_ } from 'ctx-core/rmemo'
 import { readFile } from 'fs/promises'
 import { join, relative } from 'path'
@@ -10,6 +10,7 @@ export const [
 ] = be_memo_pair_(ctx=>
 	join(server_path_(ctx), 'metafile.json'),
 { ns: 'app', id: 'server__metafile_path' })
+let server__metafile__waitfor_promise
 export const [
 	server__metafile$_,
 	server__metafile_,
@@ -17,12 +18,19 @@ export const [
 ] = be_lock_memosig_triple_(()=>
 	undefined,
 async (ctx, server__metafile$)=>{
+	server__metafile$() // ensure the subscriber is run when server__metafile$ changes
+	server__metafile__waitfor_promise?.cancel?.()
 	let metafile_path
-	if (
-		!server__metafile$.lock
-		&& await file_exists_(metafile_path = server__metafile_path_(ctx))
-	) {
-		server__metafile$._ = JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
+	if (!server__metafile$.lock) {
+		metafile_path = server__metafile_path_(ctx)
+		server__metafile__waitfor_promise = waitfor(
+			()=>file_exists_(server__metafile_path_(ctx)),
+			200
+		).catch(()=>false)
+		if (await server__metafile__waitfor_promise	&& metafile_path === server__metafile_path_(ctx)) {
+			// server__metafile$._ = JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
+			server__metafile$._ = await readFile(metafile_path).then(buf=>JSON.parse(buf+''))
+		}
 	}
 }, { ns: 'app', id: 'server__metafile' })
 export const [
@@ -37,8 +45,8 @@ export const [
 	server__output_
 ] = be_memo_pair_(ctx=>
 	nullish__none_(tup(server__metafile_(ctx), server__output__relative_path_(ctx)),
-		(server__metafile, output_path)=>
-			server__metafile.outputs[output_path]),
+		(server__metafile, server__output__relative_path)=>
+			server__metafile.outputs[server__output__relative_path]),
 { ns: 'middleware', id: 'server__output' })
 export const [
 	server__cssBundle__relative_path$_,