@possumtech/sqlrite 0.1.4 → 0.2.1

package/README.md

@@ -169,7 +169,7 @@ const sql = new SqlRite({
 	path: ":memory:",
 
 	// Path to your SQL directory.
-	dir: "sql/",
+	dir: "sql",
 });
 ```
 

package/SqlRite.js

@@ -5,41 +5,71 @@ export default class SqlRite {
 	constructor(options = {}) {
 		const defaults = {
 			path: ":memory:",
-			dir: "sql/",
+			dir: "sql",
 		};
 
 		const merged = { ...defaults, ...options };
 
 		const db = new DatabaseSync(merged.path, merged);
 
-		const { dir } = merged;
-		const files = fs.readdirSync(dir);
-		const code = files.map((f) => fs.readFileSync(dir + f, "utf8")).join("");
+		// allow multiple directories
+		if (!Array.isArray(merged.dir)) merged.dir = [merged.dir];
+		const files = merged.dir.flatMap((d) => this.getFiles(d));
+
+		const code = files.map((f) => fs.readFileSync(f, "utf8")).join("");
 
 		this.async = {};
 
 		const chunks =
 			/-- (?<chunk>(?<type>INIT|EXEC|PREP): (?<name>\w+)\n(?<sql>.*?))($|(?=-- (INIT|EXEC|PREP):))/gs;
 
+		const initChunks = [];
+		const execChunks = [];
+		const prepChunks = [];
+
 		for (const chunk of code.matchAll(chunks)) {
-			const { type, name, sql } = chunk.groups;
-			switch (type) {
-				case "INIT":
-					db.exec(sql);
-					break;
-				case "EXEC":
-					this[name] = () => db.exec(sql);
-					this.async[name] = async () => db.exec(sql);
-					break;
-				case "PREP":
-					this[name] = db.prepare(sql);
-
-					this.async[name] = {};
-					this.async[name].all = async (params = {}) => this[name].all(params);
-					this.async[name].get = async (params = {}) => this[name].get(params);
-					this.async[name].run = async (params = {}) => this[name].run(params);
-					break;
-			}
+			const { type } = chunk.groups;
+
+			if (type === "INIT") initChunks.push(chunk.groups);
+			if (type === "EXEC") execChunks.push(chunk.groups);
+			if (type === "PREP") prepChunks.push(chunk.groups);
+		}
+
+		initChunks.forEach((init) => {
+			db.exec(init.sql);
+		});
+
+		execChunks.forEach((exec) => {
+			this[exec.name] = () => db.exec(exec.sql);
+			this.async[exec.name] = async () => db.exec(exec.sql);
+		});
+
+		prepChunks.forEach((prep) => {
+			this[prep.name] = db.prepare(prep.sql);
+
+			this.async[prep.name] = {};
+
+			this.async[prep.name].all = async (params = {}) =>
+				this[prep.name].all(params);
+
+			this.async[prep.name].get = async (params = {}) =>
+				this[prep.name].get(params);
+
+			this.async[prep.name].run = async (params = {}) =>
+				this[prep.name].run(params);
+		});
+	}
+
+	getFiles(dir) {
+		const files = [];
+
+		for (const item of fs.readdirSync(dir)) {
+			const path = `${dir}/${item}`;
+
+			if (fs.lstatSync(path).isDirectory()) files.push(...this.getFiles(path));
+			else if (item.endsWith(".sql")) files.push(path);
 		}
+
+		return files;
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@possumtech/sqlrite",
-	"version": "0.1.4",
+	"version": "0.2.1",
 	"description": "SQL Done Right",
 	"keywords": [
 		"node",

package/SqlRite.d.ts

@@ -1,22 +0,0 @@
-import { Database, DatabaseSync, Statement } from 'node:sqlite';
-
-interface SqlRiteOptions {
-	path?: string;
-	dir?: string;
-}
-
-interface SqlRiteAsyncPreparedStatements {
-	all: (params?: Record<string, any>) => Promise<any[]>;
-	get: (params?: Record<string, any>) => Promise<any>;
-	run: (params?: Record<string, any>) => Promise<void>;
-}
-
-interface SqlRiteAsyncMethods {
-	[key: string]: (() => Promise<void>) | SqlRiteAsyncPreparedStatements;
-}
-
-export default class SqlRite {
-	constructor(options?: SqlRiteOptions);
-	async: SqlRiteAsyncMethods;
-	[key: string]: (() => void) | Statement | SqlRiteAsyncMethods | any;
-}

package/biome.json

@@ -1,30 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-	"vcs": {
-		"enabled": false,
-		"clientKind": "git",
-		"useIgnoreFile": false
-	},
-	"files": {
-		"ignoreUnknown": false,
-		"ignore": ["SqlRite.d.ts", "package.json", "package-lock.json"]
-	},
-	"formatter": {
-		"enabled": true,
-		"indentStyle": "tab"
-	},
-	"organizeImports": {
-		"enabled": true
-	},
-	"linter": {
-		"enabled": true,
-		"rules": {
-			"recommended": true
-		}
-	},
-	"javascript": {
-		"formatter": {
-			"quoteStyle": "double"
-		}
-	}
-}