@flowdular/sdk 0.2.0 → 0.2.2

package/modules/auth/src/cli/index.ts

@@ -1,5 +1,5 @@
 import { readFile, readdir } from 'node:fs/promises';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 import { parse as parseYaml } from 'yaml';
 import { defineCliExtension } from '@flowdular/sdk/cli-protocol';
 import { AUTH_SCOPES, OWNER_SCOPES, PLATFORM_SCOPES } from '../acl/scopes.ts';
@@ -17,25 +17,31 @@ import {
 
 /* Scopes are declared once, in the module specification. Reading them from
    there keeps this command free of module code execution. */
-async function declaredScopes(
+export async function declaredScopes(
 	workspaceRoot: string,
 	moduleId: string,
+	moduleRoot = join(workspaceRoot, 'modules/auth'),
 ): Promise<{ readonly directory: string; readonly scopes: readonly string[] }> {
-	for (const entry of await readdir(join(workspaceRoot, 'modules'))) {
-		const specPath = join(workspaceRoot, 'modules', entry, 'spec/module.yaml');
-		let spec: { id?: string; permissions?: { id?: string }[] };
-		try {
-			spec = parseYaml(await readFile(specPath, 'utf8')) as typeof spec;
-		} catch {
-			continue;
+	for (const root of new Set([
+		join(workspaceRoot, 'modules'),
+		dirname(moduleRoot),
+	])) {
+		for (const entry of await readdir(root)) {
+			const specPath = join(root, entry, 'spec/module.yaml');
+			let spec: { id?: string; permissions?: { id?: string }[] };
+			try {
+				spec = parseYaml(await readFile(specPath, 'utf8')) as typeof spec;
+			} catch {
+				continue;
+			}
+			if (spec.id !== moduleId) continue;
+			return {
+				directory: entry,
+				scopes: (spec.permissions ?? [])
+					.map((permission) => permission.id)
+					.filter((id): id is string => typeof id === 'string'),
+			};
 		}
-		if (spec.id !== moduleId) continue;
-		return {
-			directory: entry,
-			scopes: (spec.permissions ?? [])
-				.map((permission) => permission.id)
-				.filter((id): id is string => typeof id === 'string'),
-		};
 	}
 	throw new Error(`No enabled module declares the id "${moduleId}".`);
 }
@@ -84,6 +90,7 @@ export const cliExtension = defineCliExtension({
 				const declared = await declaredScopes(
 					context.workspaceRoot,
 					moduleId.trim(),
+					context.moduleRoot,
 				);
 				const local = localDatabaseProvider(context.workspaceRoot);
 				const databases = local.create();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@flowdular/sdk",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"type": "module",
 	"description": "Flowdular platform SDK: server, client, UI, data, agents and core modules through separate exports.",
 	"license": "MIT",

package/packages/database-pglite/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@flowdular/database-pglite",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"type": "module",
 	"exports": {
 		".": "./src/index.ts"

package/packages/database-pglite/src/driver.ts

@@ -81,22 +81,40 @@ export function createPgliteCluster(
 	const close = (): Promise<void> => {
 		closePromise ??= (async () => {
 			if (!databasePromise) return;
-			const instance = await databasePromise;
+			// A failed initialization has no database to close; its caller already
+			// received the original error. Do not replace it during disposal.
+			const instance = await databasePromise.catch(() => undefined);
 			databasePromise = undefined;
-			await instance.close();
+			await instance?.close();
 		})();
 		return closePromise;
 	};
 
 	const database = async (): Promise<PGlite> => {
 		databasePromise ??= (async () => {
+			if (options.dataDirectory) {
+				const { mkdir } = await import('node:fs/promises');
+				await mkdir(options.dataDirectory, { recursive: true, mode: 0o700 });
+			}
 			const created = options.dataDirectory
 				? await PGlite.create({
 						dataDir: options.dataDirectory,
 						parsers: SERVER_PARSERS,
 					})
 				: await PGlite.create({ parsers: SERVER_PARSERS });
-			if (options.bootstrap) await created.exec(options.bootstrap);
+			try {
+				if (options.bootstrap) await created.exec(options.bootstrap);
+			} catch (error) {
+				try {
+					await created.close();
+				} catch (closeError) {
+					throw new AggregateError(
+						[error, closeError],
+						'PGlite bootstrap failed and cleanup also failed.',
+					);
+				}
+				throw error;
+			}
 			return created;
 		})();
 		return databasePromise;