@zeno-lib/db 0.2.0 → 0.3.1

package/package.json

@@ -1,15 +1,36 @@
 {
   "name": "@zeno-lib/db",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "exports": {
-    ".": "./src/index.ts",
-    "./auth": "./src/auth-schema.ts",
-    "./config": "./src/config.ts",
-    "./schema": "./src/schema.ts",
-    "./triggers": "./src/triggers.ts"
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
+    },
+    "./auth": {
+      "types": "./dist/auth-schema.d.mts",
+      "import": "./dist/auth-schema.mjs",
+      "default": "./dist/auth-schema.mjs"
+    },
+    "./config": {
+      "types": "./dist/config.d.mts",
+      "import": "./dist/config.mjs",
+      "default": "./dist/config.mjs"
+    },
+    "./schema": {
+      "types": "./dist/schema.d.mts",
+      "import": "./dist/schema.mjs",
+      "default": "./dist/schema.mjs"
+    },
+    "./triggers": {
+      "types": "./dist/triggers.d.mts",
+      "import": "./dist/triggers.mjs",
+      "default": "./dist/triggers.mjs"
+    }
   },
   "files": [
+    "dist",
     "src"
   ],
   "publishConfig": {
@@ -33,12 +54,15 @@
     "drizzle-orm": "1.0.0-rc.3",
     "postgres": "3.4.7",
     "supabase": "2.84.1",
+    "tsdown": "^0.22.14",
+    "typescript": "7.0.2",
     "vite": "8.0.16",
     "vitest": "4.1.0",
     "@zeno-lib/test": "0.0.3",
     "@zeno-lib/typescript": "^1.1.0"
   },
   "scripts": {
+    "build": "tsdown",
     "dev": "pnpm exec supabase start",
     "stop": "pnpm exec supabase stop",
     "reset": "pnpm exec supabase db reset",

package/src/casing.test.ts

@@ -1,5 +1,6 @@
 import { getTableColumns, type SQL, sql } from "drizzle-orm"
 import {
+  bigint,
   getTableConfig,
   isPgEnum,
   isPgMaterializedView,
@@ -693,13 +694,16 @@ describe("default casing", () => {
     for (const rlsPolicy of policies) {
       expect(rlsPolicy.to).toBe(authenticatedRole)
     }
-    // using for select and delete, withCheck for insert, both for update.
+    // using for select, update and delete, withCheck for insert. update takes
+    // both clauses, but Postgres reuses using for the check, so spelling out a
+    // second identical expression would only add a polwithcheck that a
+    // hand-written USING-only policy does not have.
     expect(policies[0]?.using).toBeDefined()
     expect(policies[0]?.withCheck).toBeUndefined()
     expect(policies[1]?.using).toBeUndefined()
     expect(policies[1]?.withCheck).toBeDefined()
     expect(policies[2]?.using).toBeDefined()
-    expect(policies[2]?.withCheck).toBeDefined()
+    expect(policies[2]?.withCheck).toBeUndefined()
     expect(policies[3]?.using).toBeDefined()
     expect(policies[3]?.withCheck).toBeUndefined()
 
@@ -710,7 +714,7 @@ describe("default casing", () => {
     expect(dialect.sqlToQuery(policies[0]?.using as SQL).sql).toBe(
       '(select "can_select_posts"("posts"."id"))'
     )
-    expect(dialect.sqlToQuery(policies[2]?.withCheck as SQL).sql).toBe(
+    expect(dialect.sqlToQuery(policies[2]?.using as SQL).sql).toBe(
       '(select "can_update_posts"("posts"."id"))'
     )
 
@@ -745,4 +749,70 @@ describe("default casing", () => {
       "posts_delete",
     ])
   })
+
+  it("varies the argument per operation, insert usually taking none", () => {
+    const deals = table(
+      "deals",
+      { id: primaryId("assigned"), ownerId: uuid() },
+      (t) => functionPolicies(t, { argument: { delete: t.id, select: t.id } })
+    )
+    const policies = getTableConfig(deals).policies
+    const dialect = new PgDialect()
+
+    // select and delete get the row; insert and update fall to no arguments,
+    // insert because a missing key means "called with none" and update because
+    // it was left out of the record too.
+    expect(dialect.sqlToQuery(policies[0]?.using as SQL).sql).toBe(
+      '(select "can_select_deals"("deals"."id"))'
+    )
+    expect(dialect.sqlToQuery(policies[1]?.withCheck as SQL).sql).toBe(
+      '(select "can_insert_deals"())'
+    )
+    expect(dialect.sqlToQuery(policies[2]?.using as SQL).sql).toBe(
+      '(select "can_update_deals"())'
+    )
+    expect(dialect.sqlToQuery(policies[3]?.using as SQL).sql).toBe(
+      '(select "can_delete_deals"("deals"."id"))'
+    )
+  })
+
+  it("reads an explicit null as a call with no arguments", () => {
+    const deals = table("deals", { id: primaryId("assigned") }, (t) =>
+      functionPolicies(t, { argument: { insert: null, select: t.id } })
+    )
+    const policies = getTableConfig(deals).policies
+
+    expect(new PgDialect().sqlToQuery(policies[1]?.withCheck as SQL).sql).toBe(
+      '(select "can_insert_deals"())'
+    )
+  })
+
+  it("passes several columns to a function that takes several", () => {
+    const investors = table(
+      "investors",
+      {
+        id: primaryId("uuid"),
+        organisationId: bigint({ mode: "number" }),
+        profileId: uuid(),
+      },
+      (t) => functionPolicies(t, { argument: [t.profileId, t.organisationId] })
+    )
+    const policies = getTableConfig(investors).policies
+
+    expect(new PgDialect().sqlToQuery(policies[0]?.using as SQL).sql).toBe(
+      '(select "can_select_investors"("investors"."profile_id", "investors"."organisation_id"))'
+    )
+  })
+
+  it("qualifies the function with a schema when one is given", () => {
+    const bexio = schema("bexio")
+    const bills = bexio.table("bexio_bills", { id: primaryId("uuid") }, (t) =>
+      functionPolicies(t, { schema: "bexio" })
+    )
+    const policies = getTableConfig(bills).policies
+
+    expect(new PgDialect().sqlToQuery(policies[0]?.using as SQL).sql).toBe(
+      '(select "bexio"."can_select_bexio_bills"())'
+    )
+  })
 })

package/src/schema.ts

@@ -1,5 +1,5 @@
 // https://orm.drizzle.team/docs/rls#using-with-supabase  (re-exported roles, authUid, realtimeMessages)
-import { getColumnTable, getTableName, sql } from "drizzle-orm"
+import { Column, getColumnTable, getTableName, is, sql } from "drizzle-orm"
 import {
   type AnyPgColumn,
   bigint,
@@ -393,15 +393,18 @@ export const authenticatedAllPolicy = (
   config: AuthenticatedPolicyOptions = {}
 ) => allPolicy(name, { ...config, to: authenticatedRole })
 
-// Postgres takes the condition in a different clause per operation: `using`
-// filters the rows already there, `withCheck` vets the rows going in.
-const POLICY_CLAUSES = {
-  all: ["using", "withCheck"],
-  delete: ["using"],
-  insert: ["withCheck"],
-  select: ["using"],
-  update: ["using", "withCheck"],
-} as const satisfies Record<PolicyOperation, readonly ("using" | "withCheck")[]>
+// The clause each operation's condition belongs in: `using` filters the rows
+// already there, `withCheck` vets the rows going in. `update` and `all` accept
+// both, but Postgres reuses `using` for the check when `withCheck` is left out,
+// so one clause says the same thing and leaves the catalog matching the
+// `USING`-only policies `drizzle-kit pull` reads back from an existing database.
+const POLICY_CLAUSE = {
+  all: "using",
+  delete: "using",
+  insert: "withCheck",
+  select: "using",
+  update: "using",
+} as const satisfies Record<PolicyOperation, "using" | "withCheck">
 
 const POLICY_BUILDERS = {
   all: allPolicy,
@@ -418,15 +421,62 @@ const FUNCTION_POLICY_OPERATIONS = [
   "delete",
 ] as const
 
+type FunctionPolicyOperation = (typeof FUNCTION_POLICY_OPERATIONS)[number]
+
+/** Columns one function is called with. `null` calls it with none. */
+type FunctionArgument = AnyPgColumn | readonly AnyPgColumn[] | null
+
 type FunctionPoliciesOptions = {
-  /** Passed to each function, e.g. the row's id. Omit for a function that takes none. */
-  argument?: AnyPgColumn
+  /**
+   * Passed to each function, e.g. the row's id: one column, an array for a
+   * function taking several, or a record to vary them per operation. The
+   * common shape is that the row-scoped operations take the row and `insert`
+   * takes nothing, there being no row yet to authorise, only the caller. An
+   * operation missing from the record, or set to `null`, is called with no
+   * arguments; so is every operation when `argument` is omitted.
+   */
+  argument?:
+    | FunctionArgument
+    | Partial<Record<FunctionPolicyOperation, FunctionArgument>>
+  /**
+   * Schema the functions live in, e.g. `"billing"` for
+   * `billing.can_select_invoices`. Omit to emit the name unqualified and let
+   * the `search_path` in effect resolve it.
+   */
+  schema?: string
   /** Prefix for the default function and policy names. Default `"can"`. */
   prefix?: string
   /** Overrides the generated policy name. */
   name?: (operation: PolicyOperation, table: string) => string
 }
 
+// A column and an array of them are the whole-set form; anything else is the
+// per-operation record. `is` is how drizzle asks "is this one of mine", and a
+// column is the only entity either form can hold.
+const isWholeSetArgument = (
+  argument: NonNullable<FunctionPoliciesOptions["argument"]>
+): argument is NonNullable<FunctionArgument> =>
+  is(argument, Column) || Array.isArray(argument)
+
+const argumentsFor = (
+  argument: FunctionPoliciesOptions["argument"],
+  operation: FunctionPolicyOperation
+): AnyPgColumn[] => {
+  if (!argument) {
+    return []
+  }
+
+  const forOperation = isWholeSetArgument(argument)
+    ? argument
+    : argument[operation]
+
+  if (!forOperation) {
+    return []
+  }
+
+  return is(forOperation, Column) ? [forOperation] : [...forOperation]
+}
+
 // The columns object drizzle hands the extra-config callback. Taking it rather
 // than the table is what keeps `functionPolicies` usable: naming the table
 // inside its own definition makes its type circular, so `(t) => ...` is the
@@ -450,10 +500,24 @@ type ExtraConfigColumns = Record<string, ExtraConfigColumn>
  * CREATE POLICY "can_select_posts" ON "posts" FOR SELECT TO "authenticated"
  *   USING ((select "can_select_posts"("posts"."id")));
  * ```
+ *
+ * `argument` also takes a record, for the usual shape where `insert` has no
+ * row to authorise yet:
+ *
+ * ```ts
+ * functionPolicies(t, {
+ *   argument: { delete: t.id, select: t.id, update: t.id },
+ * })
+ * ```
  */
 export const functionPolicies = (
   columns: ExtraConfigColumns,
-  { argument, name, prefix = "can" }: FunctionPoliciesOptions = {}
+  {
+    argument,
+    name,
+    prefix = "can",
+    schema: functionSchema,
+  }: FunctionPoliciesOptions = {}
 ) => {
   const [firstColumn] = Object.values(columns)
 
@@ -465,19 +529,20 @@ export const functionPolicies = (
 
   return FUNCTION_POLICY_OPERATIONS.map((operation) => {
     const functionName = `${prefix}_${operation}_${tableName}`
+    // Unqualified by default, so the name resolves through `search_path` the
+    // way a hand-written policy would; `schema` pins it to the functions that
+    // live beside their table instead.
+    const callee = functionSchema
+      ? sql`${sql.identifier(functionSchema)}.${sql.identifier(functionName)}`
+      : sql`${sql.identifier(functionName)}`
     // `select` wraps it so Postgres evaluates the call once per statement
     // rather than once per row, the same shape `authUid` uses.
-    const condition = argument
-      ? sql`(select ${sql.identifier(functionName)}(${argument}))`
-      : sql`(select ${sql.identifier(functionName)}())`
-    const clauses = POLICY_CLAUSES[operation]
+    const condition = sql`(select ${callee}(${sql.join(argumentsFor(argument, operation), sql`, `)}))`
+    const clause = { [POLICY_CLAUSE[operation]]: condition }
 
     return POLICY_BUILDERS[operation](
       name?.(operation, tableName) ?? functionName,
-      {
-        to: authenticatedRole,
-        ...Object.fromEntries(clauses.map((clause) => [clause, condition])),
-      }
+      { to: authenticatedRole, ...clause }
     )
   })
 }