@form-engine-ts/storage-d1 7.17.2 → 7.18.0

package/dist/index.cjs

@@ -48,12 +48,12 @@ function parseSubmission(value, location) {
   }
   return cloneJson(parsed);
 }
-function parseSchemaRow(value, index) {
+function parseSchemaRow(value, index, validation = {}) {
   if (!isRecord(value)) throw new Error(`D1 schema row ${index} is invalid.`);
   const row = value;
   const schema = parseJson(row.schema_json, `schema row ${index}`);
   try {
-    (0, import_core.assertValidFormSchema)(schema);
+    (0, import_core.assertValidFormSchema)(schema, validation);
   } catch (cause) {
     throw new Error(`D1 schema row ${index} is invalid.`, { cause });
   }
@@ -139,10 +139,69 @@ function createD1Storage(options) {
     })();
     await migration;
   };
+  function lifecycleBackend(client) {
+    const query = async (sql, params) => {
+      const result = await boundStatement(client, sql, params).all();
+      assertSuccessful(result, "lifecycle");
+      if (result.results === void 0) throw new Error("D1 lifecycle result missing rows.");
+      return result.results;
+    };
+    const marker = (_index) => "?";
+    return {
+      resources: ["schema", "submission"],
+      async list(formId) {
+        await ensureReady();
+        const records = [];
+        for (const kind of ["schema", "submission"]) {
+          const table = kind === "schema" ? schemasTable : responsesTable;
+          const rows = await query(`SELECT * FROM ${table} WHERE form_id = ${marker(1)}`, [formId]);
+          for (const row of rows) {
+            if (!isRecord(row)) throw new TypeError("Invalid lifecycle row.");
+            const payload = row[kind === "schema" ? "schema_json" : "submission_json"];
+            const value = parseJson(payload, "lifecycle");
+            const id = kind === "schema" ? JSON.stringify([row.form_id, row.form_version]) : String(row.response_id);
+            records.push({ kind, id, value: { row, value } });
+          }
+        }
+        return records;
+      },
+      async remove(resource) {
+        if (!isRecord(resource.value) || !isRecord(resource.value.row))
+          throw new TypeError("Invalid lifecycle resource.");
+        const row = resource.value.row;
+        const schema = resource.kind === "schema";
+        const table = schema ? schemasTable : responsesTable;
+        const payloadColumn = schema ? "schema_json" : "submission_json";
+        const payload = row[payloadColumn];
+        const params = schema ? [row.form_id, row.form_version] : [row.response_id, row.form_id];
+        const identity = schema ? `form_id = ${marker(1)} AND form_version = ${marker(2)}` : `response_id = ${marker(1)} AND form_id = ${marker(2)}`;
+        params.push(typeof payload === "string" ? payload : JSON.stringify(payload));
+        const deleted = await query(
+          `DELETE FROM ${table} WHERE ${identity} AND ${payloadColumn} = ${marker(3)} RETURNING ${schema ? "form_id" : "response_id"}`,
+          params
+        );
+        if (deleted.length === 0) throw new Error("Deletion revision conflict or record disappeared.");
+        return deleted.length;
+      }
+    };
+  }
+  const lifecycle = (0, import_core.createFormLifecycleAdapter)(
+    lifecycleBackend(options.db),
+    options.lifecycle === void 0 ? {} : {
+      ...options.lifecycle,
+      ...options.lifecycle.scope === void 0 ? {} : {
+        scope: (resource) => {
+          if (!isRecord(resource.value)) throw new TypeError("Invalid lifecycle resource.");
+          return options.lifecycle?.scope?.({ ...resource, value: resource.value.value }) ?? {};
+        }
+      }
+    }
+  );
   return {
+    ...lifecycle,
     async saveSchema(schema) {
       await ensureReady();
-      (0, import_core.assertValidFormSchema)(schema);
+      (0, import_core.assertValidFormSchema)(schema, options.schemaValidation);
       await run(
         `INSERT INTO ${schemasTable} (form_id, form_version, schema_json, updated_at)
          VALUES (?, ?, ?, CURRENT_TIMESTAMP)
@@ -158,14 +217,14 @@ function createD1Storage(options) {
         `SELECT form_id, form_version, schema_json FROM ${schemasTable} WHERE form_id = ? AND form_version = ? LIMIT 1`,
         [formId, formVersion]
       ).first();
-      return row === null ? null : parseSchemaRow(row, 0);
+      return row === null ? null : parseSchemaRow(row, 0, options.schemaValidation);
     },
     async listSchemas() {
       await ensureReady();
       const rows = await all(
         `SELECT form_id, form_version, schema_json FROM ${schemasTable} ORDER BY form_id, form_version`
       );
-      return rows.map(parseSchemaRow);
+      return rows.map((row, index) => parseSchemaRow(row, index, options.schemaValidation));
     },
     async deleteSchema(formId, formVersion) {
       await ensureReady();

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { FormStorageAdapter } from '@form-engine-ts/core';
+import { ValidateFormSchemaOptions, FormLifecycleOptions, FormStorageAdapter } from '@form-engine-ts/core';
 
 interface D1ResultLike<T = Record<string, unknown>> {
     readonly success: boolean;
@@ -15,6 +15,8 @@ interface D1DatabaseLike {
     batch(statements: readonly D1PreparedStatementLike[]): Promise<readonly D1ResultLike[]>;
 }
 interface D1StorageOptions {
+    readonly schemaValidation?: ValidateFormSchemaOptions;
+    readonly lifecycle?: FormLifecycleOptions;
     readonly db: D1DatabaseLike;
     readonly schemasTable?: string;
     readonly responsesTable?: string;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { FormStorageAdapter } from '@form-engine-ts/core';
+import { ValidateFormSchemaOptions, FormLifecycleOptions, FormStorageAdapter } from '@form-engine-ts/core';
 
 interface D1ResultLike<T = Record<string, unknown>> {
     readonly success: boolean;
@@ -15,6 +15,8 @@ interface D1DatabaseLike {
     batch(statements: readonly D1PreparedStatementLike[]): Promise<readonly D1ResultLike[]>;
 }
 interface D1StorageOptions {
+    readonly schemaValidation?: ValidateFormSchemaOptions;
+    readonly lifecycle?: FormLifecycleOptions;
     readonly db: D1DatabaseLike;
     readonly schemasTable?: string;
     readonly responsesTable?: string;

package/dist/index.js

@@ -1,5 +1,8 @@
 // src/index.ts
-import { assertValidFormSchema } from "@form-engine-ts/core";
+import {
+  assertValidFormSchema,
+  createFormLifecycleAdapter
+} from "@form-engine-ts/core";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -24,12 +27,12 @@ function parseSubmission(value, location) {
   }
   return cloneJson(parsed);
 }
-function parseSchemaRow(value, index) {
+function parseSchemaRow(value, index, validation = {}) {
   if (!isRecord(value)) throw new Error(`D1 schema row ${index} is invalid.`);
   const row = value;
   const schema = parseJson(row.schema_json, `schema row ${index}`);
   try {
-    assertValidFormSchema(schema);
+    assertValidFormSchema(schema, validation);
   } catch (cause) {
     throw new Error(`D1 schema row ${index} is invalid.`, { cause });
   }
@@ -115,10 +118,69 @@ function createD1Storage(options) {
     })();
     await migration;
   };
+  function lifecycleBackend(client) {
+    const query = async (sql, params) => {
+      const result = await boundStatement(client, sql, params).all();
+      assertSuccessful(result, "lifecycle");
+      if (result.results === void 0) throw new Error("D1 lifecycle result missing rows.");
+      return result.results;
+    };
+    const marker = (_index) => "?";
+    return {
+      resources: ["schema", "submission"],
+      async list(formId) {
+        await ensureReady();
+        const records = [];
+        for (const kind of ["schema", "submission"]) {
+          const table = kind === "schema" ? schemasTable : responsesTable;
+          const rows = await query(`SELECT * FROM ${table} WHERE form_id = ${marker(1)}`, [formId]);
+          for (const row of rows) {
+            if (!isRecord(row)) throw new TypeError("Invalid lifecycle row.");
+            const payload = row[kind === "schema" ? "schema_json" : "submission_json"];
+            const value = parseJson(payload, "lifecycle");
+            const id = kind === "schema" ? JSON.stringify([row.form_id, row.form_version]) : String(row.response_id);
+            records.push({ kind, id, value: { row, value } });
+          }
+        }
+        return records;
+      },
+      async remove(resource) {
+        if (!isRecord(resource.value) || !isRecord(resource.value.row))
+          throw new TypeError("Invalid lifecycle resource.");
+        const row = resource.value.row;
+        const schema = resource.kind === "schema";
+        const table = schema ? schemasTable : responsesTable;
+        const payloadColumn = schema ? "schema_json" : "submission_json";
+        const payload = row[payloadColumn];
+        const params = schema ? [row.form_id, row.form_version] : [row.response_id, row.form_id];
+        const identity = schema ? `form_id = ${marker(1)} AND form_version = ${marker(2)}` : `response_id = ${marker(1)} AND form_id = ${marker(2)}`;
+        params.push(typeof payload === "string" ? payload : JSON.stringify(payload));
+        const deleted = await query(
+          `DELETE FROM ${table} WHERE ${identity} AND ${payloadColumn} = ${marker(3)} RETURNING ${schema ? "form_id" : "response_id"}`,
+          params
+        );
+        if (deleted.length === 0) throw new Error("Deletion revision conflict or record disappeared.");
+        return deleted.length;
+      }
+    };
+  }
+  const lifecycle = createFormLifecycleAdapter(
+    lifecycleBackend(options.db),
+    options.lifecycle === void 0 ? {} : {
+      ...options.lifecycle,
+      ...options.lifecycle.scope === void 0 ? {} : {
+        scope: (resource) => {
+          if (!isRecord(resource.value)) throw new TypeError("Invalid lifecycle resource.");
+          return options.lifecycle?.scope?.({ ...resource, value: resource.value.value }) ?? {};
+        }
+      }
+    }
+  );
   return {
+    ...lifecycle,
     async saveSchema(schema) {
       await ensureReady();
-      assertValidFormSchema(schema);
+      assertValidFormSchema(schema, options.schemaValidation);
       await run(
         `INSERT INTO ${schemasTable} (form_id, form_version, schema_json, updated_at)
          VALUES (?, ?, ?, CURRENT_TIMESTAMP)
@@ -134,14 +196,14 @@ function createD1Storage(options) {
         `SELECT form_id, form_version, schema_json FROM ${schemasTable} WHERE form_id = ? AND form_version = ? LIMIT 1`,
         [formId, formVersion]
       ).first();
-      return row === null ? null : parseSchemaRow(row, 0);
+      return row === null ? null : parseSchemaRow(row, 0, options.schemaValidation);
     },
     async listSchemas() {
       await ensureReady();
       const rows = await all(
         `SELECT form_id, form_version, schema_json FROM ${schemasTable} ORDER BY form_id, form_version`
       );
-      return rows.map(parseSchemaRow);
+      return rows.map((row, index) => parseSchemaRow(row, index, options.schemaValidation));
     },
     async deleteSchema(formId, formVersion) {
       await ensureReady();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-engine-ts/storage-d1",
-  "version": "7.17.2",
+  "version": "7.18.0",
   "publishConfig": {
     "access": "public"
   },
@@ -41,7 +41,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@form-engine-ts/core": "7.17.2"
+    "@form-engine-ts/core": "7.18.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20240000.0"
@@ -52,7 +52,8 @@
     }
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240000.0"
+    "@cloudflare/workers-types": "^4.20240000.0",
+    "@form-engine-ts/storage": "7.18.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --clean --external @form-engine-ts/core",