@awesomeness-js/server 1.1.6 → 1.1.8

package/index.js

@@ -1,105 +1,105 @@
-/**
- * This file is auto-generated by the build script.
- * It consolidates API functions for use in the application.
- * Do not edit manually.
- */
-import _applicationMap from './src/applicationMap.js';
-import _awesomenessNormalizeRequest from './src/awesomenessNormalizeRequest.js';
-import _brotliJsonResponse from './src/brotliJsonResponse.js';
-import _checkAccess from './src/checkAccess.js';
-import _componentDependencies from './src/componentDependencies.js';
-import _config from './src/config.js';
-import _fetchPage from './src/fetchPage.js';
-import _getConfig from './src/getConfig.js';
-import _getMD from './src/getMD.js';
-import _init from './src/init.js';
-import _koa_attachAwesomenessRequest from './src/koa/attachAwesomenessRequest.js';
-import _koa_cors from './src/koa/cors.js';
-import _koa_errorHandler from './src/koa/errorHandler.js';
-import _koa_finalFormat from './src/koa/finalFormat.js';
-import _koa_jsonBodyParser from './src/koa/jsonBodyParser.js';
-import _koa_routeRequest from './src/koa/routeRequest.js';
-import _koa_serverUp from './src/koa/serverUp.js';
-import _koa_staticFiles from './src/koa/staticFiles.js';
-import _koa_timeout from './src/koa/timeout.js';
-import _pageInfo from './src/pageInfo.js';
-import _reRoute from './src/reRoute.js';
-import _resolveRealCasePath from './src/resolveRealCasePath.js';
-import _specialPaths from './src/specialPaths.js';
-import _start from './src/start.js';
-import _validateRequest from './src/validateRequest.js';
-import _ws_handlers from './src/ws/handlers.js';
-import _ws_index from './src/ws/index.js';
-
-export { _applicationMap as applicationMap };
-export { _awesomenessNormalizeRequest as awesomenessNormalizeRequest };
-export { _brotliJsonResponse as brotliJsonResponse };
-export { _checkAccess as checkAccess };
-export { _componentDependencies as componentDependencies };
-export { _config as config };
-export { _fetchPage as fetchPage };
-export { _getConfig as getConfig };
-export { _getMD as getMD };
-export { _init as init };
-export { _pageInfo as pageInfo };
-export { _reRoute as reRoute };
-export { _resolveRealCasePath as resolveRealCasePath };
-export { _specialPaths as specialPaths };
-export { _start as start };
-export { _validateRequest as validateRequest };
-
-export const koa = {
-	attachAwesomenessRequest: _koa_attachAwesomenessRequest,
-	cors: _koa_cors,
-	errorHandler: _koa_errorHandler,
-	finalFormat: _koa_finalFormat,
-	jsonBodyParser: _koa_jsonBodyParser,
-	routeRequest: _koa_routeRequest,
-	serverUp: _koa_serverUp,
-	staticFiles: _koa_staticFiles,
-	timeout: _koa_timeout
-};
-
-export const ws = {
-	handlers: _ws_handlers,
-	index: _ws_index
-};
-
-
-export default {
-	applicationMap: _applicationMap,
-	awesomenessNormalizeRequest: _awesomenessNormalizeRequest,
-	brotliJsonResponse: _brotliJsonResponse,
-	checkAccess: _checkAccess,
-	componentDependencies: _componentDependencies,
-	config: _config,
-	fetchPage: _fetchPage,
-	getConfig: _getConfig,
-	getMD: _getMD,
-	init: _init,
-	pageInfo: _pageInfo,
-	reRoute: _reRoute,
+/**
+ * This file is auto-generated by the build script.
+ * It consolidates API functions for use in the application.
+ * Do not edit manually.
+ */
+import _applicationMap from './src/applicationMap.js';
+import _awesomenessNormalizeRequest from './src/awesomenessNormalizeRequest.js';
+import _brotliJsonResponse from './src/brotliJsonResponse.js';
+import _checkAccess from './src/checkAccess.js';
+import _componentDependencies from './src/componentDependencies.js';
+import _config from './src/config.js';
+import _fetchPage from './src/fetchPage.js';
+import _getConfig from './src/getConfig.js';
+import _getMD from './src/getMD.js';
+import _init from './src/init.js';
+import _koa_attachAwesomenessRequest from './src/koa/attachAwesomenessRequest.js';
+import _koa_cors from './src/koa/cors.js';
+import _koa_errorHandler from './src/koa/errorHandler.js';
+import _koa_finalFormat from './src/koa/finalFormat.js';
+import _koa_jsonBodyParser from './src/koa/jsonBodyParser.js';
+import _koa_routeRequest from './src/koa/routeRequest.js';
+import _koa_serverUp from './src/koa/serverUp.js';
+import _koa_staticFiles from './src/koa/staticFiles.js';
+import _koa_timeout from './src/koa/timeout.js';
+import _pageInfo from './src/pageInfo.js';
+import _reRoute from './src/reRoute.js';
+import _resolveRealCasePath from './src/resolveRealCasePath.js';
+import _specialPaths from './src/specialPaths.js';
+import _start from './src/start.js';
+import _validateRequest from './src/validateRequest.js';
+import _ws_handlers from './src/ws/handlers.js';
+import _ws_index from './src/ws/index.js';
+
+export { _applicationMap as applicationMap };
+export { _awesomenessNormalizeRequest as awesomenessNormalizeRequest };
+export { _brotliJsonResponse as brotliJsonResponse };
+export { _checkAccess as checkAccess };
+export { _componentDependencies as componentDependencies };
+export { _config as config };
+export { _fetchPage as fetchPage };
+export { _getConfig as getConfig };
+export { _getMD as getMD };
+export { _init as init };
+export { _pageInfo as pageInfo };
+export { _reRoute as reRoute };
+export { _resolveRealCasePath as resolveRealCasePath };
+export { _specialPaths as specialPaths };
+export { _start as start };
+export { _validateRequest as validateRequest };
+
+export const koa = {
+	attachAwesomenessRequest: _koa_attachAwesomenessRequest,
+	cors: _koa_cors,
+	errorHandler: _koa_errorHandler,
+	finalFormat: _koa_finalFormat,
+	jsonBodyParser: _koa_jsonBodyParser,
+	routeRequest: _koa_routeRequest,
+	serverUp: _koa_serverUp,
+	staticFiles: _koa_staticFiles,
+	timeout: _koa_timeout
+};
+
+export const ws = {
+	handlers: _ws_handlers,
+	index: _ws_index
+};
+
+
+export default {
+	applicationMap: _applicationMap,
+	awesomenessNormalizeRequest: _awesomenessNormalizeRequest,
+	brotliJsonResponse: _brotliJsonResponse,
+	checkAccess: _checkAccess,
+	componentDependencies: _componentDependencies,
+	config: _config,
+	fetchPage: _fetchPage,
+	getConfig: _getConfig,
+	getMD: _getMD,
+	init: _init,
+	pageInfo: _pageInfo,
+	reRoute: _reRoute,
 	/**
 	 * Case-insensitive real path resolver.
 	 * Works correctly on Windows, macOS, and Linux/Docker.
-	 */
-	resolveRealCasePath: _resolveRealCasePath,
-	specialPaths: _specialPaths,
-	start: _start,
-	validateRequest: _validateRequest,
-	koa: {
-		attachAwesomenessRequest: _koa_attachAwesomenessRequest,
-		cors: _koa_cors,
-		errorHandler: _koa_errorHandler,
-		finalFormat: _koa_finalFormat,
-		jsonBodyParser: _koa_jsonBodyParser,
-		routeRequest: _koa_routeRequest,
-		serverUp: _koa_serverUp,
-		staticFiles: _koa_staticFiles,
-		timeout: _koa_timeout,
-	},
-	ws: {
-		handlers: _ws_handlers,
-		index: _ws_index,
-	},
+	 */
+	resolveRealCasePath: _resolveRealCasePath,
+	specialPaths: _specialPaths,
+	start: _start,
+	validateRequest: _validateRequest,
+	koa: {
+		attachAwesomenessRequest: _koa_attachAwesomenessRequest,
+		cors: _koa_cors,
+		errorHandler: _koa_errorHandler,
+		finalFormat: _koa_finalFormat,
+		jsonBodyParser: _koa_jsonBodyParser,
+		routeRequest: _koa_routeRequest,
+		serverUp: _koa_serverUp,
+		staticFiles: _koa_staticFiles,
+		timeout: _koa_timeout,
+	},
+	ws: {
+		handlers: _ws_handlers,
+		index: _ws_index,
+	},
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@awesomeness-js/server",
-	"version": "1.1.6",
+	"version": "1.1.8",
 	"description": "Awesomeness Multi-Site Server",
 	"author": "Scott Forte",
 	"type": "module",

package/src/componentDependencies.js

@@ -4,7 +4,6 @@ import { each, getAllFiles } from "@awesomeness-js/utils";
 import { readFileSync } from "fs";
 import getConfig from "./getConfig.js";
 
-
 function urlToFsPath(u) {
 
 	if (!(u instanceof URL)) {
@@ -51,12 +50,15 @@ function extractUiFirstParts(str) {
 
 }
 
-export default function componentDependencies(allComponents, {
-	componentLocations = [],
-	namespace = "ui",
-	showDetails = false,
-	ignore = [ "*.css.js" ],
-} = {}) {
+export default function componentDependencies(
+	allComponents,
+	{
+		componentLocations = [],
+		namespace = "ui",
+		showDetails = false,
+		ignore = [ "*.css.js" ],
+	} = {}
+) {
 
 	const awesomenessConfig = getConfig();
 
@@ -80,17 +82,12 @@ export default function componentDependencies(allComponents, {
 
 				// baseUrl should point at a directory; we resolve component under it
 				const componentUrl = new URL(`./${component}/`, baseUrl);
-        
+
+				
 				return path.resolve(urlToFsPath(componentUrl));
 			
 			});
 
-			// console.log({
-			// 	"import.meta.url =": import.meta.url,
-			// 	component,
-			// 	candidateRoots 
-			// });
-
 			let allFiles;
 			let chosenRoot;
 			let lastErr;
@@ -99,26 +96,24 @@ export default function componentDependencies(allComponents, {
 
 				try {
 
+					// IMPORTANT: pass root so getAllFiles returns paths relative to the scan root
 					allFiles = getAllFiles(".", {
 						dir: root,
-						ignore 
+						root,
+						ignore,
 					});
 
 					chosenRoot = root;
-
 					break; // first match wins
 				
-				} catch(e) {
+				} catch (e) {
 
-					// try next
 					lastErr = e;
 				
 				}
 			
 			}
 
-
-
 			if (!allFiles) {
 
 				throw {
@@ -131,48 +126,51 @@ export default function componentDependencies(allComponents, {
 			}
 
 			if (
-				awesomenessConfig.debug_componentDependencies
-				&& Array.isArray(awesomenessConfig.debug_componentDependencies)
-				&& awesomenessConfig.debug_componentDependencies.includes(component)
+				awesomenessConfig.debug_componentDependencies &&
+				Array.isArray(awesomenessConfig.debug_componentDependencies) &&
+				awesomenessConfig.debug_componentDependencies.includes(component)
 			) {
 
 				console.log("[awesomenessConfig.debug componentDependencies] chosenRoot:", chosenRoot);
 				console.log("[awesomenessConfig.debug componentDependencies] allFiles count:", allFiles.length);
 				console.log("[awesomenessConfig.debug componentDependencies] first 50 files:", allFiles.slice(0, 50));
-				console.log("[awesomenessConfig.debug componentDependencies] any non-string:", allFiles.some((f) => typeof f !== "string"));
-				console.log("[awesomenessConfig.debug componentDependencies] any absolute:", allFiles.some((f) => path.isAbsolute(f)));
-
+				console.log(
+					"[awesomenessConfig.debug componentDependencies] any non-string:",
+					allFiles.some((f) => typeof f !== "string")
+				);
+				console.log(
+					"[awesomenessConfig.debug componentDependencies] any absolute:",
+					allFiles.some((f) => path.isAbsolute(f))
+				);
+			
 			}
 
 			allFiles.forEach((file) => {
 
 				const normalizedPath = path.normalize(file);
-				const pathSegments = normalizedPath.split(path.sep);
 
-				const variableIndex = pathSegments.indexOf(component);
-
-				let fileNameFull = pathSegments[pathSegments.length - 1];
+				const fileNameFull = path.basename(normalizedPath);
 				const fileTypeArr = fileNameFull.split(".");
-				const fileType = fileTypeArr[fileTypeArr.length - 1];
+				const fileType = fileTypeArr[fileTypeArr.length - 1].toLowerCase();
 				const fileName = fileTypeArr.slice(0, -1).join(".");
 
 				out[component] = out[component] || {};
 				out[component][fileType] = out[component][fileType] || {};
 
-				let arrAfterComponent = pathSegments.slice(variableIndex + 1);
-
-				arrAfterComponent.pop();
+				// Build tail from the file's relative directory (NOT by searching for `component` in the path)
+				const dir = path.dirname(normalizedPath);
+				const dirParts = dir === "." ? [] : dir.split(path.sep);
 
 				let tail = "";
 
 				if (fileType === "js" || fileType === "css") {
 
-					if (arrAfterComponent.length > 0) {
+					if (dirParts.length > 0) {
 
 						tail =
-              fileName === "index"
-              	? "." + arrAfterComponent.join(".")
-              	: `.${arrAfterComponent.join(".")}.${fileName}`;
+							fileName === "index"
+								? "." + dirParts.join(".")
+								: `.${dirParts.join(".")}.${fileName}`;
 					
 					} else {
 
@@ -186,7 +184,10 @@ export default function componentDependencies(allComponents, {
 
 				try {
 
-					const fileContent = readFileSync(path.join(chosenRoot, file), "utf-8");
+					// readFileSync must use chosenRoot + relative file path
+					const filePath = path.isAbsolute(file) ? file : path.join(chosenRoot, file);
+					const fileContent = readFileSync(filePath, "utf-8");
+
 					const lines = fileContent.split("\n");
 					let fileWithImportsStripped = "";
 
@@ -225,7 +226,9 @@ export default function componentDependencies(allComponents, {
 
 								if (imports.length > 1) {
 
-									const importComponents = imports[1].split(",").map((c) => c.trim());
+									const importComponents = imports[1]
+										.split(",")
+										.map((c) => c.trim());
 
 									importComponents.forEach((importComponent) => {
 
@@ -243,15 +246,17 @@ export default function componentDependencies(allComponents, {
 							}
 						
 						} else if (
-							line.startsWith("// awesomeness import") 
-							|| line.startsWith("/* awesomeness @import")
+							line.startsWith("// awesomeness import") ||
+							line.startsWith("/* awesomeness @import")
 						) {
 
 							const importPathMatch = line.match(/['"]([^'"]+)['"]/);
 
 							if (importPathMatch) {
 
-								const importedComponentName = importPathMatch[1].replace(/;$/, "").trim();
+								const importedComponentName = importPathMatch[1]
+									.replace(/;$/, "")
+									.trim();
 
 								if (!allComponents.includes(importedComponentName)) {
 
@@ -273,8 +278,8 @@ export default function componentDependencies(allComponents, {
 					if (fileType === "js") {
 
 						if (
-							fileWithImportsStripped.startsWith("(function") 
-							|| fileWithImportsStripped.startsWith("((")
+							fileWithImportsStripped.startsWith("(function") ||
+							fileWithImportsStripped.startsWith("((")
 						) {
 
 							fileWithImportsStripped = `;${fileWithImportsStripped}`;
@@ -294,8 +299,7 @@ export default function componentDependencies(allComponents, {
 				
 				} catch (err) {
 
-					console.log("Failed to get dependencies", { component });
-					const full = path.join(chosenRoot, file);
+					const full = path.isAbsolute(file) ? file : path.join(chosenRoot, file);
 
 					console.error("Failed to get dependencies", {
 						component,

package/src/koa/routeRequest.js

@@ -165,63 +165,124 @@ export default async function routeRequest(ctx, next) {
 		let specific = false;
 
 		// Prefer filesystem existence checks so we don't rely on import() throwing for control flow
-		try {
+		awesomenessRequest.log('Trying site specific route.', {
+			siteSpecificIndexPath,
+			siteSpecificInfoPath 
+		});
+
+		let siteSpecificIndexExists = false;
+		let siteSpecificInfoExists = false;
 
-			awesomenessRequest.log('Trying site specific route.', {
-				siteSpecificIndexPath,
-				siteSpecificInfoPath 
-			});
+
+		try {
 
 			await fs.access(siteSpecificIndexPath);
+			siteSpecificIndexExists = true;
+		
+		} catch {}
+
+		try {
+
 			await fs.access(siteSpecificInfoPath);
+			siteSpecificInfoExists = true;
+		
+		} catch {}
+
+		if (siteSpecificIndexExists && siteSpecificInfoExists) {
 
 			awesomenessRequest.log('Site specific route found.', {
 				siteSpecificIndexPath,
 				siteSpecificInfoPath 
 			});
 
-			routeIndex = await import(pathToFileURL(siteSpecificIndexPath).href);
-			const infoMod = await import(pathToFileURL(siteSpecificInfoPath).href);
-
-			routeInfo = infoMod.default;
+			try {
 
-			awesomenessRequest.log('Site specific route info loaded.', {
-				routeInfo 
-			});
+				routeIndex = await import(pathToFileURL(siteSpecificIndexPath).href);
+				const infoMod = await import(pathToFileURL(siteSpecificInfoPath).href);
 
+				routeInfo = infoMod.default;
+				awesomenessRequest.log('Site specific route info loaded.', {
+					routeInfo 
+				});
+				specific = true;
+			
+			} catch (importError) {
 
-			specific = true;
+				ctx.status = 500;
+				ctx.body = {
+					success: false,
+					message: "Site specific route import error",
+					error: importError,
+					siteSpecificRoute: siteSpecificIndexPath,
+					siteSpecificInfo: siteSpecificInfoPath,
+				};
+				finalFormat(awesomenessRequest, ctx);
+				
+				return;
+			
+			}
 		
-		} catch (error) {
+		} else {
+
+			awesomenessRequest.log('Site specific route not found, trying generic route.', {
+				siteSpecificIndexExists: siteSpecificIndexExists,
+				siteSpecificInfoExists: siteSpecificInfoExists 
+			});
+			let genericIndexExists = false;
+			let genericInfoExists = false;
 
-			awesomenessRequest.log('Site specific route not found, trying generic route.', { error });
 
 			try {
 
 				await fs.access(genericIndexPath);
-				await fs.access(genericInfoPath);
-
-				routeIndex = await import(pathToFileURL(genericIndexPath).href);
-				const infoMod = await import(pathToFileURL(genericInfoPath).href);
+				genericIndexExists = true;
+			
+			} catch {}
 
-				routeInfo = infoMod.default;
+			try {
 
-				specific = false;
+				await fs.access(genericInfoPath);
+				genericInfoExists = true;
+			
+			} catch {}
+
+			if (genericIndexExists && genericInfoExists) {
+
+				try {
+
+					routeIndex = await import(pathToFileURL(genericIndexPath).href);
+					const infoMod = await import(pathToFileURL(genericInfoPath).href);
+
+					routeInfo = infoMod.default;
+					specific = false;
+				
+				} catch (importError2) {
+
+					ctx.status = 500;
+					ctx.body = {
+						success: false,
+						message: "Generic route import error",
+						error: importError2,
+						genericRoute: genericIndexPath,
+						genericInfo: genericInfoPath,
+					};
+					finalFormat(awesomenessRequest, ctx);
+					
+					return;
+				
+				}
 			
-			} catch (error2) {
+			} else {
 
 				ctx.status = 404;
-
 				ctx.body = {
 					success: false,
 					message: "route not found",
-					error: error2,
 					siteSpecificRoute: siteSpecificIndexPath,
 					genericRoute: genericIndexPath,
 				};
-
 				finalFormat(awesomenessRequest, ctx);
-
+				
 				return;
 			
 			}

package/example-site/example.awesomenessjs.com/components/example/index.js

@@ -1,3 +0,0 @@
-export default () => {
- console.log('This example component over-wrote the common example component');
-}

package/example-site/example.awesomenessjs.com/components/notCommonExample/_.css

@@ -1 +0,0 @@
-/* test */

package/example-site/example.awesomenessjs.com/components/notCommonExample/index.js

@@ -1,3 +0,0 @@
-export default () => {
- console.log('This is not a common example');
-}