@staticbolt/core 1.0.0-beta.1 → 1.0.0-beta.11

package/lib/plugins/index.mjs

@@ -1,5 +1,5 @@
-import { A as isHtmlMetadata, C as PrintFormattedError, D as filterScriptMetadata, E as traverse, F as isSvgMetadata, I as isTextAssetMetadata, L as isWebManifestMetadata, M as isPackageMetadata, N as isScriptMetadata, O as filterStyleMetadata, P as isStyleMetadata, R as isScriptType, S as valueOrError, T as generator, c as cloneObject, f as hashContent, g as isURL, j as isMarkdownMetadata, k as isBinaryAssetMetadata, l as downloadContent, p as humanReadableBytes, r as bytesToKB, t as DependencyTracker, u as escapeHtml, v as mergeMaps, w as printFmtError, x as safeReadFileSync, z as METADATA_TYPES } from "../dependency-tracker-BuZfopIj.mjs";
-import { _ as relative, c as extname, d as isSubpath, f as join, h as parse$2, i as CUSTOM_ATTRIBUTES, m as normalize, n as createLog, o as basename, p as matchPath, r as CONFIG_FILE_NAME, s as dirname, t as Log, u as isAbsolute, v as replaceExtension, y as resolve } from "../logger-BuxMGhij.mjs";
+import { A as isHtmlMetadata, B as DependencyTracker, C as PrintFormattedError, D as filterScriptMetadata, E as traverse, F as isSvgMetadata, I as isTextAssetMetadata, L as isWebManifestMetadata, M as isPackageMetadata, N as isScriptMetadata, O as filterStyleMetadata, P as isStyleMetadata, R as isScriptType, S as valueOrError, T as generator, _ as mergeMaps, b as safeReadFileSync, c as downloadContent, d as hashContent, f as humanReadableBytes, h as isURL, j as isMarkdownMetadata, k as isBinaryAssetMetadata, l as escapeHtml, n as bytesToKB, s as cloneObject, w as printFmtError, z as METADATA_TYPES } from "../utilities-CZmLMi93.mjs";
+import { _ as CUSTOM_ATTRIBUTES, a as extname, c as join, d as parse$2, g as CONFIG_FILE_NAME, h as resolve, i as dirname, l as matchPath, m as replaceExtension, n as createLog, o as isAbsolute, p as relative, r as basename, s as isSubpath, t as Log, u as normalize } from "../logger-BfIn1ytK.mjs";
 import { createRequire } from "node:module";
 import nodePath from "node:path";
 import { HTMLElement, NodeType, parse } from "@staticbolt/node-html-parser";
