dinah 0.14.0 → 0.15.1

package/dist/cdk.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_util = require("./util-DT6vwquI.cjs");
+const require_util = require("./util-CYPpI7J0.cjs");
 let aws_cdk_lib_aws_dynamodb = require("aws-cdk-lib/aws-dynamodb");
 aws_cdk_lib_aws_dynamodb = require_util.__toESM(aws_cdk_lib_aws_dynamodb, 1);
 //#region src/cdk.ts

package/dist/cdk.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cdk.cjs","names":["resolveAttrType","cdk"],"sources":["../src/cdk.ts"],"sourcesContent":["import type { Table } from \"./table\";\nimport * as cdk from \"aws-cdk-lib/aws-dynamodb\";\nimport { resolveAttrType } from \"./util\";\nimport type { TSchema } from \"typebox\";\n\nexport const resolveAttrs = (\n  schema: TSchema,\n  attrNames: (string | undefined)[],\n): cdk.Attribute[] | undefined => {\n  const names = attrNames.filter((name) => name !== undefined);\n  if (!names.length) return undefined;\n  return names.map((name) => ({\n    name,\n    type:\n      resolveAttrType(schema, name) === \"S\" ? cdk.AttributeType.STRING : cdk.AttributeType.NUMBER,\n  }));\n};\n\nexport const extractTableCdkConfig = (\n  table: Table,\n): Pick<\n  cdk.TablePropsV2,\n  \"tableName\" | \"partitionKey\" | \"sortKey\" | \"timeToLiveAttribute\" | \"globalSecondaryIndexes\"\n> => {\n  const { schema, def } = table;\n\n  const globalSecondaryIndexes = def.gsis\n    ? Object.entries(def.gsis).map(([indexName, gsi]) => ({\n        indexName,\n        partitionKeys: resolveAttrs(schema, [gsi.partitionKey].flat()),\n        sortKeys: resolveAttrs(schema, [gsi.sortKey].flat()),\n      }))\n    : undefined;\n\n  return {\n    tableName: def.name,\n    partitionKey: resolveAttrs(schema, [def.partitionKey])?.at(0)!,\n    sortKey: resolveAttrs(schema, [def.sortKey])?.at(0),\n    timeToLiveAttribute: def.ttlAttribute,\n    //billing: def.billingMode as cdk.BillingMode,\n    // stream: def.stream as cdk.StreamViewType,\n    globalSecondaryIndexes,\n  };\n};\n"],"mappings":";;;;;AAKA,MAAa,gBACX,QACA,cACgC;CAChC,MAAM,QAAQ,UAAU,QAAQ,SAAS,SAAS,KAAA,EAAU;AAC5D,KAAI,CAAC,MAAM,OAAQ,QAAO,KAAA;AAC1B,QAAO,MAAM,KAAK,UAAU;EAC1B;EACA,MACEA,aAAAA,gBAAgB,QAAQ,KAAK,KAAK,MAAMC,yBAAI,cAAc,SAASA,yBAAI,cAAc;EACxF,EAAE;;AAGL,MAAa,yBACX,UAIG;CACH,MAAM,EAAE,QAAQ,QAAQ;CAExB,MAAM,yBAAyB,IAAI,OAC/B,OAAO,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,UAAU;EAClD;EACA,eAAe,aAAa,QAAQ,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC;EAC9D,UAAU,aAAa,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC;EACrD,EAAE,GACH,KAAA;AAEJ,QAAO;EACL,WAAW,IAAI;EACf,cAAc,aAAa,QAAQ,CAAC,IAAI,aAAa,CAAC,EAAE,GAAG,EAAE;EAC7D,SAAS,aAAa,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAE,GAAG,EAAE;EACnD,qBAAqB,IAAI;EAGzB;EACD"}
+{"version":3,"file":"cdk.cjs","names":["resolveAttrType","cdk"],"sources":["../src/cdk.ts"],"sourcesContent":["import type { Table } from \"./table\";\nimport * as cdk from \"aws-cdk-lib/aws-dynamodb\";\nimport { resolveAttrType } from \"./util\";\nimport type { TSchema } from \"typebox\";\n\nexport const resolveAttrs = (\n  schema: TSchema,\n  attrNames: (string | undefined)[],\n): cdk.Attribute[] | undefined => {\n  const names = attrNames.filter((name) => name !== undefined);\n  if (!names.length) return undefined;\n  return names.map((name) => ({\n    name,\n    type:\n      resolveAttrType(schema, name) === \"S\" ? cdk.AttributeType.STRING : cdk.AttributeType.NUMBER,\n  }));\n};\n\nexport const extractTableCdkConfig = (\n  table: Table,\n): Pick<\n  cdk.TablePropsV2,\n  \"tableName\" | \"partitionKey\" | \"sortKey\" | \"timeToLiveAttribute\" | \"globalSecondaryIndexes\"\n> => {\n  const { schema, def } = table;\n\n  const globalSecondaryIndexes = def.gsis\n    ? Object.entries(def.gsis).map(([indexName, gsi]) => ({\n        indexName,\n        partitionKeys: resolveAttrs(schema, [gsi.partitionKey].flat()),\n        sortKeys: resolveAttrs(schema, [gsi.sortKey].flat()),\n      }))\n    : undefined;\n\n  return {\n    tableName: def.name,\n    partitionKey: resolveAttrs(schema, [def.partitionKey])?.at(0)!,\n    sortKey: resolveAttrs(schema, [def.sortKey])?.at(0),\n    timeToLiveAttribute: def.ttlAttribute,\n    //billing: def.billingMode as cdk.BillingMode,\n    // stream: def.stream as cdk.StreamViewType,\n    globalSecondaryIndexes,\n  };\n};\n"],"mappings":";;;;;AAKA,MAAa,gBACX,QACA,cACgC;CAChC,MAAM,QAAQ,UAAU,QAAQ,SAAS,SAAS,KAAA,CAAS;CAC3D,IAAI,CAAC,MAAM,QAAQ,OAAO,KAAA;CAC1B,OAAO,MAAM,KAAK,UAAU;EAC1B;EACA,MACEA,aAAAA,gBAAgB,QAAQ,IAAI,MAAM,MAAMC,yBAAI,cAAc,SAASA,yBAAI,cAAc;CACzF,EAAE;AACJ;AAEA,MAAa,yBACX,UAIG;CACH,MAAM,EAAE,QAAQ,QAAQ;CAExB,MAAM,yBAAyB,IAAI,OAC/B,OAAO,QAAQ,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,UAAU;EAClD;EACA,eAAe,aAAa,QAAQ,CAAC,IAAI,YAAY,CAAC,CAAC,KAAK,CAAC;EAC7D,UAAU,aAAa,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC;CACrD,EAAE,IACF,KAAA;CAEJ,OAAO;EACL,WAAW,IAAI;EACf,cAAc,aAAa,QAAQ,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC;EAC5D,SAAS,aAAa,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC;EAClD,qBAAqB,IAAI;EAGzB;CACF;AACF"}

