@form-engine-ts/storage-azure-table 6.7.0 → 6.9.0

package/README.md

@@ -20,7 +20,11 @@ const submissionsTableClient = TableClient.fromConnectionString(
   process.env.AZURE_STORAGE_CONNECTION_STRING!,
   "responses"
 );
-const storage = createAzureTableStorage({ schemasTableClient, submissionsTableClient });
+interface SubmissionMeta {
+  readonly tenantId: string;
+}
+
+const storage = createAzureTableStorage<SubmissionMeta>({ schemasTableClient, submissionsTableClient });
 
 const page = await storage.listSubmissionPage("contact", { pageSize: 500, locale: "ja" });
 ```
@@ -36,6 +40,14 @@ to fill the requested logical page after client-side filtering. `buildSubmission
 The deprecated `client`, `submissionCodec`, and `toODataFilter` options remain available for compatibility. The caller
 owns table creation, credentials, retries, and client lifecycle.
 
+The default codec persists the canonical `FormSubmission.values` payload and never creates an `answers` property. Set
+`rejectLegacyAnswers: true` to fail explicitly when a legacy entity is encountered; no legacy decoding or migration is
+performed. `idempotentSubmissions: true` enables typed `created`, `duplicate`, and `conflict` results from
+`saveSubmission(submission)`. Pass `validateAgainstSchema: true` to re-validate against the stored schema. Pass
+`submissionSchema`, `submissionValidator`, or `validation` to validate every submission before it is written; the same
+source can be supplied per call as `saveSubmission(submission, { validation })`. A source can be a FormSchema, a
+Zod-compatible object with `safeParse`, or an async validator callback.
+
 `listTextAnswerPage` accepts either the legacy single field ID or `TextAnswerPageQueryOptions.fieldIds`. Page size counts
 emitted text items rather than entities. Its opaque Base64 JSON cursor retains the Azure continuation token plus entity
 and field indexes, so a page can resume inside a multi-answer entity without gaps or duplicates. Empty answers do not
@@ -43,6 +55,5 @@ consume the item limit, and scanning remains bounded by `maxScanPages`. Cursor f
 version, sorted fields, and a SHA-256 filter fingerprint. Reusing a cursor with different query context throws
 `invalid_cursor_context`.
 
-`createLegacyAzureTableCodec()` decodes older entities using `PartitionKey`, `RowKey`, `answers`, `answeredAt`, and
-`surveyVersion` into the canonical `FormSubmission` shape. Custom partition- and row-key generators can be supplied
-for migration tooling.
+The legacy codec APIs are retained only as deprecated source symbols for existing applications; the standard factory does
+not use them.

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   createAzureTableStorage: () => createAzureTableStorage,
+  createAzureTableSubmissionCodec: () => createAzureTableSubmissionCodec,
   createLegacyArrayAzureTableCodec: () => createLegacyArrayAzureTableCodec,
   createLegacyAzureTableCodec: () => createLegacyAzureTableCodec,
   defaultAzureTableSubmissionCodec: () => defaultAzureTableSubmissionCodec,
@@ -292,22 +293,25 @@ function scalarMetadata(metadata) {
     })
   );
 }
