rebuildjs 0.6.0 → 0.9.0

package/app/index.d.ts

@@ -14,16 +14,16 @@ export const [
 	is_prod_,
 	is_prod__set,
 ]: be_lock_memosig_triple_T<string>
-export const [
-	dist_path$_,
-	dist_path_,
-	dist_path__set,
-]:be_lock_memosig_triple_T<string>
 export const [
 	public_path$_,
 	public_path_,
 	public_path__set,
 ]:be_lock_memosig_triple_T<string>
+export const [
+	dist_path$_,
+	dist_path_,
+	dist_path__set,
+]:be_lock_memosig_triple_T<string>
 export const [
 	src_path$_,
 	src_path_,

package/app/index.js

@@ -9,73 +9,72 @@ export const [
 	process.env.PORT
 		? parseInt(process.env.PORT)
 		: 3000,
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'port' })
 export const [
 	cwd$_,
 	cwd_,
 	cwd__set,
 ] = be_sig_triple_(()=>
 	resolve('.'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'cwd' })
 export const [
 	is_prod$_,
 	is_prod_,
 	is_prod__set,
 ] = be_lock_memosig_triple_(()=>
 	process.env.NODE_ENV === 'production',
-app_ctx__be_config
-)
+{ ...app_ctx__be_config, id: 'is_prod' })
 export const [
 	public_path$_,
 	public_path_,
 	public_path__set,
 ] = be_lock_memosig_triple_(ctx=>
 	join(cwd_(ctx), 'public'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'public_path' })
 export const [
 	dist_path$_,
 	dist_path_,
 	dist_path__set,
 ] = be_memosig_triple_(ctx=>
 	join(cwd_(ctx), 'dist'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'dist_path' })
 export const [
 	src_path$_,
 	src_path_,
 	src_path__set,
 ] = be_lock_memosig_triple_(ctx=>
 	join(cwd_(ctx), 'src'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'src_path' })
 export const [
 	app_path$_,
 	app_path_,
 	app_path__set,
 ] = be_lock_memosig_triple_(ctx=>
 	join(src_path_(ctx), 'app'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'app' })
 export const [
 	browser_relative_path$_,
 	browser_relative_path_,
 ] = be_memo_pair_(ctx=>
 	join('dist', is_prod_(ctx) ? 'browser' : 'dev-browser'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, is: 'browser_relative_path' })
 export const [
 	browser_path$_,
 	browser_path_,
 	browser_path__set,
 ] = be_lock_memosig_triple_(ctx=>
 	join(cwd_(ctx), browser_relative_path_(ctx)),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'browser_path' })
 export const [
 	server_relative_path$_,
 	server_relative_path_,
 ] = be_memo_pair_(ctx=>
 	join('dist', is_prod_(ctx) ? 'server' : 'dev-server'),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'server_relative_path' })
 export const [
 	server_path$_,
 	server_path_,
 	server_path__set,
 ] = be_lock_memosig_triple_(ctx=>
 	join(cwd_(ctx), server_relative_path_(ctx)),
-app_ctx__be_config)
+{ ...app_ctx__be_config, id: 'server_path' })

package/browser/index.d.ts

@@ -1,17 +1,21 @@
 import type { be_memo_pair_T, be_sig_triple_T } from 'ctx-core/rmemo'
 import type { Metafile } from 'esbuild'