package/dist/cdk.d.cts

@@ -1,4 +1,4 @@
-import { t as Table } from "./table-GSI2RvTa.cjs";
+import { t as Table } from "./table-CcZ5Kv5z.cjs";
 import { TSchema } from "typebox";
 import * as cdk from "aws-cdk-lib/aws-dynamodb";
 

package/dist/cdk.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"cdk.d.cts","names":[],"sources":["../src/cdk.ts"],"mappings":";;;;;cAKa,YAAA,GAAY,MAAA,EACf,OAAA,EAAO,SAAA,6BAEd,GAAA,CAAI,SAAA;AAAA,cAUM,qBAAA,GAAqB,KAAA,EACzB,KAAA,KACN,IAAA,CACD,GAAA,CAAI,YAAA"}
+{"version":3,"file":"cdk.d.cts","names":[],"sources":["../src/cdk.ts"],"mappings":";;;;;cAKa,YAAA,GAAY,MAAA,EACf,OAAA,EAAO,SAAA,6BAEd,GAAA,CAAI,SAAS;AAAA,cAUH,qBAAA,GAAqB,KAAA,EACzB,KAAA,KACN,IAAA,CACD,GAAA,CAAI,YAAA"}

package/dist/cdk.d.mts

@@ -1,4 +1,4 @@
-import { t as Table } from "./table-O4EneQbj.mjs";
+import { t as Table } from "./table-CcZ5Kv5z.mjs";
 import { TSchema } from "typebox";
 import * as cdk from "aws-cdk-lib/aws-dynamodb";
 

