better-supabase 0.4.0 → 0.5.1

package/dist/cli/{read-sets-CMa29t9a.js → diff-SjkO5rNr.js}

@@ -1,10 +1,4 @@
 import { i as plain } from "./style-C0NFdJRL.js";
-import { i as importModule } from "./config-D9R0o1LH.js";
-import { resolve } from "node:path";
-import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
-import { compileReadSets } from "better-supabase/sql";
-import { isReadSet } from "better-supabase";
 //#region ../../node_modules/.pnpm/diff@9.0.0/node_modules/diff/libesm/diff/base.js
 var Diff = class {
 	diff(oldStr, newStr, options = {}) {
@@ -755,217 +749,4 @@ function fileDiff(path, current, next, paint = plain) {
 	return [...shown, ...hidden > 0 ? [paint("dim", `... ${hidden} more diff lines`)] : []].join("\n");
 }
 //#endregion
-//#region src/cli/permdock.ts
-const PERMDOCK_CONFIGS = [
-	"permdock.config.ts",
-	"permdock.config.mts",
-	"permdock.config.js",
-	"permdock.config.mjs"
-];
-/** The PermDock config file in `root`, if there is one. */
-function permdockConfig(root) {
-	return PERMDOCK_CONFIGS.find((file) => existsSync(resolve(root, file)));
-}
-const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const isString = (value) => typeof value === "string";
-const strings = (value) => Array.isArray(value) ? value.filter(isString) : [];
-const column = (value) => isRecord(value) && isString(value["column"]) ? { column: value["column"] } : void 0;
-function manifestValue(value, accept) {
-	if (!isRecord(value)) return void 0;
-	if (isString(value["column"])) return { column: value["column"] };
-	return accept(value["value"]) ? { value: value["value"] } : void 0;
-}
-const roleValue = (value) => isString(value) || Array.isArray(value) && value.every(isString);
-function membership(value) {
-	if (!isRecord(value) || !isString(value["table"])) return void 0;
-	const user = column(value["user"]);
-	const id = column(value["id"]);
-	const scope = manifestValue(value["scope"], isString);
-	if (!user || !id || !scope) return void 0;
-	const role = manifestValue(value["role"], roleValue);
-	const expiresAt = column(value["expiresAt"]);
-	return {
-		table: value["table"],
-		user,
-		scope,
-		id,
-		...role ? { role } : {},
-		...expiresAt ? { expiresAt } : {},
-		columns: strings(value["columns"])
-	};
-}
-/** Reads a parsed manifest; throws with the reason when it isn't version 1. */
-function parseManifest(json) {
-	if (!isRecord(json)) throw new TypeError("not a JSON object");
-	if (json["version"] !== 1) throw new TypeError(`version ${String(json["version"])} is not supported (this release reads version 1)`);
-	const hook = json["hook"];
-	const rls = json["rls"];
-	const budget = isRecord(json["budget"]) ? json["budget"]["bytes"] : void 0;
-	return {
-		version: 1,
-		...typeof budget === "number" ? { budget } : {},
-		...isRecord(hook) && isString(hook["schema"]) && isString(hook["function"]) ? { hook: {
-			schema: hook["schema"],
-			function: hook["function"]
-		} } : {},
-		...isString(json["tenantClaim"]) ? { tenantClaim: json["tenantClaim"] } : {},
-		claims: (Array.isArray(json["claims"]) ? json["claims"] : []).flatMap((claim) => isRecord(claim) && isString(claim["name"]) && isString(claim["source"]) ? [{
-			name: claim["name"],
-			source: claim["source"]
-		}] : []),
-		memberships: (Array.isArray(json["memberships"]) ? json["memberships"] : []).flatMap((entry) => {
-			const parsed = membership(entry);
-			return parsed ? [parsed] : [];
-		}),
-		...isRecord(rls) && isString(rls["schema"]) ? { rls: {
-			schema: rls["schema"],
-			mode: rls["mode"] === "jwt" ? "jwt" : "database",
-			scopes: (Array.isArray(rls["scopes"]) ? rls["scopes"] : []).flatMap((scope) => isRecord(scope) && isString(scope["name"]) && isString(scope["type"]) ? [{
-				name: scope["name"],
-				type: scope["type"]
-			}] : []),
-			helpers: (Array.isArray(rls["helpers"]) ? rls["helpers"] : []).flatMap((helper) => isRecord(helper) && isString(helper["name"]) && isString(helper["args"]) && isString(helper["returns"]) ? [{
-				name: helper["name"],
-				args: helper["args"],
-				returns: helper["returns"],
-				execute: strings(helper["execute"])
-			}] : [])
-		} } : {},
-		decidingColumns: strings(json["decidingColumns"])
-	};
-}
-/** The keys of a parsed `permissions.catalog.json` whose entry has `rowConditions: true`. */
-function rowConditionKeys(json) {
-	if (!isRecord(json) || !Array.isArray(json["permissions"])) throw new TypeError("has no permissions array");
-	const keys = /* @__PURE__ */ new Set();
-	for (const permission of json["permissions"]) if (isRecord(permission) && isString(permission["key"]) && permission["rowConditions"] === true) keys.add(permission["key"]);
-	return keys;
-}
-async function readJson(root, path) {
-	const absolute = resolve(root, path);
-	if (!existsSync(absolute)) return { missing: true };
-	try {
-		return { json: JSON.parse(await readFile(absolute, "utf8")) };
-	} catch (cause) {
-		return { problem: `${path}: ${cause instanceof Error ? cause.message : String(cause)}` };
-	}
-}
-/**
-* Reads PermDock's JSON outputs: the manifest `permdock supabase inspect
-* --out` writes and the catalog `permdock catalog` writes. Nothing is
-* imported from PermDock. Returns `undefined` when the project has neither a
-* PermDock config nor a manifest.
-*/
-async function readPermdock(root, paths) {
-	const config = permdockConfig(root);
-	const problems = [];
-	const manifestFile = await readJson(root, paths.manifest);
-	let manifest;
-	if ("json" in manifestFile) try {
-		manifest = parseManifest(manifestFile.json);
-	} catch (cause) {
-		problems.push(`${paths.manifest}: ${cause instanceof Error ? cause.message : String(cause)}`);
-	}
-	else if ("problem" in manifestFile) problems.push(manifestFile.problem);
-	if (!config && !manifest && "missing" in manifestFile) return void 0;
-	const catalogFile = await readJson(root, paths.catalog);
-	let rowConditions;
-	if ("json" in catalogFile) try {
-		rowConditions = rowConditionKeys(catalogFile.json);
-	} catch (cause) {
-		problems.push(`${paths.catalog}: ${cause instanceof Error ? cause.message : String(cause)}`);
-	}
-	else if ("problem" in catalogFile) problems.push(catalogFile.problem);
-	return {
-		...config ? { config } : {},
-		manifestPath: paths.manifest,
-		...manifest ? { manifest } : {},
-		catalogPath: paths.catalog,
-		...rowConditions ? { rowConditions } : {},
-		problems
-	};
-}
-/** How findings name the PermDock project: its config file or its manifest. */
-const permdockSource = (project) => project.config ?? project.manifestPath;
-const HOOK_MARKER = /^--\s*permdock:hook\s+v(\d+)([^\n]*)$/m;
-const GRANTS_MARKER = /^--\s*permdock:grants\s+v(\d+)([^\n]*)$/m;
-function markerFields(rest) {
-	const fields = /* @__PURE__ */ new Map();
-	for (const match of rest.matchAll(/(\w+)=(\S*)/g)) fields.set(match[1], match[2]);
-	return fields;
-}
-/** The `-- permdock:hook v1 schema=... tenant=... budget=... claims=...` line PermDock's hook file starts with. */
-function parseHookMarker(sql) {
-	const match = HOOK_MARKER.exec(sql);
-	if (!match) return void 0;
-	const fields = markerFields(match[2]);
-	const budget = Number(fields.get("budget"));
-	const schema = fields.get("schema");
-	const tenantClaim = fields.get("tenant");
-	return {
-		version: Number(match[1]),
-		...schema ? { schema } : {},
-		...tenantClaim ? { tenantClaim } : {},
-		...Number.isFinite(budget) && fields.has("budget") ? { budget } : {},
-		claims: (fields.get("claims") ?? "").split(",").filter(Boolean)
-	};
-}
-/** The `-- permdock:grants v1 schema=...` line of the migration `--grants-out` writes. */
-function parseGrantsMarker(sql) {
-	const match = GRANTS_MARKER.exec(sql);
-	if (!match) return void 0;
-	const schema = markerFields(match[2]).get("schema");
-	return {
-		version: Number(match[1]),
-		...schema ? { schema } : {}
-	};
-}
-/**
-* PermDock mode, when the manifest has an `rls` block and
-* `entitlements.permdock` is not `false`: the scope must be one of the
-* manifest's `rls.scopes`. Without a manifest the module keeps using `tenant`.
-*/
-function entitlementsMode(config, project) {
-	const setting = config.entitlements.permdock;
-	const rls = project?.manifest?.rls;
-	if (setting === false || !project?.manifest || !rls) return { kind: "tenant" };
-	if (!rls.scopes.some((scope) => scope.name === setting.scope)) return {
-		kind: "invalid",
-		problem: `entitlements.permdock.scope is "${setting.scope}", but ${project.manifestPath} has the scopes ${rls.scopes.map((scope) => scope.name).join(", ") || "(none)"}. Set entitlements.permdock: { scope } to one of them.`
-	};
-	return {
-		kind: "permdock",
-		permdock: {
-			schema: rls.schema,
-			scope: setting.scope,
-			memberships: project.manifest.memberships.map((source) => ({
-				table: source.table,
-				userColumn: source.user.column,
-				scope: source.scope,
-				idColumn: source.id.column
-			}))
-		}
-	};
-}
-/** The `member_<scope>_ids` helpers PermDock mode calls, as `schema.name`. */
-const entitlementHelpers = (permdock) => [`${permdock.schema}.member_${permdock.scope}_ids`, `${permdock.schema}.member_${permdock.scope}_ids_for`];
-//#endregion
-//#region src/cli/read-sets.ts
-/** Every read set exported by the modules in `config.readSets`. */
-async function loadReadSets(config) {
-	const sets = [];
-	for (const entry of config.readSets) {
-		const loaded = await importModule(resolve(config.root, entry));
-		const found = Object.values(loaded).filter(isReadSet);
-		if (found.length === 0) throw new Error(`${entry} exports no read set (defineReadSet)`);
-		for (const set of found) if (!sets.includes(set)) sets.push(set);
-	}
-	return sets;
-}
-/** The compiled functions for `config.readSets`; empty when none are configured. */
-async function compiledReadSets(config) {
-	if (config.readSets.length === 0) return [];
-	return compileReadSets(await loadReadSets(config));
-}
-//#endregion
-export { parseHookMarker as a, readPermdock as c, parseGrantsMarker as i, fileDiff as l, entitlementHelpers as n, permdockConfig as o, entitlementsMode as r, permdockSource as s, compiledReadSets as t };
+export { fileDiff as t };

package/dist/cli/{dist-CFgGknmZ.js → dist-DBPdlPYK.js}

@@ -117,7 +117,7 @@ function normalizeString(path, allowAboveRoot) {
 const isAbsolute$1 = function(p) {
 	return _IS_ABSOLUTE_RE.test(p);
 };
-const extname$1 = function(p) {
+const extname$2 = function(p) {
 	if (p === "..") return "";
 	const match = _EXTNAME_RE.exec(normalizeWindowsPath(p));
 	return match && match[1] || "";
@@ -527,7 +527,7 @@ function getDataProtocolModuleFormat(parsed) {
 }
 const DOT_CODE = 46;
 const SLASH_CODE = 47;
-function extname(url) {
+function extname$1(url) {
 	const pathname = url.pathname;
 	for (let i = pathname.length - 1; i > 0; i--) switch (pathname.charCodeAt(i)) {
 		case SLASH_CODE: return "";
@@ -536,7 +536,7 @@ function extname(url) {
 	return "";
 }
 function getFileProtocolModuleFormat(url, _context, ignoreErrors) {
-	const ext = extname(url);
+	const ext = extname$1(url);
 	if (ext === ".js") {
 		const { type: packageType } = getPackageScopeConfig(url);
 		if (packageType !== "none") return packageType;
@@ -1109,4 +1109,4 @@ function _parseInput(input) {
 	throw new TypeError("id must be a `string` or `URL`");
 }
 //#endregion
-export { isAbsolute$1 as a, resolve$1 as c, extname$1 as i, basename$1 as n, join$1 as o, dirname$1 as r, normalize$1 as s, resolveModulePath as t };
+export { isAbsolute$1 as a, resolve$1 as c, extname$2 as i, basename$1 as n, join$1 as o, dirname$1 as r, normalize$1 as s, resolveModulePath as t };

package/dist/cli/{dist-B1MvLv-M.js → dist-DreZ24Sz.js}

@@ -1,4 +1,4 @@
-import { a as isAbsolute, c as resolve, o as join, r as dirname, s as normalize, t as resolveModulePath } from "./dist-CFgGknmZ.js";
+import { a as isAbsolute, c as resolve, o as join, r as dirname, s as normalize, t as resolveModulePath } from "./dist-DBPdlPYK.js";
 import { n as o, t as i } from "./_format-Cax5EsM9.js";
 import { t as i$1 } from "./jsonc-D5Fu67jw.js";
 import { promises, statSync } from "node:fs";

package/dist/cli/{dist-Du7VnEUG.js → dist-xn4wlboc.js}

@@ -297,6 +297,28 @@ function literal(literal_, message$1) {
 	});
 }
 /* @__NO_SIDE_EFFECTS__ */
+function nullable(wrapped, default_) {
+	return _standardSchema({
+		kind: "schema",
+		type: "nullable",
+		reference: nullable,
+		expects: `(${wrapped.expects} | null)`,
+		async: false,
+		wrapped,
+		default: default_,
+		"~run"(dataset, config$1) {
+			if (dataset.value === null) {
+				if (this.default !== void 0) dataset.value = /* @__PURE__ */ getDefault(this, dataset, config$1);
+				if (dataset.value === null) {
+					dataset.typed = true;
+					return dataset;
+				}
+			}
+			return this.wrapped["~run"](dataset, config$1);
+		}
+	});
+}
+/* @__NO_SIDE_EFFECTS__ */
 function number(message$1) {
 	return _standardSchema({
 		kind: "schema",
@@ -313,6 +335,95 @@ function number(message$1) {
 	});
 }
 /* @__NO_SIDE_EFFECTS__ */
+function objectWithRest(entries$1, rest, message$1) {
+	return _standardSchema({
+		kind: "schema",
+		type: "object_with_rest",
+		reference: objectWithRest,
+		expects: "Object",
+		async: false,
+		entries: entries$1,
+		rest,
+		message: message$1,
+		"~run"(dataset, config$1) {
+			const input = dataset.value;
+			if (input && typeof input === "object") {
+				dataset.typed = true;
+				dataset.value = {};
+				for (const key in this.entries) {
+					const valueSchema = this.entries[key];
+					if (key in input || (valueSchema.type === "exact_optional" || valueSchema.type === "optional" || valueSchema.type === "nullish") && valueSchema.default !== void 0) {
+						const value$1 = key in input ? input[key] : /* @__PURE__ */ getDefault(valueSchema);
+						const valueDataset = valueSchema["~run"]({ value: value$1 }, config$1);
+						if (valueDataset.issues) {
+							const pathItem = {
+								type: "object",
+								origin: "value",
+								input,
+								key,
+								value: value$1
+							};
+							for (const issue of valueDataset.issues) {
+								if (issue.path) issue.path.unshift(pathItem);
+								else issue.path = [pathItem];
+								dataset.issues?.push(issue);
+							}
+							if (!dataset.issues) dataset.issues = valueDataset.issues;
+							if (config$1.abortEarly) {
+								dataset.typed = false;
+								break;
+							}
+						}
+						if (!valueDataset.typed) dataset.typed = false;
+						dataset.value[key] = valueDataset.value;
+					} else if (valueSchema.fallback !== void 0) dataset.value[key] = /* @__PURE__ */ getFallback(valueSchema);
+					else if (valueSchema.type !== "exact_optional" && valueSchema.type !== "optional" && valueSchema.type !== "nullish") {
+						_addIssue(this, "key", dataset, config$1, {
+							input: void 0,
+							expected: `"${key}"`,
+							path: [{
+								type: "object",
+								origin: "key",
+								input,
+								key,
+								value: input[key]
+							}]
+						});
+						if (config$1.abortEarly) break;
+					}
+				}
+				if (!dataset.issues || !config$1.abortEarly) {
+					for (const key in input) if (/* @__PURE__ */ _isValidObjectKey(input, key) && !Object.prototype.hasOwnProperty.call(this.entries, key)) {
+						const valueDataset = this.rest["~run"]({ value: input[key] }, config$1);
+						if (valueDataset.issues) {
+							const pathItem = {
+								type: "object",
+								origin: "value",
+								input,
+								key,
+								value: input[key]
+							};
+							for (const issue of valueDataset.issues) {
+								if (issue.path) issue.path.unshift(pathItem);
+								else issue.path = [pathItem];
+								dataset.issues?.push(issue);
+							}
+							if (!dataset.issues) dataset.issues = valueDataset.issues;
+							if (config$1.abortEarly) {
+								dataset.typed = false;
+								break;
+							}
+						}
+						if (!valueDataset.typed) dataset.typed = false;
+						dataset.value[key] = valueDataset.value;
+					}
+				}
+			} else _addIssue(this, "type", dataset, config$1);
+			return dataset;
+		}
+	});
+}
+/* @__NO_SIDE_EFFECTS__ */
 function optional(wrapped, default_) {
 	return _standardSchema({
 		kind: "schema",
@@ -618,4 +729,4 @@ function safeParse(schema, input, config$1) {
 	};
 }
 //#endregion
-export { literal as a, picklist as c, safeParse as d, strictObject as f, url as g, unknown as h, getDotPath as i, pipe as l, union as m, boolean as n, number as o, string as p, custom as r, optional as s, array as t, record as u };
+export { unknown as _, literal as a, objectWithRest as c, pipe as d, record as f, union as g, string as h, getDotPath as i, optional as l, strictObject as m, boolean as n, nullable as o, safeParse as p, custom as r, number as s, array as t, picklist as u, url as v };