-var defaultAzureTableSubmissionCodec = {
-  createEntity: (submission) => ({
-    ...scalarMetadata(submission.metadata),
-    kind: "submission",
-    formVersion: submission.formVersion,
-    locale: submission.locale,
-    submittedAt: submission.submittedAt,
-    responseId: submission.id,
-    payload: JSON.stringify(submission)
-  }),
-  deserialize: (entity) => parseSubmission(entity.payload, "submission entity"),
-  matchesEntity: (entity) => entity.kind === "submission",
-  createPartitionKey: (submission) => submission.formId,
-  createPartitionKeyFromQuery: (formId) => formId,
-  createRowKey: defaultSubmissionRowKey
-};
+function createAzureTableSubmissionCodec() {
+  return {
+    createEntity: (submission) => ({
+      ...scalarMetadata(submission.metadata),
+      kind: "submission",
+      formVersion: submission.formVersion,
+      locale: submission.locale,
+      submittedAt: submission.submittedAt,
+      responseId: submission.id,
+      payload: JSON.stringify(submission)
+    }),
+    deserialize: (entity) => parseSubmission(entity.payload, "submission entity"),
+    matchesEntity: (entity) => entity.kind === "submission",
+    createPartitionKey: (submission) => submission.formId,
+    createPartitionKeyFromQuery: (formId) => formId,
+    createRowKey: defaultSubmissionRowKey
+  };
+}
+var defaultAzureTableSubmissionCodec = createAzureTableSubmissionCodec();
 function legacyCodec(codec) {
   return {
     createEntity: (value) => ({
@@ -402,13 +406,13 @@ function submissionFilterToOData(filter, mapping) {
     ...filter.to === void 0 ? [] : [`${property} le ${valueToOData(filter.to)}`]
   ].join(" and ");
 }
-function defaultSubmissionFilter(codec, formId, options, legacyExtension, mapping) {
+function defaultSubmissionFilter(codec, formId, options, legacyExtension, mapping, rejectLegacyAnswers = false) {
   const partitionKey = codec.createPartitionKeyFromQuery(formId, options);
   const ast = options.filter === void 0 || typeof options.filter === "function" ? void 0 : submissionFilterToOData(options.filter, mapping);
   const keys = physicalKeyNames(mapping);
   return [
     ...partitionKey === void 0 ? [] : [`${keys.partitionKey} eq '${escapeOData(partitionKey)}'`],
-    ...codec === defaultAzureTableSubmissionCodec ? ["kind eq 'submission'"] : [],
+    ...codec === defaultAzureTableSubmissionCodec && !rejectLegacyAnswers ? ["kind eq 'submission'"] : [],
     ...options.version === void 0 ? [] : [`${propertyName(mapping, "formVersion", "formVersion")} eq ${options.version}`],
     ...options.since === void 0 ? [] : [`${propertyName(mapping, "submittedAt", "submittedAt")} ge '${escapeOData(options.since)}'`],
     ...options.until === void 0 ? [] : [`${propertyName(mapping, "submittedAt", "submittedAt")} le '${escapeOData(options.until)}'`],
@@ -420,6 +424,10 @@ function defaultSubmissionFilter(codec, formId, options, legacyExtension, mappin
 function isNotFound(error) {
   return isRecord(error) && (error.statusCode === 404 || error.code === "ResourceNotFound" || error.code === "EntityNotFound");
 }
+function isDuplicateEntityError(error) {
+  const message = error instanceof Error ? error.message : isRecord(error) ? String(error.message ?? "") : "";
+  return isRecord(error) && (error.statusCode === 409 || error.code === "EntityAlreadyExists") || /alreadyexists|duplicate/iu.test(message);
+}
 function matchesBuiltInFilters(submission, formId, options) {
   return submission.formId === formId && (options.version === void 0 || submission.formVersion === options.version) && (options.since === void 0 || submission.submittedAt >= options.since) && (options.until === void 0 || submission.submittedAt <= options.until) && (options.locale === void 0 || submission.locale === options.locale);
 }
@@ -450,13 +458,22 @@ function createAzureTableStorage(options = {}) {
       formId,
       query,
       options.toODataFilter?.(query) ?? metadataFiltersToOData(query, options.fieldMapping),
-      options.fieldMapping
+      options.fieldMapping,
+      options.rejectLegacyAnswers
     );
   };
-  const deserializeIfMatching = (entity) => codec.matchesEntity(entity) ? parseSubmissionEntity(entity, codec, options.fieldMapping, valueCodec) : void 0;
   const ensureWritable = () => {
     if (options.readOnly === true) throw new Error("Azure Table storage is read-only.");
   };
+  const rejectLegacyEntity = (entity) => {
+    if (options.rejectLegacyAnswers === true && Object.hasOwn(entity, "answers")) {
+      throw new Error("Azure Table legacy answers column is not supported by the standard submission storage.");
+    }
+  };
+  const deserializeIfMatching = (entity) => {
+    rejectLegacyEntity(entity);
+    return codec.matchesEntity(entity) ? parseSubmissionEntity(entity, codec, options.fieldMapping, valueCodec) : void 0;
+  };
   const listSubmissionCandidates = async (formId, query) => {
     const client = await submissionClient(formId, query);
     const found = [];
@@ -501,18 +518,50 @@ function createAzureTableStorage(options = {}) {
       ensureWritable();
       await (await schemaClient(formId)).deleteEntity(formId, schemaRowKey(formVersion));
     },
-    async saveSubmission(submission) {
+    async saveSubmission(submission, saveOptions = {}) {
       ensureWritable();
       const stored = parseSubmission(submission, `input ${String(submission?.id)}`);
+      const explicitValidation = saveOptions.validator ?? saveOptions.validation;
+      const configuredValidation = options.submissionValidator ?? options.submissionSchema ?? options.validator ?? options.schema ?? options.validation;
+      if (explicitValidation !== void 0) await (0, import_core.assertValidFormSubmissionWith)(explicitValidation, stored);
+      if (explicitValidation === void 0 && configuredValidation !== void 0) {
+        await (0, import_core.assertValidFormSubmissionWith)(configuredValidation, stored);
+      }
+      if (options.validateSubmissions === true || saveOptions.validateAgainstSchema === true) {
+        const schema = parseSchemaEntity(
+          await (await schemaClient(stored.formId)).getEntity(stored.formId, schemaRowKey(stored.formVersion))
+        );
+        (0, import_core.assertValidFormSubmission)(schema, stored);
+      }
+      const payloadHash = await (0, import_core.hashFormSubmissionPayload)(stored);
       const mappedEntity = mappedSubmissionEntity(codec.createEntity(stored), stored, options.fieldMapping, valueCodec);
       const keys = physicalKeyNames(options.fieldMapping);
-      await (await submissionClient(stored.formId)).createEntity({
+      const partitionKey = codec.createPartitionKey(stored);
+      const rowKey = codec.createRowKey(stored);
+      const entity = {
         ...mappedEntity,
-        partitionKey: codec.createPartitionKey(stored),
-        rowKey: codec.createRowKey(stored),
-        [keys.partitionKey]: codec.createPartitionKey(stored),
-        [keys.rowKey]: codec.createRowKey(stored)
-      });
+        payloadHash,
+        partitionKey,
+        rowKey,
+        [keys.partitionKey]: partitionKey,
+        [keys.rowKey]: rowKey
+      };
+      try {
+        await (await submissionClient(stored.formId)).createEntity(entity);
+      } catch (error) {
+        const idempotent = saveOptions.idempotent ?? options.idempotentSubmissions ?? options.idempotency ?? false;
+        if (!idempotent || !isDuplicateEntityError(error)) throw error;
+        const existingEntity = await (await submissionClient(stored.formId)).getEntity(partitionKey, rowKey);
+        const existing = parseSubmissionEntity(existingEntity, codec, options.fieldMapping, valueCodec);
+        const existingPayloadHash = typeof existingEntity.payloadHash === "string" ? existingEntity.payloadHash : await (0, import_core.hashFormSubmissionPayload)(existing);
+        if (existingPayloadHash === payloadHash) {
+          return { status: "duplicate", submission: existing, payloadHash };
+        }
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      if (saveOptions.idempotent ?? options.idempotentSubmissions ?? options.idempotency ?? false) {
+        return { status: "created", submission: stored, payloadHash };
+      }
     },
     async listSubmissions(formId, formVersion, queryOptions = {}) {
       return listSubmissionCandidates(formId, {
@@ -717,6 +766,7 @@ function createAzureTableStorage(options = {}) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAzureTableStorage,
+  createAzureTableSubmissionCodec,
   createLegacyArrayAzureTableCodec,
   createLegacyAzureTableCodec,
   defaultAzureTableSubmissionCodec,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { FormSubmission, BaseSubmissionMetadata, PagedSubmissionStorageAdapter, SubmissionPageQueryOptions, StrictFormSubmission, SubmissionFilter } from '@form-engine-ts/core';
+import { FormSubmission, BaseSubmissionMetadata, PagedSubmissionStorageAdapter, SubmissionPageQueryOptions, FormSubmissionValidationSource, FormSubmissionValidator, StrictFormSubmission, SaveSubmissionOptions, SubmissionSaveResult, SubmissionFilter, JsonValue, TextAnswerPageQueryOptions, TypedTextAnswerPage } from '@form-engine-ts/core';
 
 interface AzureTableListOptions {
     readonly queryOptions?: {
@@ -104,6 +104,21 @@ interface AzureTableStorageOptions<T = FormSubmission> {
     readonly maxScanPages?: number;
     readonly fieldMapping?: AzureTableFieldMapping;
     readonly readOnly?: boolean;
+    /** Detect legacy entities that expose an `answers` column and fail explicitly. */
+    readonly rejectLegacyAnswers?: boolean;
+    /** Enable typed duplicate/conflict results for submission IDs. */
+    readonly idempotentSubmissions?: boolean;
+    /** Alias for idempotentSubmissions. */
+    readonly idempotency?: boolean;
+    /** Re-validate a submission against the stored FormSchema before saving. */
+    readonly validateSubmissions?: boolean;
+    /** Validate every saved submission with an application-owned schema or callback. */
+    readonly submissionSchema?: FormSubmissionValidationSource;
+    readonly submissionValidator?: FormSubmissionValidator;
+    /** Alias for `submissionValidator`/`submissionSchema`. */
+    readonly validation?: FormSubmissionValidationSource;
+    readonly validator?: FormSubmissionValidationSource;
+    readonly schema?: FormSubmissionValidationSource;
 }
 interface AzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata = BaseSubmissionMetadata> extends PagedSubmissionStorageAdapter {
     readonly fetchPage: (formId: string, options?: {
@@ -118,6 +133,29 @@ interface AzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata = BaseSu
         readonly nextCursor?: string;
     }>;
 }
+type TypedAzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata | undefined = undefined> = Omit<PagedSubmissionStorageAdapter, "saveSubmission" | "listSubmissionPage" | "listTextAnswerPage"> & {
+    readonly saveSubmission: (submission: FormSubmission<TMeta>, options?: SaveSubmissionOptions) => Promise<undefined | SubmissionSaveResult<TMeta>>;
+    readonly listSubmissionPage: (formId: string, options?: SubmissionPageQueryOptions & {
+        readonly filter?: SubmissionFilter | ((submission: FormSubmission<TMeta>) => boolean);
+        readonly metadataFilters?: TMeta extends BaseSubmissionMetadata ? Partial<TMeta> : Readonly<Record<string, JsonValue>>;
+    }) => Promise<{
+        readonly items: readonly FormSubmission<TMeta>[];
+        readonly nextCursor?: string;
+        readonly hasMore: boolean;
+    }>;
+    readonly fetchPage: (formId: string, options?: {
+        readonly pageSize?: number;
+        readonly fromSubmittedAt?: string;
+        readonly toSubmittedAt?: string;
+        readonly locale?: string;
+        readonly metadataFilters?: TMeta extends BaseSubmissionMetadata ? Partial<TMeta> : Readonly<Record<string, JsonValue>>;
+        readonly cursor?: string;
+    }) => Promise<{
+        readonly items: readonly FormSubmission<TMeta>[];
+        readonly nextCursor?: string;
+    }>;
+    readonly listTextAnswerPage: (formId: string, fieldIdOrOptions?: string | TextAnswerPageQueryOptions, options?: TextAnswerPageQueryOptions) => Promise<TypedTextAnswerPage<TMeta>>;
+};
 interface AzureTextAnswerCursorPayload {
     readonly formatVersion: 1;
     readonly formId: string;
@@ -128,9 +166,11 @@ interface AzureTextAnswerCursorPayload {
     readonly entityIndex: number;
     readonly fieldIndex: number;
 }
+declare function createAzureTableSubmissionCodec<TMeta extends BaseSubmissionMetadata | undefined = undefined>(): AzureTableSubmissionCodec<FormSubmission<TMeta>>;
 declare const defaultAzureTableSubmissionCodec: AzureTableSubmissionCodec<FormSubmission>;
 declare function metadataFiltersToOData(options: SubmissionPageQueryOptions, mapping?: AzureTableFieldMapping): string;
 declare function submissionFilterToOData(filter: SubmissionFilter, mapping?: AzureTableFieldMapping): string | undefined;
 declare function createAzureTableStorage(options?: AzureTableStorageOptions): PagedSubmissionStorageAdapter;
+declare function createAzureTableStorage<TMeta extends BaseSubmissionMetadata | undefined = undefined>(options?: AzureTableStorageOptions): TypedAzureTableStorageAdapter<TMeta>;
 
-export { type AzureTableClientLike, type AzureTableEntityCodec, type AzureTableEntityIterator, type AzureTableEntityPage, type AzureTableFieldMapping, type AzureTableLegacyCodec, type AzureTableLegacyEntity, type AzureTableListOptions, type AzureTablePageSettings, type AzureTableStorageAdapter, type AzureTableStorageOptions, type AzureTableSubmissionCodec, type AzureTableValueCodec, type AzureTextAnswerCursorPayload, type LegacyAnswerArrayEntity, type LegacyArrayAzureTableCodec, createAzureTableStorage, createLegacyArrayAzureTableCodec, createLegacyAzureTableCodec, defaultAzureTableSubmissionCodec, metadataFiltersToOData, submissionFilterToOData };
+export { type AzureTableClientLike, type AzureTableEntityCodec, type AzureTableEntityIterator, type AzureTableEntityPage, type AzureTableFieldMapping, type AzureTableLegacyCodec, type AzureTableLegacyEntity, type AzureTableListOptions, type AzureTablePageSettings, type AzureTableStorageAdapter, type AzureTableStorageOptions, type AzureTableSubmissionCodec, type AzureTableValueCodec, type AzureTextAnswerCursorPayload, type LegacyAnswerArrayEntity, type LegacyArrayAzureTableCodec, type TypedAzureTableStorageAdapter, createAzureTableStorage, createAzureTableSubmissionCodec, createLegacyArrayAzureTableCodec, createLegacyAzureTableCodec, defaultAzureTableSubmissionCodec, metadataFiltersToOData, submissionFilterToOData };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { FormSubmission, BaseSubmissionMetadata, PagedSubmissionStorageAdapter, SubmissionPageQueryOptions, StrictFormSubmission, SubmissionFilter } from '@form-engine-ts/core';
+import { FormSubmission, BaseSubmissionMetadata, PagedSubmissionStorageAdapter, SubmissionPageQueryOptions, FormSubmissionValidationSource, FormSubmissionValidator, StrictFormSubmission, SaveSubmissionOptions, SubmissionSaveResult, SubmissionFilter, JsonValue, TextAnswerPageQueryOptions, TypedTextAnswerPage } from '@form-engine-ts/core';
 
 interface AzureTableListOptions {
     readonly queryOptions?: {
@@ -104,6 +104,21 @@ interface AzureTableStorageOptions<T = FormSubmission> {
     readonly maxScanPages?: number;
     readonly fieldMapping?: AzureTableFieldMapping;
     readonly readOnly?: boolean;
+    /** Detect legacy entities that expose an `answers` column and fail explicitly. */
+    readonly rejectLegacyAnswers?: boolean;
+    /** Enable typed duplicate/conflict results for submission IDs. */
+    readonly idempotentSubmissions?: boolean;
+    /** Alias for idempotentSubmissions. */
+    readonly idempotency?: boolean;
+    /** Re-validate a submission against the stored FormSchema before saving. */
+    readonly validateSubmissions?: boolean;
+    /** Validate every saved submission with an application-owned schema or callback. */
+    readonly submissionSchema?: FormSubmissionValidationSource;
+    readonly submissionValidator?: FormSubmissionValidator;
+    /** Alias for `submissionValidator`/`submissionSchema`. */
+    readonly validation?: FormSubmissionValidationSource;
+    readonly validator?: FormSubmissionValidationSource;
+    readonly schema?: FormSubmissionValidationSource;
 }
 interface AzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata = BaseSubmissionMetadata> extends PagedSubmissionStorageAdapter {
     readonly fetchPage: (formId: string, options?: {
@@ -118,6 +133,29 @@ interface AzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata = BaseSu
         readonly nextCursor?: string;
     }>;
 }
+type TypedAzureTableStorageAdapter<TMeta extends BaseSubmissionMetadata | undefined = undefined> = Omit<PagedSubmissionStorageAdapter, "saveSubmission" | "listSubmissionPage" | "listTextAnswerPage"> & {
+    readonly saveSubmission: (submission: FormSubmission<TMeta>, options?: SaveSubmissionOptions) => Promise<undefined | SubmissionSaveResult<TMeta>>;
+    readonly listSubmissionPage: (formId: string, options?: SubmissionPageQueryOptions & {
+        readonly filter?: SubmissionFilter | ((submission: FormSubmission<TMeta>) => boolean);
+        readonly metadataFilters?: TMeta extends BaseSubmissionMetadata ? Partial<TMeta> : Readonly<Record<string, JsonValue>>;
+    }) => Promise<{
+        readonly items: readonly FormSubmission<TMeta>[];
+        readonly nextCursor?: string;
+        readonly hasMore: boolean;
+    }>;
+    readonly fetchPage: (formId: string, options?: {
+        readonly pageSize?: number;
+        readonly fromSubmittedAt?: string;
+        readonly toSubmittedAt?: string;
+        readonly locale?: string;
+        readonly metadataFilters?: TMeta extends BaseSubmissionMetadata ? Partial<TMeta> : Readonly<Record<string, JsonValue>>;
+        readonly cursor?: string;
+    }) => Promise<{
+        readonly items: readonly FormSubmission<TMeta>[];
+        readonly nextCursor?: string;
+    }>;
+    readonly listTextAnswerPage: (formId: string, fieldIdOrOptions?: string | TextAnswerPageQueryOptions, options?: TextAnswerPageQueryOptions) => Promise<TypedTextAnswerPage<TMeta>>;
+};
 interface AzureTextAnswerCursorPayload {
     readonly formatVersion: 1;
     readonly formId: string;
@@ -128,9 +166,11 @@ interface AzureTextAnswerCursorPayload {
     readonly entityIndex: number;
     readonly fieldIndex: number;
 }
+declare function createAzureTableSubmissionCodec<TMeta extends BaseSubmissionMetadata | undefined = undefined>(): AzureTableSubmissionCodec<FormSubmission<TMeta>>;
 declare const defaultAzureTableSubmissionCodec: AzureTableSubmissionCodec<FormSubmission>;
 declare function metadataFiltersToOData(options: SubmissionPageQueryOptions, mapping?: AzureTableFieldMapping): string;
 declare function submissionFilterToOData(filter: SubmissionFilter, mapping?: AzureTableFieldMapping): string | undefined;
 declare function createAzureTableStorage(options?: AzureTableStorageOptions): PagedSubmissionStorageAdapter;
+declare function createAzureTableStorage<TMeta extends BaseSubmissionMetadata | undefined = undefined>(options?: AzureTableStorageOptions): TypedAzureTableStorageAdapter<TMeta>;
 
-export { type AzureTableClientLike, type AzureTableEntityCodec, type AzureTableEntityIterator, type AzureTableEntityPage, type AzureTableFieldMapping, type AzureTableLegacyCodec, type AzureTableLegacyEntity, type AzureTableListOptions, type AzureTablePageSettings, type AzureTableStorageAdapter, type AzureTableStorageOptions, type AzureTableSubmissionCodec, type AzureTableValueCodec, type AzureTextAnswerCursorPayload, type LegacyAnswerArrayEntity, type LegacyArrayAzureTableCodec, createAzureTableStorage, createLegacyArrayAzureTableCodec, createLegacyAzureTableCodec, defaultAzureTableSubmissionCodec, metadataFiltersToOData, submissionFilterToOData };
+export { type AzureTableClientLike, type AzureTableEntityCodec, type AzureTableEntityIterator, type AzureTableEntityPage, type AzureTableFieldMapping, type AzureTableLegacyCodec, type AzureTableLegacyEntity, type AzureTableListOptions, type AzureTablePageSettings, type AzureTableStorageAdapter, type AzureTableStorageOptions, type AzureTableSubmissionCodec, type AzureTableValueCodec, type AzureTextAnswerCursorPayload, type LegacyAnswerArrayEntity, type LegacyArrayAzureTableCodec, type TypedAzureTableStorageAdapter, createAzureTableStorage, createAzureTableSubmissionCodec, createLegacyArrayAzureTableCodec, createLegacyAzureTableCodec, defaultAzureTableSubmissionCodec, metadataFiltersToOData, submissionFilterToOData };

package/dist/index.js

@@ -1,5 +1,12 @@
 // src/index.ts
-import { assertValidFormSchema, matchesSubmissionPageFilters, normalizeSubmissionPageSize } from "@form-engine-ts/core";
+import {
+  assertValidFormSchema,
+  assertValidFormSubmission,
+  assertValidFormSubmissionWith,
+  hashFormSubmissionPayload,
+  matchesSubmissionPageFilters,
+  normalizeSubmissionPageSize
+} from "@form-engine-ts/core";
 function createLegacyArrayAzureTableCodec(options = {}) {
   const defaultLocale = options.defaultLocale ?? "ja";
   if (defaultLocale.trim().length === 0) throw new TypeError("defaultLocale must not be empty.");
@@ -263,22 +270,25 @@ function scalarMetadata(metadata) {
     })
   );
 }
-var defaultAzureTableSubmissionCodec = {
-  createEntity: (submission) => ({
-    ...scalarMetadata(submission.metadata),
-    kind: "submission",
-    formVersion: submission.formVersion,
-    locale: submission.locale,
-    submittedAt: submission.submittedAt,
-    responseId: submission.id,
-    payload: JSON.stringify(submission)
-  }),
-  deserialize: (entity) => parseSubmission(entity.payload, "submission entity"),
-  matchesEntity: (entity) => entity.kind === "submission",
-  createPartitionKey: (submission) => submission.formId,
-  createPartitionKeyFromQuery: (formId) => formId,
-  createRowKey: defaultSubmissionRowKey
-};
+function createAzureTableSubmissionCodec() {
+  return {
+    createEntity: (submission) => ({
+      ...scalarMetadata(submission.metadata),
+      kind: "submission",
+      formVersion: submission.formVersion,
+      locale: submission.locale,
+      submittedAt: submission.submittedAt,
+      responseId: submission.id,
+      payload: JSON.stringify(submission)
+    }),
+    deserialize: (entity) => parseSubmission(entity.payload, "submission entity"),
+    matchesEntity: (entity) => entity.kind === "submission",
+    createPartitionKey: (submission) => submission.formId,
+    createPartitionKeyFromQuery: (formId) => formId,
+    createRowKey: defaultSubmissionRowKey
+  };
+}
+var defaultAzureTableSubmissionCodec = createAzureTableSubmissionCodec();
 function legacyCodec(codec) {
   return {
     createEntity: (value) => ({
@@ -373,13 +383,13 @@ function submissionFilterToOData(filter, mapping) {
     ...filter.to === void 0 ? [] : [`${property} le ${valueToOData(filter.to)}`]
   ].join(" and ");
 }
-function defaultSubmissionFilter(codec, formId, options, legacyExtension, mapping) {
+function defaultSubmissionFilter(codec, formId, options, legacyExtension, mapping, rejectLegacyAnswers = false) {
   const partitionKey = codec.createPartitionKeyFromQuery(formId, options);
   const ast = options.filter === void 0 || typeof options.filter === "function" ? void 0 : submissionFilterToOData(options.filter, mapping);
   const keys = physicalKeyNames(mapping);
   return [
     ...partitionKey === void 0 ? [] : [`${keys.partitionKey} eq '${escapeOData(partitionKey)}'`],
-    ...codec === defaultAzureTableSubmissionCodec ? ["kind eq 'submission'"] : [],
+    ...codec === defaultAzureTableSubmissionCodec && !rejectLegacyAnswers ? ["kind eq 'submission'"] : [],
     ...options.version === void 0 ? [] : [`${propertyName(mapping, "formVersion", "formVersion")} eq ${options.version}`],
     ...options.since === void 0 ? [] : [`${propertyName(mapping, "submittedAt", "submittedAt")} ge '${escapeOData(options.since)}'`],
     ...options.until === void 0 ? [] : [`${propertyName(mapping, "submittedAt", "submittedAt")} le '${escapeOData(options.until)}'`],
@@ -391,6 +401,10 @@ function defaultSubmissionFilter(codec, formId, options, legacyExtension, mappin
 function isNotFound(error) {
   return isRecord(error) && (error.statusCode === 404 || error.code === "ResourceNotFound" || error.code === "EntityNotFound");
 }
+function isDuplicateEntityError(error) {
+  const message = error instanceof Error ? error.message : isRecord(error) ? String(error.message ?? "") : "";
+  return isRecord(error) && (error.statusCode === 409 || error.code === "EntityAlreadyExists") || /alreadyexists|duplicate/iu.test(message);
+}
 function matchesBuiltInFilters(submission, formId, options) {
   return submission.formId === formId && (options.version === void 0 || submission.formVersion === options.version) && (options.since === void 0 || submission.submittedAt >= options.since) && (options.until === void 0 || submission.submittedAt <= options.until) && (options.locale === void 0 || submission.locale === options.locale);
 }
@@ -421,13 +435,22 @@ function createAzureTableStorage(options = {}) {
       formId,
       query,
       options.toODataFilter?.(query) ?? metadataFiltersToOData(query, options.fieldMapping),
-      options.fieldMapping
+      options.fieldMapping,
+      options.rejectLegacyAnswers
     );
   };
-  const deserializeIfMatching = (entity) => codec.matchesEntity(entity) ? parseSubmissionEntity(entity, codec, options.fieldMapping, valueCodec) : void 0;
   const ensureWritable = () => {
     if (options.readOnly === true) throw new Error("Azure Table storage is read-only.");
   };
+  const rejectLegacyEntity = (entity) => {
+    if (options.rejectLegacyAnswers === true && Object.hasOwn(entity, "answers")) {
+      throw new Error("Azure Table legacy answers column is not supported by the standard submission storage.");
+    }
+  };
+  const deserializeIfMatching = (entity) => {
+    rejectLegacyEntity(entity);
+    return codec.matchesEntity(entity) ? parseSubmissionEntity(entity, codec, options.fieldMapping, valueCodec) : void 0;
+  };
   const listSubmissionCandidates = async (formId, query) => {
     const client = await submissionClient(formId, query);
     const found = [];
@@ -472,18 +495,50 @@ function createAzureTableStorage(options = {}) {
       ensureWritable();
       await (await schemaClient(formId)).deleteEntity(formId, schemaRowKey(formVersion));
     },
-    async saveSubmission(submission) {
+    async saveSubmission(submission, saveOptions = {}) {
       ensureWritable();
       const stored = parseSubmission(submission, `input ${String(submission?.id)}`);
+      const explicitValidation = saveOptions.validator ?? saveOptions.validation;
+      const configuredValidation = options.submissionValidator ?? options.submissionSchema ?? options.validator ?? options.schema ?? options.validation;
+      if (explicitValidation !== void 0) await assertValidFormSubmissionWith(explicitValidation, stored);
+      if (explicitValidation === void 0 && configuredValidation !== void 0) {
+        await assertValidFormSubmissionWith(configuredValidation, stored);
+      }
+      if (options.validateSubmissions === true || saveOptions.validateAgainstSchema === true) {
+        const schema = parseSchemaEntity(
+          await (await schemaClient(stored.formId)).getEntity(stored.formId, schemaRowKey(stored.formVersion))
+        );
+        assertValidFormSubmission(schema, stored);
+      }
+      const payloadHash = await hashFormSubmissionPayload(stored);
       const mappedEntity = mappedSubmissionEntity(codec.createEntity(stored), stored, options.fieldMapping, valueCodec);
       const keys = physicalKeyNames(options.fieldMapping);
-      await (await submissionClient(stored.formId)).createEntity({
+      const partitionKey = codec.createPartitionKey(stored);
+      const rowKey = codec.createRowKey(stored);
+      const entity = {
         ...mappedEntity,
-        partitionKey: codec.createPartitionKey(stored),
-        rowKey: codec.createRowKey(stored),
-        [keys.partitionKey]: codec.createPartitionKey(stored),
-        [keys.rowKey]: codec.createRowKey(stored)
-      });
+        payloadHash,
+        partitionKey,
+        rowKey,
+        [keys.partitionKey]: partitionKey,
+        [keys.rowKey]: rowKey
+      };
+      try {
+        await (await submissionClient(stored.formId)).createEntity(entity);
+      } catch (error) {
+        const idempotent = saveOptions.idempotent ?? options.idempotentSubmissions ?? options.idempotency ?? false;
+        if (!idempotent || !isDuplicateEntityError(error)) throw error;
+        const existingEntity = await (await submissionClient(stored.formId)).getEntity(partitionKey, rowKey);
+        const existing = parseSubmissionEntity(existingEntity, codec, options.fieldMapping, valueCodec);
+        const existingPayloadHash = typeof existingEntity.payloadHash === "string" ? existingEntity.payloadHash : await hashFormSubmissionPayload(existing);
+        if (existingPayloadHash === payloadHash) {
+          return { status: "duplicate", submission: existing, payloadHash };
+        }
+        return { status: "conflict", submissionId: stored.id, payloadHash, existingPayloadHash };
+      }
+      if (saveOptions.idempotent ?? options.idempotentSubmissions ?? options.idempotency ?? false) {
+        return { status: "created", submission: stored, payloadHash };
+      }
     },
     async listSubmissions(formId, formVersion, queryOptions = {}) {
       return listSubmissionCandidates(formId, {
@@ -687,6 +742,7 @@ function createAzureTableStorage(options = {}) {
 }
 export {
   createAzureTableStorage,
+  createAzureTableSubmissionCodec,
   createLegacyArrayAzureTableCodec,
   createLegacyAzureTableCodec,
   defaultAzureTableSubmissionCodec,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-engine-ts/storage-azure-table",
-  "version": "6.7.0",
+  "version": "6.9.0",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@form-engine-ts/core": "6.7.0"
+    "@form-engine-ts/core": "6.9.0"
   },
   "peerDependencies": {
     "@azure/data-tables": "^13.3.2"