package/dist/cdk.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"cdk.d.mts","names":[],"sources":["../src/cdk.ts"],"mappings":";;;;;cAKa,YAAA,GAAY,MAAA,EACf,OAAA,EAAO,SAAA,6BAEd,GAAA,CAAI,SAAA;AAAA,cAUM,qBAAA,GAAqB,KAAA,EACzB,KAAA,KACN,IAAA,CACD,GAAA,CAAI,YAAA"}
+{"version":3,"file":"cdk.d.mts","names":[],"sources":["../src/cdk.ts"],"mappings":";;;;;cAKa,YAAA,GAAY,MAAA,EACf,OAAA,EAAO,SAAA,6BAEd,GAAA,CAAI,SAAS;AAAA,cAUH,qBAAA,GAAqB,KAAA,EACzB,KAAA,KACN,IAAA,CACD,GAAA,CAAI,YAAA"}

package/dist/cdk.mjs

@@ -1,4 +1,4 @@
-import { a as resolveAttrType } from "./util-0kc6E2VD.mjs";
+import { a as resolveAttrType } from "./util-q3_Y61hN.mjs";
 import * as cdk from "aws-cdk-lib/aws-dynamodb";
 //#region src/cdk.ts
 const resolveAttrs = (schema, attrNames) => {

package/dist/cdk.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cdk.mjs","names":[],"sources":["../src/cdk.ts"],"sourcesContent":["import type { Table } from \"./table\";\nimport * as cdk from \"aws-cdk-lib/aws-dynamodb\";\nimport { resolveAttrType } from \"./util\";\nimport type { TSchema } from \"typebox\";\n\nexport const resolveAttrs = (\n  schema: TSchema,\n  attrNames: (string | undefined)[],\n): cdk.Attribute[] | undefined => {\n  const names = attrNames.filter((name) => name !== undefined);\n  if (!names.length) return undefined;\n  return names.map((name) => ({\n    name,\n    type:\n      resolveAttrType(schema, name) === \"S\" ? cdk.AttributeType.STRING : cdk.AttributeType.NUMBER,\n  }));\n};\n\nexport const extractTableCdkConfig = (\n  table: Table,\n): Pick<\n  cdk.TablePropsV2,\n  \"tableName\" | \"partitionKey\" | \"sortKey\" | \"timeToLiveAttribute\" | \"globalSecondaryIndexes\"\n> => {\n  const { schema, def } = table;\n\n  const globalSecondaryIndexes = def.gsis\n    ? Object.entries(def.gsis).map(([indexName, gsi]) => ({\n        indexName,\n        partitionKeys: resolveAttrs(schema, [gsi.partitionKey].flat()),\n        sortKeys: resolveAttrs(schema, [gsi.sortKey].flat()),\n      }))\n    : undefined;\n\n  return {\n    tableName: def.name,\n    partitionKey: resolveAttrs(schema, [def.partitionKey])?.at(0)!,\n    sortKey: resolveAttrs(schema, [def.sortKey])?.at(0),\n    timeToLiveAttribute: def.ttlAttribute,\n    //billing: def.billingMode as cdk.BillingMode,\n    // stream: def.stream as cdk.StreamViewType,\n    globalSecondaryIndexes,\n  };\n};\n"],"mappings":";;;AAKA,MAAa,gBACX,QACA,cACgC;CAChC,MAAM,QAAQ,UAAU,QAAQ,SAAS,SAAS,KAAA,EAAU;AAC5D,KAAI,CAAC,MAAM,OAAQ,QAAO,KAAA;AAC1B,QAAO,MAAM,KAAK,UAAU;EAC1B;EACA,MACE,gBAAgB,QAAQ,KAAK,KAAK,MAAM,IAAI,cAAc,SAAS,IAAI,cAAc;EACxF,EAAE;;AAGL,MAAa,yBACX,UAIG;CACH,MAAM,EAAE,QAAQ,QAAQ;CAExB,MAAM,yBAAyB,IAAI,OAC/B,OAAO,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,UAAU;EAClD;EACA,eAAe,aAAa,QAAQ,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC;EAC9D,UAAU,aAAa,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC;EACrD,EAAE,GACH,KAAA;AAEJ,QAAO;EACL,WAAW,IAAI;EACf,cAAc,aAAa,QAAQ,CAAC,IAAI,aAAa,CAAC,EAAE,GAAG,EAAE;EAC7D,SAAS,aAAa,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAE,GAAG,EAAE;EACnD,qBAAqB,IAAI;EAGzB;EACD"}
+{"version":3,"file":"cdk.mjs","names":[],"sources":["../src/cdk.ts"],"sourcesContent":["import type { Table } from \"./table\";\nimport * as cdk from \"aws-cdk-lib/aws-dynamodb\";\nimport { resolveAttrType } from \"./util\";\nimport type { TSchema } from \"typebox\";\n\nexport const resolveAttrs = (\n  schema: TSchema,\n  attrNames: (string | undefined)[],\n): cdk.Attribute[] | undefined => {\n  const names = attrNames.filter((name) => name !== undefined);\n  if (!names.length) return undefined;\n  return names.map((name) => ({\n    name,\n    type:\n      resolveAttrType(schema, name) === \"S\" ? cdk.AttributeType.STRING : cdk.AttributeType.NUMBER,\n  }));\n};\n\nexport const extractTableCdkConfig = (\n  table: Table,\n): Pick<\n  cdk.TablePropsV2,\n  \"tableName\" | \"partitionKey\" | \"sortKey\" | \"timeToLiveAttribute\" | \"globalSecondaryIndexes\"\n> => {\n  const { schema, def } = table;\n\n  const globalSecondaryIndexes = def.gsis\n    ? Object.entries(def.gsis).map(([indexName, gsi]) => ({\n        indexName,\n        partitionKeys: resolveAttrs(schema, [gsi.partitionKey].flat()),\n        sortKeys: resolveAttrs(schema, [gsi.sortKey].flat()),\n      }))\n    : undefined;\n\n  return {\n    tableName: def.name,\n    partitionKey: resolveAttrs(schema, [def.partitionKey])?.at(0)!,\n    sortKey: resolveAttrs(schema, [def.sortKey])?.at(0),\n    timeToLiveAttribute: def.ttlAttribute,\n    //billing: def.billingMode as cdk.BillingMode,\n    // stream: def.stream as cdk.StreamViewType,\n    globalSecondaryIndexes,\n  };\n};\n"],"mappings":";;;AAKA,MAAa,gBACX,QACA,cACgC;CAChC,MAAM,QAAQ,UAAU,QAAQ,SAAS,SAAS,KAAA,CAAS;CAC3D,IAAI,CAAC,MAAM,QAAQ,OAAO,KAAA;CAC1B,OAAO,MAAM,KAAK,UAAU;EAC1B;EACA,MACE,gBAAgB,QAAQ,IAAI,MAAM,MAAM,IAAI,cAAc,SAAS,IAAI,cAAc;CACzF,EAAE;AACJ;AAEA,MAAa,yBACX,UAIG;CACH,MAAM,EAAE,QAAQ,QAAQ;CAExB,MAAM,yBAAyB,IAAI,OAC/B,OAAO,QAAQ,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,UAAU;EAClD;EACA,eAAe,aAAa,QAAQ,CAAC,IAAI,YAAY,CAAC,CAAC,KAAK,CAAC;EAC7D,UAAU,aAAa,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC;CACrD,EAAE,IACF,KAAA;CAEJ,OAAO;EACL,WAAW,IAAI;EACf,cAAc,aAAa,QAAQ,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC;EAC5D,SAAS,aAAa,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC;EAClD,qBAAqB,IAAI;EAGzB;CACF;AACF"}

