@human-synthesis/norns 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@human-synthesis/norns",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Norns — SvelteKit with Civet, Pug, and the .n / .civet / .c file extensions",
   "license": "MIT",
   "author": "Daniel Teodoroiu (https://humansynthesis.ai)",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@danielx/civet": "^0.11.0",
-    "@human-synthesis/norns-core": "^0.0.9"
+    "@human-synthesis/norns-core": "^0.0.10"
   },
   "engines": {
     "node": ">=18"

package/src/migrate.js

@@ -10,9 +10,11 @@
  * tooling (this CLI, wrangler for D1) reads. Keeping them out of `src/lib`
  * also keeps SvelteKit's bundler from ever trying to ship them.
  *
- * v1 supports SQLite via `better-sqlite3`. Postgres/libSQL come later;
- * Cloudflare D1 is intentionally out of scope here — use
- * `wrangler d1 migrations apply <db>` for D1 deploys.
+ * v1 supports SQLite only. Backend selection is runtime-detected:
+ *   - Under Bun: built-in `bun:sqlite` (no native build, works on Alpine).
+ *   - Under Node: `better-sqlite3` (must be installed in the consumer app).
+ * Postgres/libSQL come later; Cloudflare D1 is intentionally out of scope
+ * here — use `wrangler d1 migrations apply <db>` for D1 deploys.
  */
 
 import { existsSync, readdirSync, statSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
@@ -115,11 +117,21 @@ export function resolveDatabaseUrl(cwd) {
 }
 
 /**
- * Open a better-sqlite3 db at `path` and ensure the migration tracking table
- * exists.
+ * Open a SQLite db at `path` and ensure the migration tracking table exists.
+ *
+ * Backend is runtime-selected: `bun:sqlite` under Bun (no native build,
+ * works on Alpine where `better-sqlite3`'s N-API binding fails to load
+ * against Bun's V8 compat layer), `better-sqlite3` under Node.
+ *
+ * The returned object exposes the better-sqlite3 surface used by the
+ * migration code (`pragma`, `exec`, `prepare(...).all/get/run`,
+ * `transaction`, `close`). Under Bun a minimal `pragma()` shim is grafted
+ * on — bun:sqlite has no built-in `pragma` method, but `exec('PRAGMA …')`
+ * is equivalent for the writes the migrate code performs.
  *
  * @param {string} cwd directory whose `package.json` is used to resolve
  *                     better-sqlite3 from the consumer's node_modules
+ *                     (only relevant under Node)
  * @param {string} path SQLite file path
  * @param {{ requireFrom?: string | URL }} [opts] override the require base
  *                                                (used by tests)
@@ -127,6 +139,32 @@ export function resolveDatabaseUrl(cwd) {
  */
 export function openSqliteDb(cwd, path, opts = {}) {
 	mkdirSync(dirname(path), { recursive: true });
+	const db = openRawSqlite(cwd, path, opts);
+	db.pragma('journal_mode = WAL');
+	db.exec(`CREATE TABLE IF NOT EXISTS ${MIGRATION_TABLE} (
+		id TEXT PRIMARY KEY,
+		applied_at INTEGER NOT NULL
+	)`);
+	return db;
+}
+
+/**
+ * @param {string} cwd
+ * @param {string} path
+ * @param {{ requireFrom?: string | URL }} opts
+ * @returns {any}
+ */
+function openRawSqlite(cwd, path, opts) {
+	if (typeof Bun !== 'undefined') {
+		const r = createRequire(import.meta.url);
+		const { Database } = r('bun:sqlite');
+		const db = new Database(path);
+		// bun:sqlite has no `pragma()` method. Norns calls it only with
+		// write-style statements (`'journal_mode = WAL'`, `'foreign_keys = ON'`),
+		// for which `exec('PRAGMA …')` is the documented equivalent.
+		db.pragma = (stmt) => db.exec('PRAGMA ' + stmt);
+		return db;
+	}
 	const require = createRequire(opts.requireFrom ?? join(cwd, 'package.json'));
 	let Database;
 	try {
@@ -136,13 +174,7 @@ export function openSqliteDb(cwd, path, opts = {}) {
 			'norns migrate: `better-sqlite3` is not installed in this app. Run: bun add better-sqlite3'
 		);
 	}
-	const db = new Database(path);
-	db.pragma('journal_mode = WAL');
-	db.exec(`CREATE TABLE IF NOT EXISTS ${MIGRATION_TABLE} (
-		id TEXT PRIMARY KEY,
-		applied_at INTEGER NOT NULL
-	)`);
-	return db;
+	return new Database(path);
 }
 
 /**

package/src/server/db.js

@@ -56,13 +56,31 @@ function importDynamic(mod) {
  */
 
 /**
- * Open a Drizzle instance backed by `better-sqlite3`.
+ * Open a Drizzle instance backed by SQLite.
+ *
+ * Backend is runtime-selected: `bun:sqlite` + `drizzle-orm/bun-sqlite` under
+ * Bun (built-in, no native build, works on Alpine), `better-sqlite3` +
+ * `drizzle-orm/better-sqlite3` under Node. The function name keeps the
+ * `betterSqlite` alias for backward compatibility — what actually gets
+ * loaded depends on the runtime.
  *
  * @param {string} path SQLite file path (e.g. `data/notes.db`)
  * @param {BetterSqliteOptions} [opts]
  * @returns {Promise<any>}
  */
 export async function betterSqlite(path, opts = {}) {
+	if (typeof Bun !== 'undefined') {
+		const [{ Database }, { drizzle }] = await Promise.all([
+			importDynamic('bun:sqlite'),
+			importDynamic('drizzle-orm/bun-sqlite')
+		]);
+		const sqlite = new Database(path, opts.connection);
+		if (opts.pragma) {
+			// bun:sqlite has no `pragma()` method — use `exec('PRAGMA …')`.
+			for (const p of opts.pragma) sqlite.exec('PRAGMA ' + p);
+		}
+		return drizzle(sqlite, opts.drizzle);
+	}
 	const [{ default: Database }, { drizzle }] = await Promise.all([
 		importDynamic('better-sqlite3'),
 		importDynamic('drizzle-orm/better-sqlite3')

package/src/vite.js

@@ -2,6 +2,7 @@ import { readFile, stat, realpath, readdir, mkdir, writeFile } from 'node:fs/pro
 import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { compile as compileCivet } from '@danielx/civet';
+import { extractPugClasses } from '@human-synthesis/norns-core/preprocess';
 
 const DEFAULT_EXTENSIONS = ['.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json'];
 const NORNS_EXTENSIONS = ['.svelte', '.n', '.civet', '.c'];
@@ -143,53 +144,34 @@ export function nornsCivetPlugin() {
 
 /* === pugTailwindExtract ==================================================
  *
- * Tailwind v4's content extractor tokenizes candidates against a fixed
- * non-class alphabet. Pug class-shorthand chains followed directly by an
- * attribute paren — `.grid.gap-6(class="…")` — fail that tokenizer: the
- * substring `.gap-6(` reads as one non-class token, so `gap-6` never
- * reaches the candidate set and the CSS rule is never generated.
+ * Tailwind v4's content scanner only picks up utility candidates from
+ * space-separated string contexts (`class="…"`, JS strings, etc.). It does
+ * NOT understand Pug's chained-class shorthand: `.flex.items-center.p-4`
+ * reads as one dotted token, doesn't match any utility, and gets dropped.
+ * Same for chains followed by an attribute paren — `.grid.gap-6(class="…")`.
  *
- * Because the `tag.cls.cls(attrs)` form is idiomatic Pug, asking authors
- * to either move every utility into `class="…"` or hand-maintain a
- * safelist is a paper cut on every page they touch.
+ * Net effect without help: the HTML emitted by `.n` files has the class
+ * names, but Tailwind never generates rules for them. Pages render with
+ * silently-missing layout (no error, no warning, just visually wrong).
  *
- * This plugin walks every `.n` file under `root`, extracts each `.cls`
- * segment via a permissive regex, and writes the deduplicated set into a
- * single sidecar HTML file. Consumers reference the file from their CSS
- * via `@source "./.tailwind-pug-classes.html";` so Tailwind picks it up
- * like any other content source.
+ * This plugin walks every `.n` file under `root`, extracts each shorthand
+ * class via `extractPugClasses` from `@human-synthesis/norns-core`, and
+ * writes the deduplicated set into a sidecar HTML file. Consumers
+ * reference the file from their CSS via
+ *   `@source "./.tailwind-pug-classes.html";`
+ * so Tailwind picks it up like any other content source.
  *
- * The regex is permissive on purpose — it captures every `.candidate`
- * segment in the source, including occasional false positives like
- * `.svelte` inside template text. Those are free: Tailwind's own
- * candidate-validation step drops anything that isn't a real utility, so
- * the only cost is a few extra bytes in the sidecar.
+ * Extraction skips `<script>` and `<style>` blocks, mixin calls (`+if`),
+ * text-emit lines (`|`), raw HTML lines (`<`), and Pug comments (`//`).
+ * It also pulls tokens out of any `class="…"` / `class!="…"` attribute on
+ * the same line — redundant with Tailwind's own scan in most cases, free
+ * defence in depth.
  *
  * Runs with `enforce: 'pre'` so the scan sees the raw Pug source, not the
  * Svelte output that the rest of the chain emits.
  * ========================================================================
  */
 
-/**
- * Match every `.candidate` segment. Class names may contain Tailwind's
- * full alphabet — letters, digits, `-`, `_`, `:`, `/`, and arbitrary-value
- * brackets `[...]`. Pug shorthand never contains a `.` inside a class
- * (the dot is the delimiter), so `text-[1.5rem]`-style values never appear
- * in shorthand — those always live inside `class="…"`, which Tailwind
- * extracts directly.
- */
-const SEGMENT_RE = /\.([A-Za-z][\w\-:/]*(?:\[[^\]]*\])?)/g;
-
-function extractPugClasses(source) {
-	const out = new Set();
-	let m;
-	SEGMENT_RE.lastIndex = 0;
-	while ((m = SEGMENT_RE.exec(source))) {
-		if (m[1]) out.add(m[1]);
-	}
-	return out;
-}
-
 async function walkNFiles(dir, ext, out = []) {
 	let entries;
 	try {