@form-engine-ts/storage-d1 7.18.1 → 8.0.1

package/dist/index.cjs

@@ -240,6 +240,61 @@ function createD1Storage(options) {
         [stored.id, stored.formId, stored.formVersion, stored.locale, stored.submittedAt, JSON.stringify(stored)]
       );
     },
+    async saveSubmissionWithinLimit(submission, maxResponses, saveOptions = {}) {
+      if (!Number.isInteger(maxResponses) || maxResponses < 1)
+        throw new RangeError("maxResponses must be a positive integer.");
+      await ensureReady();
+      const stored = parseSubmission(submission, `input "${String(submission?.id)}"`);
+      const payloadHash = await (0, import_core.hashFormSubmissionPayload)(stored);
+      const idempotent = saveOptions.idempotent === true;
+      const existingRow = await boundStatement(
+        options.db,
+        `SELECT response_id, form_id, form_version, locale, submitted_at, submission_json
+         FROM ${responsesTable} WHERE response_id = ? LIMIT 1`,
+        [stored.id]
+      ).first();
+      if (existingRow !== null) {
+        if (saveOptions.idempotent !== true) throw new Error(`A submission with ID "${stored.id}" already exists.`);
+        const existing = parseSubmissionRow(existingRow, 0);
+        const existingPayloadHash = await (0, import_core.hashFormSubmissionPayload)(existing);
+        if (existingPayloadHash === payloadHash) return { status: "duplicate", submission: existing, payloadHash };
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      const inserted = await boundStatement(
+        options.db,
+        `INSERT INTO ${responsesTable}
+          (response_id, form_id, form_version, locale, submitted_at, submission_json)
+         SELECT ?, ?, ?, ?, ?, ?
+         WHERE (SELECT COUNT(*) FROM ${responsesTable} WHERE form_id = ? AND form_version = ?) < ?
+         RETURNING response_id`,
+        [
+          stored.id,
+          stored.formId,
+          stored.formVersion,
+          stored.locale,
+          stored.submittedAt,
+          JSON.stringify(stored),
+          stored.formId,
+          stored.formVersion,
+          maxResponses
+        ]
+      ).first();
+      if (inserted === null) {
+        const racedRow = await boundStatement(
+          options.db,
+          `SELECT response_id, form_id, form_version, locale, submitted_at, submission_json
+           FROM ${responsesTable} WHERE response_id = ? LIMIT 1`,
+          [stored.id]
+        ).first();
+        if (racedRow === null) return { status: "limit_reached" };
+        if (!idempotent) throw new Error(`A submission with ID "${stored.id}" already exists.`);
+        const raced = parseSubmissionRow(racedRow, 0);
+        const existingPayloadHash = await (0, import_core.hashFormSubmissionPayload)(raced);
+        if (existingPayloadHash === payloadHash) return { status: "duplicate", submission: raced, payloadHash };
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      if (saveOptions.idempotent === true) return { status: "created", submission: stored, payloadHash };
+    },
     async listSubmissions(formId, formVersion, queryOptions) {
       await ensureReady();
       const conditions = ["form_id = ?"];
@@ -263,6 +318,25 @@ function createD1Storage(options) {
       );
       return rows.map(parseSubmissionRow);
     },
+    async countSubmissions(formId, formVersion, queryOptions) {
+      await ensureReady();
+      const conditions = ["form_id = ?"];
+      const params = [formId];
+      if (formVersion !== void 0) {
+        conditions.push("form_version = ?");
+        params.push(formVersion);
+      }
+      if (queryOptions?.since !== void 0) {
+        conditions.push("submitted_at >= ?");
+        params.push(queryOptions.since);
+      }
+      if (queryOptions?.until !== void 0) {
+        conditions.push("submitted_at <= ?");
+        params.push(queryOptions.until);
+      }
+      const row = await options.db.prepare(`SELECT COUNT(*) AS count FROM ${responsesTable} WHERE ${conditions.join(" AND ")}`).bind(...params).first();
+      return Number(row?.count ?? 0);
+    },
     async deleteSubmission(submissionId) {
       await ensureReady();
       await run(`DELETE FROM ${responsesTable} WHERE response_id = ?`, [submissionId]);

package/dist/index.js

@@ -1,7 +1,8 @@
 // src/index.ts
 import {
   assertValidFormSchema,
-  createFormLifecycleAdapter
+  createFormLifecycleAdapter,
+  hashFormSubmissionPayload
 } from "@form-engine-ts/core";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -219,6 +220,61 @@ function createD1Storage(options) {
         [stored.id, stored.formId, stored.formVersion, stored.locale, stored.submittedAt, JSON.stringify(stored)]
       );
     },
+    async saveSubmissionWithinLimit(submission, maxResponses, saveOptions = {}) {
+      if (!Number.isInteger(maxResponses) || maxResponses < 1)
+        throw new RangeError("maxResponses must be a positive integer.");
+      await ensureReady();
+      const stored = parseSubmission(submission, `input "${String(submission?.id)}"`);
+      const payloadHash = await hashFormSubmissionPayload(stored);
+      const idempotent = saveOptions.idempotent === true;
+      const existingRow = await boundStatement(
+        options.db,
+        `SELECT response_id, form_id, form_version, locale, submitted_at, submission_json
+         FROM ${responsesTable} WHERE response_id = ? LIMIT 1`,
+        [stored.id]
+      ).first();
+      if (existingRow !== null) {
+        if (saveOptions.idempotent !== true) throw new Error(`A submission with ID "${stored.id}" already exists.`);
+        const existing = parseSubmissionRow(existingRow, 0);
+        const existingPayloadHash = await hashFormSubmissionPayload(existing);
+        if (existingPayloadHash === payloadHash) return { status: "duplicate", submission: existing, payloadHash };
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      const inserted = await boundStatement(
+        options.db,
+        `INSERT INTO ${responsesTable}
+          (response_id, form_id, form_version, locale, submitted_at, submission_json)
+         SELECT ?, ?, ?, ?, ?, ?
+         WHERE (SELECT COUNT(*) FROM ${responsesTable} WHERE form_id = ? AND form_version = ?) < ?
+         RETURNING response_id`,
+        [
+          stored.id,
+          stored.formId,
+          stored.formVersion,
+          stored.locale,
+          stored.submittedAt,
+          JSON.stringify(stored),
+          stored.formId,
+          stored.formVersion,
+          maxResponses
+        ]
+      ).first();
+      if (inserted === null) {
+        const racedRow = await boundStatement(
+          options.db,
+          `SELECT response_id, form_id, form_version, locale, submitted_at, submission_json
+           FROM ${responsesTable} WHERE response_id = ? LIMIT 1`,
+          [stored.id]
+        ).first();
+        if (racedRow === null) return { status: "limit_reached" };
+        if (!idempotent) throw new Error(`A submission with ID "${stored.id}" already exists.`);
+        const raced = parseSubmissionRow(racedRow, 0);
+        const existingPayloadHash = await hashFormSubmissionPayload(raced);
+        if (existingPayloadHash === payloadHash) return { status: "duplicate", submission: raced, payloadHash };
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      if (saveOptions.idempotent === true) return { status: "created", submission: stored, payloadHash };
+    },
     async listSubmissions(formId, formVersion, queryOptions) {
       await ensureReady();
       const conditions = ["form_id = ?"];
@@ -242,6 +298,25 @@ function createD1Storage(options) {
       );
       return rows.map(parseSubmissionRow);
     },
+    async countSubmissions(formId, formVersion, queryOptions) {
+      await ensureReady();
+      const conditions = ["form_id = ?"];
+      const params = [formId];
+      if (formVersion !== void 0) {
+        conditions.push("form_version = ?");
+        params.push(formVersion);
+      }
+      if (queryOptions?.since !== void 0) {
+        conditions.push("submitted_at >= ?");
+        params.push(queryOptions.since);
+      }
+      if (queryOptions?.until !== void 0) {
+        conditions.push("submitted_at <= ?");
+        params.push(queryOptions.until);
+      }
+      const row = await options.db.prepare(`SELECT COUNT(*) AS count FROM ${responsesTable} WHERE ${conditions.join(" AND ")}`).bind(...params).first();
+      return Number(row?.count ?? 0);
+    },
     async deleteSubmission(submissionId) {
       await ensureReady();
       await run(`DELETE FROM ${responsesTable} WHERE response_id = ?`, [submissionId]);

package/package.json

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