package/dist/index.cjs

@@ -1,13 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_util = require("./util-DT6vwquI.cjs");
+const require_util = require("./util-CYPpI7J0.cjs");
 let _aws_sdk_client_dynamodb = require("@aws-sdk/client-dynamodb");
 let _aws_sdk_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
 _aws_sdk_lib_dynamodb = require_util.__toESM(_aws_sdk_lib_dynamodb, 1);
 //#region src/error.ts
 function dinahErrorMessage(details) {
 	switch (details.type) {
-		case "NOT_FOUND": return `${details.resource ?? "Item"} not found: ${JSON.stringify(details.key)}`;
-		case "CONDITIONAL_CHECK_FAILED": return details.key ? `${details.resource ?? "Item"} condition check failed: ${JSON.stringify(details.key)}` : `${details.resource ?? "Item"} condition check failed`;
+		case "NOT_FOUND": return `${details.resource ?? "Item"} not found.`;
+		case "ALREADY_EXISTS": return `${details.resource ?? "Item"} already exists.`;
+		case "CONDITIONAL_CHECK_FAILED": return `${details.resource ?? "Item"} condition check failed.`;
 		case "VALIDATION": return `Validation error: ${details.message}`;
 		case "DATA_INTEGRITY": return `Data integrity error: ${details.message}`;
 		case "TRANSACTION_CANCELED": return `Transaction canceled: ${details.reasons.map((r) => r.type).join(", ")}`;
@@ -317,18 +318,25 @@ var Repo = class {
 		});
 		return this.applyTransformIfNeeded(result);
 	}
