spooder 4.5.2 → 4.5.4

package/README.md

@@ -1485,7 +1485,7 @@ const connection = await pool.getConnection();
 The schema directory is expected to contain an SQL file for each table in the database with the file name matching the name of the table.
 
 > [!NOTE]
-> Files without the `.sql` extension (case-insensitive) will be ignored.
+> The schema directory is searched recursively and files without the `.sql` extension (case-insensitive) will be ignored.
 
 ```
 - database.sqlite

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "4.5.2",
+	"version": "4.5.4",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/api.ts

@@ -104,8 +104,9 @@ export async function caution(err_message_or_obj: string | object, ...err: objec
 	await handle_error('caution: ', err_message_or_obj, ...err);
 }
 
+type WebsocketAcceptReturn = object | boolean;
 type WebsocketHandlers = {
-	accept?: (req: Request) => boolean | Promise<boolean>,
+	accept?: (req: Request) => WebsocketAcceptReturn | Promise<WebsocketAcceptReturn>,
 	message?: (ws: WebSocket, message: string) => void,
 	message_json?: (ws: WebSocket, message: JsonSerializable) => void,
 	open?: (ws: WebSocket) => void,
@@ -231,9 +232,13 @@ type SchemaVersionMap = Map<string, number>;
 
 async function db_load_schema(schema_dir: string, schema_versions: SchemaVersionMap) {
 	const schema_out = [];
-	const schema_files = await fs.readdir(schema_dir);
+	const schema_files = await fs.readdir(schema_dir, { recursive: true, withFileTypes: true });
 
-	for (const schema_file of schema_files) {
+	for (const schema_file_ent of schema_files) {
+		if (schema_file_ent.isDirectory())
+			continue;
+
+		const schema_file = schema_file_ent.name;
 		const schema_file_lower = schema_file.toLowerCase();
 		if (!schema_file_lower.endsWith('.sql'))
 			continue;