+export declare const [
+	browser__metafile_path$_,
+	browser__metafile_path_,
+]:be_memo_pair_T<string>
 export declare const [
 	browser__metafile$_,
 	browser__metafile_,
 	browser__metafile__set
-]:be_sig_triple_T<Metafile|null|undefined>
+]:be_sig_triple_T<Metafile|undefined>
 export declare const [
 	browser__input_path$_,
 	browser__input_path_
 ]:be_memo_pair_T<string|undefined>
 export declare const [
-	browser__output_path$_,
-	browser__output_path_
+	browser__output__relative_path$_,
+	browser__output__relative_path_
 ]:be_memo_pair_T<string|undefined>
 export declare const [
 	browser__script$_,

package/browser/index.js

@@ -6,6 +6,12 @@ import { join } from 'path'
 import { browser_path_, browser_relative_path_ } from '../app/index.js'
 import { app_ctx__be_config, middleware_ctx__be_config } from '../ctx/index.js'
 import { server__input_path_ } from '../server/index.js'
+export const [
+	browser__metafile_path$_,
+	browser__metafile_path_,
+] = be_memo_pair_(ctx=>
+	join(browser_path_(ctx), 'metafile.json'),
+{ ...app_ctx__be_config, id: 'browser__metafile_path' })
 export const [
 	browser__metafile$_,
 	browser__metafile_,
@@ -13,12 +19,12 @@ export const [
 ] = be_sig_triple_(()=>
 	undefined,
 async (ctx, browser__metafile$)=>{
-	if (!browser__metafile$.lock) {
-		let metafile_path
-		browser__metafile$._ =
-			await file_exists_(metafile_path = join(browser_path_(ctx), 'metafile.json'))
-				? JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
-				: null
+	let metafile_path
+	if (
+		!browser__metafile$.lock
+		&& await file_exists_(metafile_path = join(browser_path_(ctx), 'metafile.json'))
+	) {
+		browser__metafile$._ = JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
 	}
 },
 { ...app_ctx__be_config, id: 'browser__metafile' })
@@ -36,8 +42,8 @@ export const [
 		}),
 { ...middleware_ctx__be_config, id: 'browser__input_path' })
 export const [
-	browser__output_path$_,
-	browser__output_path_
+	browser__output__relative_path$_,
+	browser__output__relative_path_
 ] = be_memo_pair_(ctx=>
 	nullish__none_([browser__metafile_(ctx), browser__input_path_(ctx)],
 		(browser__metafile, browser__input_path)=>{
@@ -48,12 +54,12 @@ export const [
 				}
 			}
 		}),
-{ ...middleware_ctx__be_config, id: 'browser__output_path' })
+{ ...middleware_ctx__be_config, id: 'browser__output__relative_path' })
 export const [
 	browser__script$_,
 	browser__script_,
 ] = be_memo_pair_(ctx=>
-	nullish__none_([browser__output_path_(ctx), browser_relative_path_(ctx)],
+	nullish__none_([browser__output__relative_path_(ctx), browser_relative_path_(ctx)],
 		(browser__output_path, browser_relative_path)=>
 			browser__output_path.replace(browser_relative_path, '')),
 { ...middleware_ctx__be_config, id: 'browser__script' })

package/browser/index.test.ts

@@ -1,13 +1,8 @@
-import { rmemo__wait } from 'ctx-core/all'
 import { test } from 'uvu'
 import { equal } from 'uvu/assert'
 import { app_ctx } from '../ctx/index.js'
 import { browser__metafile$_ } from './index.js'
 test('server__metafile', async ()=>{
 	equal(browser__metafile$_(app_ctx)._, undefined)
-	const val = await rmemo__wait(
-		browser__metafile$_(app_ctx),
-		val=>val !== undefined)
-	equal(val, null)
 })
 test.run()

package/build/index.d.ts

@@ -1,4 +1,5 @@
 import type { BuildOptions, Plugin } from 'esbuild'
 export declare function server__build(config?:Partial<BuildOptions>):Promise<void>
+export declare function server__external_(config?:Partial<BuildOptions>):Promise<string[]>
 export declare function browser__build(config?:Partial<BuildOptions>):Promise<void>
 export declare function rebuildjs_plugin_():Plugin

package/build/index.js

@@ -27,14 +27,12 @@ export async function server__build(config = {}) {
 		.crawl(app_path_(app_ctx))
 		.withPromise()
 	/** @type {string[]} */
-	const entryPoints = []
+	const entryPoints = config?.entryPoints ?? []
 	for (const path of path_a) {
 		entryPoints.push(path)
 	}
-	const external = ['bun', 'node_modules/*', ...(config.external || [])]
 	const plugins = [rebuildjs_plugin_(), ...(config.plugins || [])]
 	const esbuild_config = {
-		entryPoints,
 		entryNames: '[name]-[hash]',
 		assetNames: '[name]-[hash]',
 		bundle: true,
@@ -43,12 +41,13 @@ export async function server__build(config = {}) {
 		minify: is_prod_(app_ctx),
 		sourcemap: 'external',
 		...config,
+		entryPoints,
 		format: 'esm',
 		platform: 'node',
 		absWorkingDir: cwd_(app_ctx),
 		metafile: true,
 		outdir: server_path_(app_ctx),
-		external,
+		external: server__external_(config),
 		plugins,
 	}
 	if (is_prod_(app_ctx)) {
@@ -59,6 +58,13 @@ export async function server__build(config = {}) {
 		console.log('server__build|watch')
 	}
 }
+/**
+ * @param {Partial<BuildOptions>}config
+ * @returns {Promise<string[]>}
+ */
+export function server__external_(config) {
+	return ['bun', 'node_modules/*', ...(config.external || [])]
+}
 /**
  * @param {Plugin}config
  * @returns {Promise<void>}
@@ -73,14 +79,13 @@ export async function browser__build(config = {}) {
 		.crawl(app_path_(app_ctx))
 		.withPromise()
 	/** @type {string[]} */
-	const entryPoints = []
+	const entryPoints = config?.entryPoints ?? []
 	for (const path of path_a) {
 		entryPoints.push(path)
 	}
 	const plugins = [rebuildjs_plugin_(), ...(config.plugins || [])]
 	/** @type {BuildOptions} */
 	const esbuild_config = {
-		entryPoints,
 		entryNames: '[name]-[hash]',
 		assetNames: '[name]-[hash]',
 		bundle: true,
@@ -90,6 +95,7 @@ export async function browser__build(config = {}) {
 		minify: is_prod_(app_ctx),
 		sourcemap: 'external',
 		...config,
+		entryPoints,
 		format: 'esm',
 		platform: 'browser',
 		absWorkingDir: cwd_(app_ctx),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.6.0",
+  "version": "0.9.0",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",
@@ -45,8 +45,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@ctx-core/fs": "^1.4.34",
-    "ctx-core": "^4.17.0",
+    "@ctx-core/fs": "^1.4.35",
+    "ctx-core": "^4.18.0",
     "elysia": "^0.7.30",
     "esbuild": "^0.19.9",
     "fdir": "^6.1.1",

package/server/index.d.ts

@@ -1,5 +1,9 @@
 import type { be_memo_pair_T, be_sig_triple_T } from 'ctx-core/rmemo'
 import type { Metafile } from 'esbuild'
+export const [
+	server__metafile_path$_,
+	server__metafile_path_,
+] = be_memo_pair_T<string>
 export declare const [
 	server__metafile$_,
 	server__metafile_,
@@ -11,8 +15,8 @@ export declare const [
 	server__input_path__set
 ]:be_sig_triple_T<string|undefined>
 export declare const [
-	server__output_path$_,
-	server__output_path_
+	server__output__relative_path$_,
+	server__output__relative_path_
 ]:be_memo_pair_T<string|undefined>
 export declare const [
 	server__output$_,

package/server/index.js

@@ -4,7 +4,13 @@ import { be_lock_memosig_triple_, be_memo_pair_, be_sig_triple_ } from 'ctx-core
 import { readFile } from 'fs/promises'
 import { join } from 'path'
 import { cwd_, server_path_ } from '../app/index.js'
-import { middleware_ctx__be_config } from '../ctx/index.js'
+import { app_ctx__be_config, middleware_ctx__be_config } from '../ctx/index.js'
+export const [
+	server__metafile_path$_,
+	server__metafile_path_,
+] = be_memo_pair_(ctx=>
+	join(server_path_(ctx), 'metafile.json'),
+{ ...app_ctx__be_config, id: 'server__metafile_path' })
 export const [
 	server__metafile$_,
 	server__metafile_,
@@ -12,15 +18,14 @@ export const [
 ] = be_lock_memosig_triple_(()=>
 	undefined,
 async (ctx, server__metafile$)=>{
-	if (!server__metafile$.lock) {
-		let metafile_path
-		server__metafile$._ =
-			await file_exists_(metafile_path = join(server_path_(ctx), 'metafile.json'))
-				? JSON.parse(await readFile(metafile_path).then(buf=>buf.toString()))
-				: null
+	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()))
 	}
-},
-{ ...middleware_ctx__be_config, id: 'server__metafile' })
+}, { ...app_ctx__be_config, id: 'server__metafile' })
 export const [
 	server__input_path$_,
 	server__input_path_,
@@ -29,8 +34,8 @@ export const [
 	undefined,
 { ...middleware_ctx__be_config, id: 'server__input_path' })
 export const [
-	server__output_path$_,
-	server__output_path_
+	server__output__relative_path$_,
+	server__output__relative_path_
 ] = be_memo_pair_(ctx=>
 	nullish__none_(tup(server__metafile_(ctx), server__input_path_(ctx)),
 		(server__metafile, input_path)=>{
@@ -40,12 +45,12 @@ export const [
 				if (output.entryPoint === input_path) return output_path
 			}
 		}),
-{ ...middleware_ctx__be_config, id: 'server__output_path' })
+{ ...middleware_ctx__be_config, id: 'server__output__relative_path' })
 export const [
 	server__output$_,
 	server__output_
 ] = be_memo_pair_(ctx=>
-	nullish__none_(tup(server__metafile_(ctx), server__output_path_(ctx)),
+	nullish__none_(tup(server__metafile_(ctx), server__output__relative_path_(ctx)),
 		(server__metafile, output_path)=>
 			server__metafile.outputs[output_path]),
 { ...middleware_ctx__be_config, id: 'server__output' })

package/server/index.test.ts

@@ -1,13 +1,8 @@
-import { rmemo__wait } from 'ctx-core/rmemo'
 import { test } from 'uvu'
 import { equal } from 'uvu/assert'
 import { app_ctx } from '../ctx/index.js'
 import { server__metafile$_ } from './index.js'
 test('server__metafile', async ()=>{
 	equal(server__metafile$_(app_ctx)._, undefined)
-	const val = await rmemo__wait(
-		server__metafile$_(app_ctx),
-		val=>val !== undefined)
-	equal(val, null)
 })
 test.run()