-	async create(item, options) {
-		const { condition: otherCondition, ...otherOptions } = options ?? {};
+	async create(item) {
 		const condition = { $and: [{ [this.table.def.partitionKey]: { $exists: false } }] };
-		if (otherCondition) condition.$and.push(otherCondition);
 		const normalizedItem = this.applyCreateTransforms(item);
-		const result = await this.db.put({
-			table: this.tableName,
-			item: normalizedItem,
-			resource: this.resourceName,
-			condition,
-			...otherOptions
-		});
+		let result;
+		try {
+			result = await this.db.put({
+				table: this.tableName,
+				item: normalizedItem,
+				resource: this.resourceName,
+				condition
+			});
+		} catch (err) {
+			if (err instanceof DinahError && err.details.type === "CONDITIONAL_CHECK_FAILED") throw new DinahError({
+				type: "ALREADY_EXISTS",
+				key: this.extractKey(item),
+				resource: this.resourceName
+			}, { cause: err });
+			throw err;
+		}
 		return this.applyTransformIfNeeded(result);
 	}
 	async delete(key, options) {
@@ -563,8 +571,8 @@ var Repo = class {
 	async trxUpdate(keys, update, options) {
 		return this.db.trxWrite(...keys.map((key) => this.trxUpdateRequest(key, update, options)));
 	}
-	async trxCreate(items, options) {
-		return this.db.trxWrite(...items.map((item) => this.trxCreateRequest(item, options)));
+	async trxCreate(items) {
+		return this.db.trxWrite(...items.map((item) => this.trxCreateRequest(item)));
 	}
 	trxGetRequest(key, options) {
 		return {
@@ -608,17 +616,14 @@ var Repo = class {
 			condition: this.withDiscriminatorCondition(key, options?.condition)
 		};
 	}
-	trxCreateRequest(item, options) {
-		const { condition: otherCondition, ...otherOptions } = options ?? {};
+	trxCreateRequest(item) {
 		const condition = { $and: [{ [this.table.def.partitionKey]: { $exists: false } }] };
-		if (otherCondition) condition.$and.push(otherCondition);
 		const normalizedItem = this.applyCreateTransforms(item);
 		return {
 			table: this.tableName,
 			type: "PUT",
 			item: normalizedItem,
-			condition,
-			...otherOptions
+			condition
 		};
 	}
 	applyCreateTransforms(item) {