rebuildjs 0.27.2 → 0.29.0

package/_fixtures/metafiles.ts

@@ -18,12 +18,17 @@ export const browser__metafile0 = Object.freeze({
 			'imports': [],
 			'exports': [],
 			'entryPoint': 'src/app/index.browser.ts',
+			'cssBundle': 'dist/browser--dev/index.browser-BRS0BRS0.css',
 			'inputs': {
 				'../input/path0': {
 					'bytesInOutput': 98
 				},
 			},
-			'bytes': 98
+			'bytes': 98,
+			'esbuild_cssBundle': 'dist/browser--dev/index.browser-BRS0BRS0_esbuild.css',
+			'cssBundle_content': [
+				'dist/browser--dev/index.browser-BRS0BRS0.js'
+			]
 		}
 	},
 	rebuildjs_target: 'browser',
@@ -84,6 +89,7 @@ export const browser__metafile1 = Object.freeze({
 			'imports': [],
 			'exports': [],
 			'entryPoint': 'src/app/index.browser.ts',
+			'cssBundle': 'dist/browser--dev/index.browser-BRS1BRS1.css',
 			'inputs': {
 				'../input/path0': {
 					'bytesInOutput': 98
@@ -92,11 +98,15 @@ export const browser__metafile1 = Object.freeze({
 					'bytesInOutput': 50
 				},
 			},
-			'bytes': 148
+			'bytes': 148,
+			'esbuild_cssBundle': 'dist/browser--dev/index.browser-BRS1BRS1_esbuild.css',
+			'cssBundle_content': [
+				'dist/browser--dev/index.browser-BRS1BRS1.js'
+			],
 		},
 	},
-	"rebuildjs_target": "browser",
-	"build_id": "1703809126591-ihwT4FatSz6ubDMbQLEQNA",
+	'rebuildjs_target': 'browser',
+	'build_id': '1703809126591-ihwT4FatSz6ubDMbQLEQNA',
 }) as rebuildjs_metafile_T
 export const server__metafile1 = Object.freeze({
 	inputs: {
@@ -134,8 +144,8 @@ export const server__metafile1 = Object.freeze({
 			'bytes': 148
 		},
 	},
-	"rebuildjs_target": "server",
-	"build_id": "1703809126591-ihwT4FatSz6ubDMbQLEQNA",
+	'rebuildjs_target': 'server',
+	'build_id': '1703809126591-ihwT4FatSz6ubDMbQLEQNA',
 }) as rebuildjs_metafile_T
 export const browser__metafile2 = Object.freeze({
 	inputs: {
@@ -166,6 +176,7 @@ export const browser__metafile2 = Object.freeze({
 			'imports': [],
 			'exports': [],
 			'entryPoint': 'src/app/index.browser.ts',
+			'cssBundle': 'dist/browser--dev/index.browser-BRS2BRS2.css',
 			'inputs': {
 				'../input/path0': {
 					'bytesInOutput': 98
@@ -177,11 +188,15 @@ export const browser__metafile2 = Object.freeze({
 					'bytesInOutput': 80
 				}
 			},
-			'bytes': 228
+			'bytes': 228,
+			'esbuild_cssBundle': 'dist/browser--dev/index.browser-BRS2BRS2_esbuild.css',
+			'cssBundle_content': [
+				'dist/browser--dev/index.browser-BRS2BRS2.js'
+			]
 		}
 	},
-	"rebuildjs_target": "browser",
-	"build_id": "1703809154281-B6Mt0emJRWqIylzx4ZlOBQ",
+	'rebuildjs_target': 'browser',
+	'build_id': '1703809154281-B6Mt0emJRWqIylzx4ZlOBQ',
 }) as rebuildjs_metafile_T
 export const server__metafile2 = Object.freeze({
 	inputs: {
@@ -226,6 +241,6 @@ export const server__metafile2 = Object.freeze({
 			'bytes': 228
 		}
 	},
-	"rebuildjs_target": "server",
-	"build_id": "1703809154281-B6Mt0emJRWqIylzx4ZlOBQ",
+	'rebuildjs_target': 'server',
+	'build_id': '1703809154281-B6Mt0emJRWqIylzx4ZlOBQ',
 }) as rebuildjs_metafile_T

package/browser/index.d.ts

@@ -9,5 +9,13 @@ export declare const browser__metafile__set:ctx__set_T<has_app_T, rebuildjs_meta
 export declare function browser__metafile__persist():Promise<void>
 export declare const browser__output__relative_path$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
 export declare const browser__output__relative_path_:ctx__get_T<has_middleware_T, string>
+export declare const browser__output$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
+export declare const browser__output_:ctx__get_T<has_middleware_T, string>
+export declare const browser__cssBundle__relative_path$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
+export declare const browser__cssBundle__relative_path_:ctx__get_T<has_middleware_T, string>
+export declare const browser__cssBundle$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
+export declare const browser__cssBundle_:ctx__get_T<has_middleware_T, string>
+export declare const browser__css$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
+export declare const browser__css_:ctx__get_T<has_middleware_T, string>
 export declare const browser__script$_:ctx__be_T<has_middleware_T, memo_T<string>, 'middleware'>
 export declare const browser__script_:ctx__get_T<has_middleware_T, string>

package/browser/index.js

@@ -1,11 +1,11 @@
 import { file_exists__waitfor } from 'ctx-core/fs'
-import { Cancel, nullish__none_, sleep, waitfor } from 'ctx-core/function'
+import { Cancel, nullish__none_, sleep, tup, waitfor } from 'ctx-core/function'
 import { be_lock_memosig_triple_, be_memo_pair_ } from 'ctx-core/rmemo'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'path'
-import { browser__relative_path_, browser_path_ } from '../app/index.js'
+import { browser__relative_path_, browser_path_, cwd_, server__relative_path_ } from '../app/index.js'
 import { app_ctx } from '../ctx/index.js'
-import { server__output_ } from '../server/index.js'
+import { server__metafile_, server__output_, server__output__relative_path_ } from '../server/index.js'
 export const [
 	browser__metafile_path$_,
 	browser__metafile_path_,
@@ -94,6 +94,36 @@ export const [
 				}
 			}
 		}), { ns: 'middleware', id: 'browser__output__relative_path' })
+export const [
+	browser__output$_,
+	browser__output_
+] = be_memo_pair_(ctx=>
+	nullish__none_(tup(browser__metafile_(ctx), browser__output__relative_path_(ctx)),
+		(browser__metafile, browser__output__relative_path)=>
+			browser__metafile.outputs[browser__output__relative_path]),
+{ ns: 'middleware', id: 'browser__output' })
+export const [
+	browser__cssBundle__relative_path$_,
+	browser__cssBundle__relative_path_
+] = be_memo_pair_(ctx=>
+	browser__output_(ctx)?.cssBundle,
+{ ns: 'middleware', id: 'browser__cssBundle__relative_path', })
+export const [
+	browser__cssBundle$_,
+	browser__cssBundle_
+] = be_memo_pair_(ctx=>
+	nullish__none_([browser__output_(ctx)?.cssBundle],
+		cssBundle=>
+			join(cwd_(ctx), cssBundle)),
+{ ns: 'middleware', id: 'browser__cssBundle', })
+export const [
+	browser__css$_,
+	browser__css_
+] = be_memo_pair_(ctx=>
+	nullish__none_([browser__relative_path_(ctx), browser__cssBundle__relative_path_(ctx)],
+		(browser__relative_path, browser__cssBundle__relative_path)=>
+			join('/', relative(browser__relative_path, browser__cssBundle__relative_path))),
+{ ns: 'middleware', id: 'browser__css' })
 export const [
 	browser__script$_,
 	browser__script_,

package/browser/index.test.ts

@@ -11,15 +11,23 @@ import {
 	browser__metafile2,
 	server__metafile0
 } from '../_fixtures/metafiles.js'
-import { dist_path__set, is_prod__set } from '../app/index.js'
+import { cwd__set, dist_path__set, is_prod__set } from '../app/index.js'
 import { app_ctx, middleware_ctx_ } from '../ctx/index.js'
 import { server__metafile__set, server__output_, server__output__relative_path__set } from '../server/index.js'
 import {
+	browser__css$_,
+	browser__css_,
+	browser__cssBundle$_,
+	browser__cssBundle_,
+	browser__cssBundle__relative_path$_,
+	browser__cssBundle__relative_path_,
 	browser__metafile$_,
 	browser__metafile_,
 	browser__metafile__set,
 	browser__metafile_path$_,
 	browser__metafile_path_,
+	browser__output$_,
+	browser__output_,
 	browser__output__relative_path$_,
 	browser__output__relative_path_,
 	browser__script$_,
@@ -163,12 +171,77 @@ test('browser__output__relative_path', ()=>{
 	})
 	equal(server__output_(middleware_ctx), server__metafile0.outputs['dist/server--dev/index.server-SVR0SVR0.js'])
 	equal(browser__output__relative_path$_(middleware_ctx)._, 'dist/browser--dev/index.browser-BRS0BRS0.js')
-	equal(browser__output__relative_path$_(middleware_ctx)._, 'dist/browser--dev/index.browser-BRS0BRS0.js')
+	equal(browser__output__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.js')
 	// @ts-expect-error TS2345
 	throws(()=>browser__output__relative_path$_(ctx_()))
 	// @ts-expect-error TS2345
 	throws(()=>browser__output__relative_path_(ctx_()))
 })
+test('browser__output', ()=>{
+	const middleware_ctx = middleware_ctx_()
+	equal(browser__output$_(middleware_ctx)(), undefined)
+	equal(browser__output_(middleware_ctx), undefined)
+	server__metafile__set(middleware_ctx, server__metafile0)
+	browser__metafile__set(middleware_ctx, browser__metafile0)
+	server__output__relative_path__set(middleware_ctx, 'dist/server--dev/index.server-SVR0SVR0.js')
+	equal(browser__output__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.js')
+	equal(typeof browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'], 'object')
+	equal(browser__output$_(middleware_ctx)(), browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'])
+	equal(browser__output_(middleware_ctx), browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'])
+	// @ts-expect-error TS2345
+	throws(()=>browser__output$_(app_ctx))
+	// @ts-expect-error TS2345
+	throws(()=>browser__output_(app_ctx))
+})
+test('browser__cssBundle__relative_path', ()=>{
+	const middleware_ctx = middleware_ctx_()
+	equal(browser__cssBundle__relative_path$_(middleware_ctx)(), undefined)
+	equal(browser__cssBundle__relative_path_(middleware_ctx), undefined)
+	server__metafile__set(middleware_ctx, server__metafile0)
+	browser__metafile__set(middleware_ctx, browser__metafile0)
+	server__output__relative_path__set(middleware_ctx, 'dist/server--dev/index.server-SVR0SVR0.js')
+	equal(browser__output__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.js')
+	equal(browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'].cssBundle, 'dist/browser--dev/index.browser-BRS0BRS0.css')
+	equal(browser__cssBundle__relative_path$_(middleware_ctx)(), 'dist/browser--dev/index.browser-BRS0BRS0.css')
+	equal(browser__cssBundle__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.css')
+	// @ts-expect-error TS2345
+	throws(()=>browser__cssBundle__relative_path$_(app_ctx))
+	// @ts-expect-error TS2345
+	throws(()=>browser__cssBundle__relative_path_(app_ctx))
+})
+test('browser__cssBundle', ()=>{
+	const middleware_ctx = middleware_ctx_()
+	equal(browser__cssBundle$_(middleware_ctx)(), undefined)
+	equal(browser__cssBundle_(middleware_ctx), undefined)
+	cwd__set(app_ctx, '/cwd')
+	server__metafile__set(middleware_ctx, server__metafile0)
+	browser__metafile__set(middleware_ctx, browser__metafile0)
+	server__output__relative_path__set(middleware_ctx, 'dist/server--dev/index.server-SVR0SVR0.js')
+	equal(browser__output__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.js')
+	equal(browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'].cssBundle, 'dist/browser--dev/index.browser-BRS0BRS0.css')
+	equal(browser__cssBundle$_(middleware_ctx)(), '/cwd/dist/browser--dev/index.browser-BRS0BRS0.css')
+	equal(browser__cssBundle_(middleware_ctx), '/cwd/dist/browser--dev/index.browser-BRS0BRS0.css')
+	// @ts-expect-error TS2345
+	throws(()=>browser__cssBundle$_(app_ctx))
+	// @ts-expect-error TS2345
+	throws(()=>browser__cssBundle_(app_ctx))
+})
+test('browser__css', ()=>{
+	const middleware_ctx = middleware_ctx_()
+	equal(browser__css$_(middleware_ctx)(), undefined)
+	equal(browser__css_(middleware_ctx), undefined)
+	server__metafile__set(middleware_ctx, server__metafile0)
+	browser__metafile__set(middleware_ctx, browser__metafile0)
+	server__output__relative_path__set(middleware_ctx, 'dist/server--dev/index.server-SVR0SVR0.js')
+	equal(browser__output__relative_path_(middleware_ctx), 'dist/browser--dev/index.browser-BRS0BRS0.js')
+	equal(browser__metafile0.outputs['dist/browser--dev/index.browser-BRS0BRS0.js'].cssBundle, 'dist/browser--dev/index.browser-BRS0BRS0.css')
+	equal(browser__css$_(middleware_ctx)(), '/index.browser-BRS0BRS0.css')
+	equal(browser__css_(middleware_ctx), '/index.browser-BRS0BRS0.css')
+	// @ts-expect-error TS2345
+	throws(()=>browser__css$_(app_ctx))
+	// @ts-expect-error TS2345
+	throws(()=>browser__css_(app_ctx))
+})
 test('browser__script', ()=>{
 	const middleware_ctx = middleware_ctx_()
 	equal(browser__script$_(middleware_ctx)._, undefined)

package/build/index.js

@@ -14,6 +14,7 @@ import {
 	browser__metafile__persist,
 	browser__metafile__set,
 	browser__metafile_path_,
+	browser__output_,
 	browser__output__relative_path_
 } from '../browser/index.js'
 import { app_ctx } from '../ctx/index.js'
@@ -23,6 +24,7 @@ import {
 	server__metafile__persist,
 	server__metafile__set,
 	server__metafile_path_,
+	server__output_,
 	server__output__relative_path_M_middleware_ctx_
 } from '../server/index.js'
 export const [
@@ -337,7 +339,7 @@ export function rebuildjs_plugin_() {
 									}
 								}
 								async function rebuildjs__assets__link() {
-									const outputs= server__metafile.outputs ?? {}
+									const outputs = server__metafile.outputs ?? {}
 									for (let output__relative_path in outputs) {
 										switch (extname(output__relative_path)) {
 											case '.js':
@@ -401,11 +403,11 @@ async function server__metafile__update(server__metafile, build_id) {
 		server__output__relative_path,
 		middleware_ctx
 	] of server__output__relative_path_M_middleware_ctx_(app_ctx).entries()) {
-		const output = server__metafile.outputs[server__output__relative_path]
-		const { cssBundle } = output
+		const server__output = server__output_(middleware_ctx)
+		const { cssBundle } = server__output
 		if (cssBundle) {
-			output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
-			output.cssBundle_content = [
+			server__output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
+			server__output.cssBundle_content = [
 				server__output__relative_path,
 				...(
 					browser__output__relative_path_(middleware_ctx)
@@ -425,13 +427,12 @@ async function browser__metafile__update(browser__metafile, build_id) {
 	}
 	browser__metafile__set(app_ctx, browser__metafile)
 	for (const middleware_ctx of server__output__relative_path_M_middleware_ctx_(app_ctx)?.values?.() ?? []) {
-		const browser__output__relative_path = browser__output__relative_path_(middleware_ctx)
-		if (browser__output__relative_path) {
-			const output = browser__metafile.outputs[browser__output__relative_path]
-			const { cssBundle } = output
+		const browser__output = browser__output_(middleware_ctx)
+		if (browser__output) {
+			const { cssBundle } = browser__output
 			if (cssBundle) {
-				output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
-				output.cssBundle_content = [browser__output__relative_path]
+				browser__output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
+				browser__output.cssBundle_content = [browser__output__relative_path_(middleware_ctx)]
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.27.2",
+  "version": "0.29.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.9.0",
+    "ctx-core": "^5.10.0",
     "elysia": "^0.8.8",
     "esbuild": "^0.19.11",
     "fdir": "^6.1.1",

package/server/index.js

@@ -84,12 +84,11 @@ export const [
 				Object.keys(server__metafile.outputs)
 					.filter(server__output__relative_path=>
 						server__metafile.outputs[server__output__relative_path].entryPoint)
-					.map(
-						server__output__relative_path=>{
-							const middleware_ctx = middleware_ctx_()
-							server__output__relative_path__set(middleware_ctx, server__output__relative_path)
-							return [server__output__relative_path, middleware_ctx]
-						}))),
+					.map(server__output__relative_path=>{
+						const middleware_ctx = middleware_ctx_()
+						server__output__relative_path__set(middleware_ctx, server__output__relative_path)
+						return [server__output__relative_path, middleware_ctx]
+					}))),
 {
 	id: 'server__output__relative_path_M_middleware_ctx',
 	ns: 'app'
@@ -114,7 +113,7 @@ export const [
 	server__cssBundle__relative_path_
 ] = be_memo_pair_(ctx=>
 	server__output_(ctx)?.cssBundle,
-{ ns: 'middleware', id: 'server__cssBundle', })
+{ ns: 'middleware', id: 'server__cssBundle__relative_path', })
 export const [
 	server__cssBundle$_,
 	server__cssBundle_