spooder 6.0.0 → 6.1.1

package/bun.lock

@@ -6,48 +6,19 @@
       "devDependencies": {
         "@types/bun": "^1.2.20",
       },
-      "optionalDependencies": {
-        "mysql2": "^3.11.0",
-      },
     },
   },
   "packages": {
-    "@types/bun": ["@types/bun@1.3.0", "", { "dependencies": { "bun-types": "1.3.0" } }, "sha512-+lAGCYjXjip2qY375xX/scJeVRmZ5cY0wyHYyCYxNcdEXrQ4AOe3gACgd4iQ8ksOslJtW4VNxBJ8llUwc3a6AA=="],
+    "@types/bun": ["@types/bun@1.3.1", "", { "dependencies": { "bun-types": "1.3.1" } }, "sha512-4jNMk2/K9YJtfqwoAa28c8wK+T7nvJFOjxI4h/7sORWcypRNxBpr+TPNaCfVWq70tLCJsqoFwcf0oI0JU/fvMQ=="],
 
-    "@types/node": ["@types/node@24.7.2", "", { "dependencies": { "undici-types": "~7.14.0" } }, "sha512-/NbVmcGTP+lj5oa4yiYxxeBjRivKQ5Ns1eSZeB99ExsEQ6rX5XYU1Zy/gGxY/ilqtD4Etx9mKyrPxZRetiahhA=="],
+    "@types/node": ["@types/node@24.9.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg=="],
 
     "@types/react": ["@types/react@19.2.2", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA=="],
 
-    "aws-ssl-profiles": ["aws-ssl-profiles@1.1.2", "", {}, "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g=="],
-
-    "bun-types": ["bun-types@1.3.0", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-u8X0thhx+yJ0KmkxuEo9HAtdfgCBaM/aI9K90VQcQioAmkVp3SG3FkwWGibUFz3WdXAdcsqOcbU40lK7tbHdkQ=="],
+    "bun-types": ["bun-types@1.3.1", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-NMrcy7smratanWJ2mMXdpatalovtxVggkj11bScuWuiOoXTiKIu2eVS1/7qbyI/4yHedtsn175n4Sm4JcdHLXw=="],
 
     "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
 
-    "denque": ["denque@2.1.0", "", {}, "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="],
-
-    "generate-function": ["generate-function@2.3.1", "", { "dependencies": { "is-property": "^1.0.2" } }, "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="],
-
-    "iconv-lite": ["iconv-lite@0.7.0", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ=="],
-
-    "is-property": ["is-property@1.0.2", "", {}, "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="],
-
-    "long": ["long@5.3.2", "", {}, "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA=="],
-
-    "lru-cache": ["lru-cache@7.18.3", "", {}, "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="],
-
-    "lru.min": ["lru.min@1.1.2", "", {}, "sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg=="],
-
-    "mysql2": ["mysql2@3.15.2", "", { "dependencies": { "aws-ssl-profiles": "^1.1.1", "denque": "^2.1.0", "generate-function": "^2.3.1", "iconv-lite": "^0.7.0", "long": "^5.2.1", "lru.min": "^1.0.0", "named-placeholders": "^1.1.3", "seq-queue": "^0.0.5", "sqlstring": "^2.3.2" } }, "sha512-kFm5+jbwR5mC+lo+3Cy46eHiykWSpUtTLOH3GE+AR7GeLq8PgfJcvpMiyVWk9/O53DjQsqm6a3VOOfq7gYWFRg=="],
-
-    "named-placeholders": ["named-placeholders@1.1.3", "", { "dependencies": { "lru-cache": "^7.14.1" } }, "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="],
-
-    "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
-
-    "seq-queue": ["seq-queue@0.0.5", "", {}, "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="],
-
-    "sqlstring": ["sqlstring@2.3.3", "", {}, "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="],
-
-    "undici-types": ["undici-types@7.14.0", "", {}, "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA=="],
+    "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
   }
 }

package/package.json

@@ -1,7 +1,8 @@
 {
 	"name": "spooder",
+	"author": "Kruithne <kruithne@gmail.com>",
 	"type": "module",
-	"version": "6.0.0",
+	"version": "6.1.1",
 	"module": "./src/api.ts",
 	"bin": {
 		"spooder": "./src/cli.ts"
@@ -16,8 +17,5 @@
 	},
 	"devDependencies": {
 		"@types/bun": "^1.2.20"
-	},
-	"optionalDependencies": {
-		"mysql2": "^3.11.0"
 	}
 }

package/src/api.ts

@@ -4,7 +4,7 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 import crypto from 'crypto';
 import { Blob } from 'node:buffer';
-import { ColorInput } from 'bun';
+import { ColorInput, SQL } from 'bun';
 import packageJson from '../package.json' with { type: 'json' };
 
 // region exit codes
@@ -21,10 +21,6 @@ export const EXIT_CODE_NAMES = Object.fromEntries(
 );
 // endregion
 
-// region api forwarding
-export * from './api_db';
-// endregion
-
 // region workers
 type WorkerMessageData = Record<string, any>;
 type WorkerMessage = {
@@ -519,8 +515,20 @@ export function log_create_logger(label: string, color: ColorInput = 'blue') {
 	const ansi = Bun.color(color, 'ansi-256') ?? '\x1b[38;5;6m';
 	const prefix = `[${ansi}${label}\x1b[0m] `;
 	
-	return (message: string, ...params: any[]) => {
-		console.log(prefix + message.replace(/\{([^}]+)\}/g, `${ansi}$1\x1b[0m`), ...params);
+	return (strings: TemplateStringsArray | string, ...values: any[]) => {
+		if (typeof strings === 'string') {
+			// regular string with { } syntax
+			console.log(prefix + strings.replace(/\{([^}]+)\}/g, `${ansi}$1\x1b[0m`), ...values);
+		} else {
+			// tagged template literal
+			let message = '';
+			for (let i = 0; i < strings.length; i++) {
+				message += strings[i];
+				if (i < values.length)
+					message += `${ansi}${values[i]}\x1b[0m`;
+			}
+			console.log(prefix + message);
+		}
 	};
 }
 
@@ -2102,4 +2110,117 @@ export function http_serve(port: number, hostname?: string) {
 		}
 	};
 }
+// endregion
+
+// region db
+type SchemaOptions = {
+	schema_table?: string;
+	recursive?: boolean;
+};
+
+type TableRevision = {
+	revision_number: number;
+	file_path: string;
+	filename: string;
+};
+
+const db_log = log_create_logger('db', 'spooder');
+
+export function db_set_cast<T extends string>(set: string | null): Set<T> {
+	return new Set(set?.split(',') as T[] ?? []);
+}
+
+export function db_set_serialize<T extends string>(set: Iterable<T> | null): string {
+	return set ? Array.from(set).join(',') : '';
+}
+
+export async function db_get_schema_revision(db: SQL): Promise<number|null> {
+	try {
+		const [result] = await db`SELECT MAX(revision_number) as latest_revision FROM db_schema`;
+		return result.latest_revision ?? 0;
+	} catch (e) {
+		return null;
+	}
+}
+
+export async function db_schema(db: SQL, schema_path: string, options?: SchemaOptions): Promise<boolean> {
+	const schema_table = options?.schema_table ?? 'db_schema';
+	const recursive = options?.recursive ?? true;
+
+	db_log`applying schema revisions from ${schema_path}`;
+	let current_revision = await db_get_schema_revision(db);
+
+	if (current_revision === null) {
+		db_log`initiating schema database table ${schema_table}`;
+		await db`CREATE TABLE ${db(schema_table)} (
+			revision_number INTEGER PRIMARY KEY,
+			filename VARCHAR(255) NOT NULL,
+			applied_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+		);`;
+	}
+
+	current_revision ??= 0;
+
+	const revisions = Array<TableRevision>();
+	const files = await fs.readdir(schema_path, { recursive, encoding: 'utf8' });
+	for (const file of files) {
+		const filename = path.basename(file);
+		if (!filename.toLowerCase().endsWith('.sql'))
+			continue;
+		
+		const match = filename.match(/^(\d+)/);
+		const revision_number = match ? Number(match[1]) : null;
+		if (revision_number === null || revision_number < 1) {
+			log_error`skipping sql file ${file}, invalid revision number`;
+			continue;
+		}
+
+		const file_path = path.join(schema_path, file);
+		if (revision_number > current_revision) {
+			revisions.push({
+				revision_number,
+				file_path,
+				filename
+			});
+		}
+	}
+
+	// sort revisions in ascending order before applying
+	// for recursive trees or unreliable OS sort ordering
+	revisions.sort((a, b) => a.revision_number - b.revision_number);
+
+	const revisions_applied = Array<string>();
+	for (const rev of revisions) {
+		db_log`applying revision ${rev.revision_number} from ${rev.filename}`;
+		
+		try {
+			await db.begin(async tx => {
+				await tx.file(rev.file_path);
+				await tx`INSERT INTO ${db(schema_table)} ${db(rev, 'revision_number', 'filename')}`;
+				revisions_applied.push(rev.filename);
+			});
+		} catch (err) {
+			
+			log_error`failed to apply revisions from ${rev.filename}: ${err}`;
+			log_error`${'warning'}: if ${rev.filename} contained DDL statements, they will ${'not'} be rolled back automatically`;
+			log_error`verify the current database state ${'before'} running ammended revisions`;
+			
+			const last_revision = await db_get_schema_revision(db);
+			db_log`database schema revision is now ${last_revision ?? 0}`;
+
+			caution('db_schema failed', { rev, err, last_revision, revisions_applied });
+
+			return false;
+		}
+	}
+
+	if (revisions_applied.length > 0) {
+		const new_revision = await db_get_schema_revision(db);
+		db_log`applied ${revisions_applied.length} database schema revisions (${current_revision} >> ${new_revision})`;
+	} else {
+		db_log`no database schema revisions to apply (current: ${current_revision})`;
+	}
+
+	return true;
+}
 // endregion

package/test.ts

@@ -0,0 +1,10 @@
+import { SQL } from 'bun';
+import * as spooder from 'spooder';
+
+type TestRow = {
+	ID: number;
+	test: string;
+};
+
+const db = new SQL('mysql://test:1141483652@localhost:3306/test');
+await spooder.db_schema(db, './db/revisions');