@plutocms/supabase 0.3.0 → 0.4.1

package/server/utils/sql.ts

@@ -1,6 +1,35 @@
 /**
- * Splits a SQL string into individual statements, correctly handling
- * $$ dollar-quoted blocks, single-quoted strings, and -- comments.
+ * Matches a dollar-quote delimiter: bare (`$$`) or tagged (`$tag$`).
+ * The `y` (sticky) flag anchors the match to `lastIndex`, so it only
+ * matches when the delimiter starts at the exact position checked —
+ * it never matches later in the string.
+ */
+const dollarTagPattern = /\$(?:[a-z_]\w*)?\$/iy
+
+/**
+ * Returns the dollar-quote delimiter starting at `sql[i]`, or `null` when
+ * there is none. Used both for a bare `$$` and a named `$tag$` delimiter.
+ * Also correctly rejects a positional parameter like `$1`, since a tag
+ * name can't start with a digit.
+ */
+function matchDollarTag(sql: string, i: number): string | null {
+  if (sql[i] !== '$') {
+    return null
+  }
+  dollarTagPattern.lastIndex = i
+  const match = dollarTagPattern.exec(sql)
+  return match ? match[0] : null
+}
+
+/**
+ * Splits a SQL string into individual statements.
+ *
+ * Recognizes the SQL syntax that can hide a statement-terminating `;`:
+ * - Dollar-quoted strings, both bare (`$$...$$`) and tagged (`$tag$...$tag$`).
+ * - Single-quoted string literals, with `''` as an escaped quote.
+ * - Double-quoted identifiers, with `""` as an escaped quote.
+ * - Line comments (`-- ...`).
+ * - Block comments (`/* ... *\/`), including nested block comments.
  */
 export function splitStatements(sql: string): string[] {
   const statements: string[] = []
@@ -8,15 +37,36 @@ export function splitStatements(sql: string): string[] {
   let i = 0
 
   while (i < sql.length) {
-    // Check for dollar-quoting ($$)
-    if (sql[i] === '$' && sql[i + 1] === '$') {
-      current += '$$'
-      i += 2
-      // Read until closing $$
+    // Dollar-quoted strings: bare `$$` or a named `$tag$`.
+    const tag = matchDollarTag(sql, i)
+    if (tag) {
+      current += tag
+      i += tag.length
+      const end = sql.indexOf(tag, i)
+      if (end === -1) {
+        // Unterminated dollar quote — take the rest of the string as-is.
+        current += sql.slice(i)
+        i = sql.length
+        continue
+      }
+      current += sql.slice(i, end + tag.length)
+      i = end + tag.length
+      continue
+    }
+
+    // Double-quoted identifiers (handle "" escapes).
+    if (sql[i] === '"') {
+      current += sql[i]
+      i++
       while (i < sql.length) {
-        if (sql[i] === '$' && sql[i + 1] === '$') {
-          current += '$$'
+        if (sql[i] === '"' && sql[i + 1] === '"') {
+          current += '""'
           i += 2
+          continue
+        }
+        if (sql[i] === '"') {
+          current += sql[i]
+          i++
           break
         }
         current += sql[i]
@@ -25,7 +75,7 @@ export function splitStatements(sql: string): string[] {
       continue
     }
 
-    // Check for single-quoted strings (handle '' escapes)
+    // Single-quoted strings (handle '' escapes).
     if (sql[i] === `'`) {
       current += sql[i]
       i++
@@ -47,7 +97,32 @@ export function splitStatements(sql: string): string[] {
       continue
     }
 
-    // Check for single-line comments
+    // Block comments, including nested block comments (Postgres allows
+    // `/* outer /* inner */ still outer */`).
+    if (sql[i] === '/' && sql[i + 1] === '*') {
+      current += '/*'
+      i += 2
+      let depth = 1
+      while (i < sql.length && depth > 0) {
+        if (sql[i] === '/' && sql[i + 1] === '*') {
+          current += '/*'
+          i += 2
+          depth++
+          continue
+        }
+        if (sql[i] === '*' && sql[i + 1] === '/') {
+          current += '*/'
+          i += 2
+          depth--
+          continue
+        }
+        current += sql[i]
+        i++
+      }
+      continue
+    }
+
+    // Single-line comments
     if (sql[i] === '-' && sql[i + 1] === '-') {
       while (i < sql.length && sql[i] !== '\n') {
         current += sql[i]

package/shared/types/migrations.d.ts

@@ -0,0 +1,28 @@
+/**
+ * A single discovered migration file for one layer.
+ *
+ * `modules/pluto-migrations.ts` discovers these at build time, either from
+ * a layer's `db/migrations/` directory, or as a single legacy
+ * `public/schema.sql` / `public/schema.<name>.sql` file. `server/utils/
+ * migrations.ts` applies them at runtime.
+ *
+ * Lives under `shared/` so both the Nuxt module (which runs under
+ * `nuxt/kit`, at build time, outside the app/server TS projects) and
+ * server code can import the same type.
+ */
+export interface PlutoMigrationFile {
+  /** File name, for example `001_baseline.sql` or `002_admin_hardening.sql`. */
+  name: string
+  /** Raw SQL content of the file. */
+  sql: string
+  /** First 16 hex characters of the SHA-256 digest of `sql`. */
+  checksum: string
+  /**
+   * True when the file's first non-blank line matches
+   * `-- pluto:no-transaction`. Such a file runs statement-by-statement,
+   * with no surrounding transaction — use this only when a statement
+   * cannot run inside a transaction (for example `create index
+   * concurrently`).
+   */
+  noTransaction: boolean
+}

package/shared/types/runtime-config.d.ts

@@ -1,15 +1,17 @@
+import type { PlutoMigrationFile } from './migrations'
+
 // Nuxt infers runtimeConfig types from the actual merged value at build
-// time, which narrows `plutoLayerSchemas` to whatever layer keys happen
-// to be discovered in a given project (e.g. `{ "supabase-shop": string }`)
-// instead of the general `Record<string, string>` declared in
-// nuxt.config.ts. This augmentation pins the intended, stable shape.
-// Lives under shared/ so it's picked up by the app, server, and shared
-// TS projects alike (layer-root .d.ts files are only included by the
-// shared project).
+// time, which narrows `plutoLayerMigrations` to whatever layer keys happen
+// to be discovered in a given project (e.g. `{ "supabase-shop":
+// PlutoMigrationFile[] }`) instead of the general `Record<string,
+// PlutoMigrationFile[]>` declared in nuxt.config.ts. This augmentation
+// pins the intended, stable shape. Lives under shared/ so it's picked up
+// by the app, server, and shared TS projects alike (layer-root .d.ts
+// files are only included by the shared project).
 declare module '@nuxt/schema' {
   interface RuntimeConfig {
     plutoRootDir: string
-    plutoLayerSchemas: Record<string, string>
+    plutoLayerMigrations: Record<string, PlutoMigrationFile[]>
   }
 }
 

package/shared/types/supabase.ts

@@ -39,7 +39,6 @@ export type Database = {
           id: number
           mime_type: string | null
           name: string | null
-          product_id: number | null
           size: number | null
           storage_path: string | null
         }
@@ -49,7 +48,6 @@ export type Database = {
           id?: number
           mime_type?: string | null
           name?: string | null
-          product_id?: number | null
           size?: number | null
           storage_path?: string | null
         }
@@ -59,35 +57,32 @@ export type Database = {
           id?: number
           mime_type?: string | null
           name?: string | null
-          product_id?: number | null
           size?: number | null
           storage_path?: string | null
         }
-        Relationships: [
-          {
-            foreignKeyName: "media_product_id_fkey"
-            columns: ["product_id"]
-            isOneToOne: false
-            referencedRelation: "products"
-            referencedColumns: ["id"]
-          },
-        ]
+        Relationships: []
       }
       pluto_migrations: {
         Row: {
           applied_at: string
+          checksum: string | null
           id: number
           layer_name: string
+          migration_name: string
         }
         Insert: {
           applied_at?: string
+          checksum?: string | null
           id?: number
           layer_name: string
+          migration_name: string
         }
         Update: {
           applied_at?: string
+          checksum?: string | null
           id?: number
           layer_name?: string
+          migration_name?: string
         }
         Relationships: []
       }