@@ -1146,6 +1146,7 @@ function parseOptionFromImgPath(imgPath, defaultQuality, defaultPreset) {
 function copyAssetsPlugin(options = {}) {
 	const include = options.include ?? ["sources/assets/**/*"];
 	const ignore = options.exclude ?? [];
+	const publicDirectory = options.publicDirectory ?? "public";
 	return {
 		name: "copy-assets",
 		postBuild() {
@@ -1157,7 +1158,6 @@ function copyAssetsPlugin(options = {}) {
 				nodir: true,
 				cwd: this.root
 			});
-			if (assetsFiles.length === 0) return;
 			for (const file of assetsFiles) {
 				const inputFile = join(this.root, file);
 				if (convertedImages.has(inputFile)) continue;
@@ -1167,6 +1167,20 @@ function copyAssetsPlugin(options = {}) {
 				mkdirSync(dirname(outputFile), { recursive: true });
 				copyFileSync(inputFile, outputFile);
 			}
+			const publicFiles = globSync("**/*", {
+				ignore,
+				nodir: true,
+				cwd: join(this.root, publicDirectory)
+			});
+			for (const file of publicFiles) {
+				const inputFile = join(this.root, publicDirectory, file);
+				if (convertedImages.has(inputFile)) continue;
+				if (optimizedSvgList.has(inputFile)) continue;
+				const outputFile = join(this.outdir, file);
+				if (existsSync(outputFile)) continue;
+				mkdirSync(dirname(outputFile), { recursive: true });
+				copyFileSync(inputFile, outputFile);
+			}
 		}
 	};
 }
@@ -2421,7 +2435,7 @@ function loadSourcesPlugin(options) {
 	const ignore = options.exclude ?? [];
 	return {
 		name: "load-sources",
-		async setup() {
+		setup() {
 			const entryFiles = globSync(options.include, {
 				ignore,
 				cwd: this.root,
@@ -2436,16 +2450,6 @@ function loadSourcesPlugin(options) {
 				this.entryPoints.add(normalized);
 				this.watcher?.add(normalized);
 			}
-			if (!this.production) return;
-			for (const entryFile of this.entryPoints) {
-				if (this.findMetadata({ id: entryFile })) continue;
-				const metadata = await this.load(entryFile);
-				if (!metadata) {
-					this.log.error(`Could not load "${entryFile}".`);
-					return;
-				}
-				this.addMetadata(metadata);
-			}
 		},
 		onFileEvent(event, id) {
 			if (event === "change") return;
@@ -3071,29 +3075,24 @@ function htmlBuildTimeScript(options = {}) {
 //#region src/plugins/html-bundle-script/esbuild-plugin.ts
 function loaderPlugin(outFile, checkExternal) {
 	const root = this.root;
-	const appThis = () => this;
+	const outFileAbs = join(root, outFile);
+	const app = this;
 	return {
 		name: "resolve-loader",
 		setup(build) {
 			build.onResolve({ filter: /\.(js|mjs|cjs)$/ }, (arguments_) => {
 				if (!arguments_.path.startsWith(".")) return;
-				const app = appThis();
 				const absSource = join(arguments_.resolveDir, arguments_.path);
 				const source = relative(root, absSource);
-				const relativeToOutFile = relative(dirname(outFile), source);
-				const external = checkExternal(source);
-				if (external) return {
-					path: relativeToOutFile,
-					external
+				if (checkExternal(source)) return {
+					path: relative(dirname(outFile), source),
+					external: true
 				};
 				if (matchPath(source, {
 					include: ["**/node_modules/**"],
 					ignore: [],
 					root
-				})) return {
-					path: absSource,
-					external
-				};
+				})) return { path: absSource };
 				const scriptMetadata = app.findMetadata({ filePath: source });
 				if (!isScriptMetadata(scriptMetadata)) {
 					Log.error(`[htmlBundleScriptPlugin:onResolve] Script metadata for the path "${source}" not found`);
@@ -3102,8 +3101,7 @@ function loaderPlugin(outFile, checkExternal) {
 				return {
 					path: absSource,
 					namespace: "loader",
-					pluginData: scriptMetadata,
-					external
+					pluginData: scriptMetadata
 				};
 			});
 			build.onLoad({
@@ -3115,9 +3113,11 @@ function loaderPlugin(outFile, checkExternal) {
 					Log.error(`[htmlBundleScriptPlugin:onLoad] Script metadata for the path "${arguments_.path}" not found."`);
 					return;
 				}
+				const clone = app.clone(scriptMetadata);
+				await app.rebase(clone, outFileAbs);
 				return {
-					contents: await appThis().stringify(scriptMetadata),
-					resolveDir: dirname(arguments_.path),
+					contents: await app.stringify(clone),
+					resolveDir: dirname(outFileAbs),
 					loader: "js"
 				};
 			});
@@ -3161,22 +3161,21 @@ async function bundleScriptWithEsbuild(options) {
 //#endregion
 //#region src/plugins/html-bundle-script/html-bundle-script-plugin.ts
 /**
-* A plugin that bundles `<script>` tags in HTML files using esbuild.
+* A plugin that bundles script tags in HTML files using esbuild.
 *
-* Bundling is opt-in per script tag via the `bundle` attribute (configurable via {@link HtmlBundleScriptOptions.bundleAttribute}).
+* Bundling is opt-in per script tag via the "bundle" attribute (configurable via HtmlBundleScriptOptions.bundleAttribute).
 *
-* **Inlining vs. separate file**
+* Inlining vs. separate file
 *
-* - Inline script, no `bundle-out` attribute —> bundled output replaces the tag's content in place.
-* - Inline script, `bundle-out` attribute set —> tag content is cleared and `src` is set to the output file.
-* - `src` script, no `bundle-out` attribute —> bundle is written to `{filename}.bundle.js` and `src` is updated to point to it.
-* - `src` script, `bundle-out` attribute set —> bundle is written to the specified path and `src` is updated to point to it.
+* - Inline script, no "bundle-out" attribute: bundled output replaces the tag content in place.
+* - Inline script, "bundle-out" attribute set: tag content is cleared and "src" is set to the output file.
+* - "src" script, no "bundle-out" attribute: bundle is written to "{filename}.bundle.js" and "src" is updated.
+* - "src" script, "bundle-out" attribute set: bundle is written to the specified path and "src" is updated.
 *
-* **Externals resolution**
+* Externals resolution
 *
-* Glob patterns in {@link HtmlBundleScriptOptions.externals} and {@link HtmlBundleScriptOptions.externalsExclude} are matched
-* against each resolved module path. A module is treated as external if it matches `externals` and does not match
-* `externalsExclude`.
+* Glob patterns in HtmlBundleScriptOptions.externals and HtmlBundleScriptOptions.externalsExclude are matched against each
+* resolved module path. A module is treated as external if it matches "externals" and does not match "externalsExclude".
 */
 function htmlBundleScriptPlugin(options = {}) {
 	const defaultExternal = options.externals ?? ["**/node_modules/**"];
@@ -3207,6 +3206,7 @@ function htmlBundleScriptPlugin(options = {}) {
 					}
 				});
 			}
+			return sources;
 		},
 		async transform(metadata) {
 			if (!isHtmlMetadata(metadata)) return;
@@ -3240,28 +3240,42 @@ function htmlBundleScriptPlugin(options = {}) {
 				let entryPoint = "";
 				let outfile = "";
 				let contents = "";
-				if (bundleOut) outfile = bundleOut;
 				if (hasContent) {
-					contents = await this.stringify(scriptMetadata);
-					entryPoint = metadata.filePath;
-					if (!bundleOut) outfile = filePath;
-					if (!inline) node.textContent = "";
-				}
-				if (scriptSource) {
-					entryPoint = join(dirname(filePath), scriptSource);
-					if (!bundleOut) {
-						const outFileName = replaceExtension(basename(scriptSource), ".bundle.js");
-						outfile = join(dirname(filePath), outFileName);
+					outfile = bundleOut ?? filePath;
+					if (inline) {
+						entryPoint = metadata.filePath;
+						contents = await this.stringify(scriptMetadata);
+					} else {
+						node.textContent = "";
+						if (this.findMetadata({ filePath: outfile })) {
+							this.log.info(`The entry point "${entryPoint}" is already bundled in "${outfile}", skipping...`);
+							if (scriptMetadataID) metadata.scriptsMetadataList.delete(scriptMetadataID);
+							node.setAttribute("src", relative(dirname(filePath), outfile));
+							continue;
+						}
+						entryPoint = outfile;
+						const clone = this.clone(scriptMetadata);
+						await this.rebase(clone, join(this.root, outfile));
+						contents = await this.stringify(clone);
+					}
+				} else if (scriptSource) {
+					outfile = bundleOut ?? normalize(replaceExtension(basename(scriptSource), ".bundle.js"));
+					entryPoint = outfile;
+					if (this.findMetadata({ filePath: outfile })) {
+						this.log.info(`The entry point "${entryPoint}" is already bundled in "${outfile}", skipping...`);
+						continue;
 					}
-					const scriptMetadata = this.findMetadata({ filePath: entryPoint });
-					if (!isScriptMetadata(scriptMetadata)) {
+					const sourceScriptMetadata = this.findMetadata({ filePath: join(dirname(filePath), scriptSource) });
+					if (!isScriptMetadata(sourceScriptMetadata)) {
 						printFmtError(`Script metadata for the path "${entryPoint}" not found`, {
 							node,
 							filePath
 						});
 						continue;
 					}
-					contents = await this.stringify(scriptMetadata);
+					const clone = this.clone(sourceScriptMetadata);
+					await this.rebase(clone, join(this.root, outfile));
+					contents = await this.stringify(clone);
 				}
 				const checkExternal = (string) => {
 					return matchPath(string, {
@@ -3283,7 +3297,7 @@ function htmlBundleScriptPlugin(options = {}) {
 					});
 					continue;
 				}
-				const newMetadataPath = normalize(inline ? metadata.filePath : outfile);
+				const newMetadataPath = normalize(inline ? filePath : outfile);
 				const newScriptMetadata = await this.load(newMetadataPath, {
 					code: bundleString,
 					type: "js"
@@ -3838,11 +3852,11 @@ function htmlInsertPlugin(options = {}) {
 //#endregion
 //#region src/plugins/html-layout/fill-placeholders.ts
 /** (any){{any}} */
-const placeholderRe$1 = /(\\)?{{\s*([\s\S]*?)\s*}}/g;
+const placeholderRe$2 = /(\\)?{{\s*([\s\S]*?)\s*}}/g;
 /** `{{ JavaScript expression }}` */
 function fillLayoutPlaceholders(html, placeholders) {
 	const errors = [];
-	const result = html.replace(placeholderRe$1, (match, escape, content) => {
+	const result = html.replace(placeholderRe$2, (match, escape, content) => {
 		if (escape === "\\") return match.slice(1);
 		const [expression, executeError] = executeExpression$1(content, placeholders);
 		if (executeError) {
@@ -4488,11 +4502,11 @@ function cutLeadingSubpath(pathToCut, leadingSubpath) {
 //#endregion
 //#region src/plugins/html-pages/fill-placeholders.ts
 /** (any){{any}} */
-const placeholderRe = /(\\)?{{\s*([\s\S]*?)\s*}}/g;
+const placeholderRe$1 = /(\\)?{{\s*([\s\S]*?)\s*}}/g;
 /** `{{ JavaScript expression }}` */
 function fillPlaceholders(html, routeData) {
 	const errors = [];
-	const result = html.replace(placeholderRe, (match, escape, content) => {
+	const result = html.replace(placeholderRe$1, (match, escape, content) => {
 		if (escape === "\\") return match.slice(1);
 		const [expression, executeError] = executeExpression(content, routeData);
 		if (executeError) {
@@ -5054,6 +5068,8 @@ function stringifySrcset(entries) {
 	for (const entry of entries) srcset += entry.descriptor ? `, ${entry.url} ${entry.descriptor}` : `, ${entry.url}`;
 	return srcset;
 }
+/** Match placeholders [[ has $ ]] or {{ has $ }} */
+const placeholderRe = /(?:\[\[([^\]]*\$[^\]]*?)\]\]|\{\{([^}]*\$[^}]*?)\}\})/;
 function parseHtmlSources(ast) {
 	const links = [];
 	for (const node of ast.querySelectorAll(combinedSelector)) {
@@ -5065,19 +5081,23 @@ function parseHtmlSources(ast) {
 			if (!value) continue;
 			if (attribute === "srcset") {
 				const entries = parseSrcset(value);
-				for (const [index, entry] of entries.entries()) links.push({
-					node,
-					get source() {
-						return decodeURIComponent(entry.url);
-					},
-					set source(newValue) {
-						const current = parseSrcset(node.getAttribute("srcset") || "");
-						current[index].url = newValue;
-						node.setAttribute("srcset", stringifySrcset(current));
-					}
-				});
+				for (const [index, entry] of entries.entries()) {
+					if (placeholderRe.test(entry.url)) continue;
+					links.push({
+						node,
+						get source() {
+							return decodeURIComponent(entry.url);
+						},
+						set source(newValue) {
+							const current = parseSrcset(node.getAttribute("srcset") || "");
+							current[index].url = newValue;
+							node.setAttribute("srcset", stringifySrcset(current));
+						}
+					});
+				}
 				continue;
 			}
+			if (placeholderRe.test(value)) continue;
 			links.push({
 				node,
 				get source() {
@@ -5095,7 +5115,10 @@ function parseHtmlSources(ast) {
 //#endregion
 //#region src/parsers/html-parser.ts
 function parseHtmlUnsafe(html, options = {}) {
-	return parse(html, options);
+	return parse(html, {
+		comment: true,
+		...options
+	});
 }
 /** Parse HTML string and return the root node */
 const parseHtml = valueOrError(parseHtmlUnsafe);
@@ -5198,24 +5221,25 @@ function coreHtmlPlugin(options = {}) {
 			const nodeIdMap = /* @__PURE__ */ new Map();
 			const scriptsAndStyles = metadata.ast.querySelectorAll("script,style");
 			for (const node of scriptsAndStyles) {
-				const minifyTag = minify || node.hasAttribute(minifyAttribute);
-				node.removeAttribute(minifyAttribute);
-				const id = node.getAttribute(CUSTOM_ATTRIBUTES.MetadataID);
-				if (!id) continue;
-				nodeIdMap.set(node, id);
-				node.removeAttribute(CUSTOM_ATTRIBUTES.MetadataID);
+				const hasMinifyAttribute = node.hasAttribute(minifyAttribute);
+				const shouldMinify = minify || hasMinifyAttribute;
 				const isScript = node.tagName === "SCRIPT";
+				node.removeAttribute(minifyAttribute);
 				const scriptType = node.getAttribute("type");
 				if (isScript && !isScriptType(scriptType)) continue;
-				const tagMetadata = metadata[isScript ? "scriptsMetadataList" : "stylesMetadataList"].get(id);
+				const metadataID = node.getAttribute(CUSTOM_ATTRIBUTES.MetadataID);
+				if (!metadataID) continue;
+				nodeIdMap.set(node, metadataID);
+				node.removeAttribute(CUSTOM_ATTRIBUTES.MetadataID);
+				const tagMetadata = metadata[isScript ? "scriptsMetadataList" : "stylesMetadataList"].get(metadataID);
 				if (!tagMetadata) continue;
 				const code = await this.stringify(tagMetadata, {
-					format: format && !minifyTag,
-					minify: minifyTag
+					format: format && !shouldMinify,
+					minify: shouldMinify
 				});
 				if (!code) continue;
 				node.textContent = code;
-				if (format && minifyTag) node.replaceWith(ignoreFormatComment + node.outerHTML);
+				if (format && hasMinifyAttribute) node.replaceWith(ignoreFormatComment + node.outerHTML);
 			}
 			const code = metadata.ast.toString();
 			for (const [node, metadataID] of nodeIdMap) node.setAttribute(CUSTOM_ATTRIBUTES.MetadataID, metadataID);
@@ -5380,12 +5404,8 @@ function coreMarkdownPlugin(options = {}) {
 
 //#endregion
 //#region src/ast-utilities/babel-utils/parse-script-srouces.ts
-function parseScriptSources({ ast, filePath }) {
+function parseScriptSources({ ast }) {
 	const result = [];
-	const printFmtError = PrintFormattedError.create({
-		function: parseScriptSources,
-		filePath
-	});
 	t.traverseFast(ast, (node) => {
 		if (t.isImportDeclaration(node)) {
 			if (!t.isStringLiteral(node.source)) return;
@@ -5459,10 +5479,7 @@ function parseScriptSources({ ast, filePath }) {
 		if (t.isNewExpression(node)) {
 			if (!t.isIdentifier(node.callee, { name: "URL" })) return;
 			const firstArgument = node.arguments[0];
-			if (!t.isStringLiteral(firstArgument)) {
-				printFmtError("The first argument of `URL` should be a string", { node });
-				return;
-			}
+			if (!t.isStringLiteral(firstArgument)) return;
 			const setSource = (newValue) => {
 				node.arguments[0] = t.stringLiteral(newValue);
 			};
@@ -6048,6 +6065,7 @@ function developmentServerPlugin(options = {}) {
 	function upgradeWebSocketHandler(request, socket, head) {
 		websocket.handleUpgrade(request, socket, head, (ws) => {
 			wsClients.add(ws);
+			websocket.emit("connection", ws, request);
 			ws.send(JSON.stringify({ data: "connected" }));
 			ws.on("close", () => {
 				wsClients.delete(ws);
@@ -6084,6 +6102,14 @@ function developmentServerPlugin(options = {}) {
 				}
 				this.log.info(c.bold("Server listening on"), c.green(address + entry));
 			});
+			websocket.on("connection", () => {
+				const sortedByAge = Array.from(entryPointAgeMap).toSorted((a, b) => a[1] - b[1]).map(([id]) => id);
+				const excess = sortedByAge.length - wsClients.size;
+				if (excess > 0) for (const id of sortedByAge.slice(0, excess)) {
+					entryPointAgeMap.delete(id);
+					removeAndPruneOrphans(this.metadataList, id);
+				}
+			});
 		},
 		async onFileEvent(event, changedSource) {
 			if (event === "unlink") {
@@ -6101,11 +6127,15 @@ function developmentServerPlugin(options = {}) {
 				if (oldMetadataList.length === 0) continue;
 				const oldDeps = new Set(oldMetadataList.flatMap((m) => Array.from(m.directDependencies)));
 				this.removeMetadata(oldMetadataList);
-				await this.process(id);
+				if (!await this.process(id)) {
+					this.addMetadata(oldMetadataList);
+					continue;
+				}
 				const newMetadataList = this.filterMetadata({ id });
 				const newDeps = new Set(newMetadataList.flatMap((m) => Array.from(m.directDependencies)));
 				const removedDeps = Array.from(oldDeps).filter((dep) => !newDeps.has(dep));
-				for (const dep of removedDeps) if (!this.metadataList.some((m) => m.directDependencies && m.directDependencies.has(dep))) {
+				for (const dep of removedDeps) {
+					if (this.metadataList.some((m) => m.directDependencies && m.directDependencies.has(dep))) continue;
 					const orphans = this.filterMetadata({ id: dep });
 					if (orphans && orphans.length > 0) this.removeMetadata(orphans);
 				}
@@ -6135,12 +6165,6 @@ function developmentServerPlugin(options = {}) {
 			if (this.entryPoints.has(metadata.id) && isHtmlMetadata(metadata)) {
 				injectReloadScript(metadata);
 				entryPointAgeMap.set(metadata.id, Date.now());
-				const sortedByAge = Array.from(entryPointAgeMap).toSorted((a, b) => a[1] - b[1]).map(([id]) => id);
-				const excess = sortedByAge.length - wsClients.size;
-				if (excess > 0) for (const id of sortedByAge.slice(0, excess)) {
-					entryPointAgeMap.delete(id);
-					removeAndPruneOrphans(this.metadataList, id);
-				}
 			}
 			const stringified = await this.stringify(metadata);
 			if (typeof stringified !== "string") return;
@@ -6555,6 +6579,15 @@ var App = class {
 			this.log.info("Dev mode: on-demand build active, skipping build pipeline");
 			return;
 		}
+		for (const entryFile of this.entryPoints) {
+			if (this.findMetadata({ id: entryFile })) continue;
+			const metadata = await this.load(entryFile);
+			if (!metadata) {
+				this.log.error(`Could not load "${entryFile}".`);
+				return;
+			}
+			this.addMetadata(metadata);
+		}
 		this.log.info(`Resolving ${this.metadataList.length} entry point(s)`);
 		await this.resolveAndLoad(this.metadataList);
 		this.log.info(`Transforming ${this.metadataList.length} file(s)`);
@@ -6572,7 +6605,7 @@ var App = class {
 		const metadata = await this.load(id);
 		if (!metadata) {
 			this.log.error(`Could not load "${id}".`);
-			return;
+			return false;
 		}
 		const metadataList = await this.resolveAndLoad(metadata);
 		const previouslyTransformed = new Set(this.metadataList);
@@ -6580,6 +6613,7 @@ var App = class {
 		for (const plugin of this.plugins) await this.callPluginMethod(plugin, "preTransform");
 		for (const plugin of this.plugins) for (const metadataItem of this.metadataList) if (!previouslyTransformed.has(metadataItem)) await this.callPluginMethod(plugin, "transform", metadataItem);
 		for (const plugin of this.plugins) await this.callPluginMethod(plugin, "postTransform");
+		return true;
 	}
 	async resolve(metadata) {
 		if (!this.isPluginInitialized) this.log.warn("[resolve] Plugins are not fully setup yet.");