@esposter/azure 3.2.0 → 3.3.0

package/README.md

@@ -38,7 +38,7 @@ import type { Clause } from "@esposter/azure";
 
 import { BinaryOperator } from "@esposter/azure";
 
-const clause: Clause<{ createdAt: Date }> = { key: "createdAt", operator: BinaryOperator.ge, value: new Date(0) };
+const clause: Clause<{ createdAt: Date }> = { key: "createdAt", operator: BinaryOperator.Ge, value: new Date(0) };
 ```
 
 ### Values
@@ -65,7 +65,7 @@ import { BinaryOperator, CompositeKeyPropertyNames, getTableNullClause, serializ
 
 const roomId = "00000000-0000-0000-0000-000000000000";
 const filter = serializeClauses([
-  { key: CompositeKeyPropertyNames.partitionKey, operator: BinaryOperator.eq, value: roomId },
+  { key: CompositeKeyPropertyNames.partitionKey, operator: BinaryOperator.Eq, value: roomId },
   getTableNullClause("deletedAt"),
 ]);
 ```

package/dist/index.d.ts

@@ -3,23 +3,22 @@ import { PropertyNames } from "@esposter/shared";
 import { TableEntity } from "@azure/data-tables";
 //#region src/models/search/SearchOperator.d.ts
 export declare enum SearchOperator {
-  arrayAny = "arrayAny",
-  arrayContains = "arrayContains"
+  ArrayAny = "arrayAny",
+  ArrayContains = "arrayContains"
 }
 //#endregion
 //#region src/models/shared/BinaryOperator.d.ts
 export declare enum BinaryOperator {
-  eq = "eq",
-  ge = "ge",
-  gt = "gt",
-  le = "le",
-  lt = "lt",
-  ne = "ne"
+  Eq = "eq",
+  Ge = "ge",
+  Gt = "gt",
+  Le = "le",
+  Lt = "lt",
+  Ne = "ne"
 }
 export declare const BinaryOperators: readonly BinaryOperator[];
 //#endregion
 //#region src/models/shared/SerializableValue.d.ts
-export declare const SERIALIZABLE_VALUE_MAX_LENGTH = 100;
 export type SerializableValue = boolean | Date | null | number | string;
 export declare const serializableValueSchema: z.ZodType<SerializableValue, SerializableValue>;
 //#endregion
@@ -31,17 +30,17 @@ export type Clause<T extends object> = {
   operator: BinaryOperator;
   value: SerializableValue;
 } | {
-  operator: SearchOperator.arrayAny;
+  operator: SearchOperator.ArrayAny;
 } | {
-  operator: SearchOperator.arrayContains;
+  operator: SearchOperator.ArrayContains;
   value: SerializableValue[];
 });
 //#endregion
 //#region src/models/shared/UnaryOperator.d.ts
 export declare enum UnaryOperator {
-  and = "and",
-  not = "not",
-  or = "or"
+  And = "and",
+  Not = "not",
+  Or = "or"
 }
 //#endregion
 //#region ../../node_modules/.pnpm/type-fest@5.10.0/node_modules/type-fest/source/omit-index-signature.d.ts
@@ -154,11 +153,12 @@ export declare const getSearchNullClause: <T extends object>(key: keyof T & stri
 //#region src/services/shared/constants.d.ts
 export declare const AZURE_MAX_BATCH_SIZE = 100;
 export declare const AZURE_MAX_PAGE_SIZE = 1e3;
+export declare const SERIALIZABLE_VALUE_MAX_LENGTH = 100;
 export declare const AZURE_MAX_QUEUE_VISIBILITY_TIMEOUT_MS: number;
 //#endregion
 //#region src/services/table/constants.d.ts
-export declare const KeysToCapitalize: Set<string>;
-export declare const KeysToUncapitalize: Set<string>;
+export declare const KEYS_TO_CAPITALIZE: ReadonlySet<string>;
+export declare const KEYS_TO_UNCAPITALIZE: ReadonlySet<string>;
 //#endregion
 //#region src/services/table/deserializeKey.d.ts
 export declare const deserializeKey: (key: string) => string;
@@ -170,6 +170,7 @@ export declare const getTableNullClause: <T extends object>(key: keyof T & strin
 export declare const serializeKey: (key: string) => string;
 //#endregion
 //#region src/services/transformer/constants.d.ts
+export declare const DATETIME_LITERAL_PREFIX = "datetime'";
 export declare const CLAUSE_REGEX: RegExp;
 //#endregion
 //#region src/services/transformer/deserializeClause.d.ts

package/dist/index.js

@@ -1,26 +1,31 @@
 import { z } from "zod";
-import { ID_SEPARATOR, InvalidOperationError, NotFoundError, Operation, capitalize, getPropertyNames, normalizeString, takeOne, uncapitalize } from "@esposter/shared";
+import { InvalidOperationError, NotFoundError, Operation, capitalize, getPropertyNames, getResult, normalizeString, takeOne, uncapitalize } from "@esposter/shared";
 //#region src/models/search/SearchOperator.ts
 let SearchOperator = /* @__PURE__ */ function(SearchOperator) {
-	SearchOperator["arrayAny"] = "arrayAny";
-	SearchOperator["arrayContains"] = "arrayContains";
+	SearchOperator["ArrayAny"] = "arrayAny";
+	SearchOperator["ArrayContains"] = "arrayContains";
 	return SearchOperator;
 }({});
 //#endregion
 //#region src/models/shared/BinaryOperator.ts
 let BinaryOperator = /* @__PURE__ */ function(BinaryOperator) {
-	BinaryOperator["eq"] = "eq";
-	BinaryOperator["ge"] = "ge";
-	BinaryOperator["gt"] = "gt";
-	BinaryOperator["le"] = "le";
-	BinaryOperator["lt"] = "lt";
-	BinaryOperator["ne"] = "ne";
+	BinaryOperator["Eq"] = "eq";
+	BinaryOperator["Ge"] = "ge";
+	BinaryOperator["Gt"] = "gt";
+	BinaryOperator["Le"] = "le";
+	BinaryOperator["Lt"] = "lt";
+	BinaryOperator["Ne"] = "ne";
 	return BinaryOperator;
 }({});
 const BinaryOperators = Object.values(BinaryOperator);
 //#endregion
-//#region src/models/shared/SerializableValue.ts
+//#region src/services/shared/constants.ts
+const AZURE_MAX_BATCH_SIZE = 100;
+const AZURE_MAX_PAGE_SIZE = 1e3;
 const SERIALIZABLE_VALUE_MAX_LENGTH = 100;
+const AZURE_MAX_QUEUE_VISIBILITY_TIMEOUT_MS = Temporal.Duration.from({ days: 7 }).total("milliseconds");
+//#endregion
+//#region src/models/shared/SerializableValue.ts
 const serializableValueSchema = z.union([
 	z.boolean(),
 	z.date(),
@@ -31,9 +36,9 @@ const serializableValueSchema = z.union([
 //#endregion
 //#region src/models/shared/UnaryOperator.ts
 let UnaryOperator = /* @__PURE__ */ function(UnaryOperator) {
-	UnaryOperator["and"] = "and";
-	UnaryOperator["not"] = "not";
-	UnaryOperator["or"] = "or";
+	UnaryOperator["And"] = "and";
+	UnaryOperator["Not"] = "not";
+	UnaryOperator["Or"] = "or";
 	return UnaryOperator;
 }({});
 //#endregion
@@ -55,17 +60,12 @@ const getSearchNullClause = (key) => ({
 	value: null
 });
 //#endregion
-//#region src/services/shared/constants.ts
-const AZURE_MAX_BATCH_SIZE = 100;
-const AZURE_MAX_PAGE_SIZE = 1e3;
-const AZURE_MAX_QUEUE_VISIBILITY_TIMEOUT_MS = Temporal.Duration.from({ days: 7 }).total("milliseconds");
-//#endregion
 //#region src/services/table/constants.ts
-const KeysToCapitalize = /* @__PURE__ */ new Set([CompositeKeyPropertyNames.partitionKey, CompositeKeyPropertyNames.rowKey]);
-const KeysToUncapitalize = /* @__PURE__ */ new Set([capitalize(CompositeKeyPropertyNames.partitionKey), capitalize(CompositeKeyPropertyNames.rowKey)]);
+const KEYS_TO_CAPITALIZE = /* @__PURE__ */ new Set([CompositeKeyPropertyNames.partitionKey, CompositeKeyPropertyNames.rowKey]);
+const KEYS_TO_UNCAPITALIZE = /* @__PURE__ */ new Set([capitalize(CompositeKeyPropertyNames.partitionKey), capitalize(CompositeKeyPropertyNames.rowKey)]);
 //#endregion
 //#region src/services/table/deserializeKey.ts
-const deserializeKey = (key) => KeysToUncapitalize.has(key) ? uncapitalize(key) : key;
+const deserializeKey = (key) => KEYS_TO_UNCAPITALIZE.has(key) ? uncapitalize(key) : key;
 //#endregion
 //#region src/services/table/getTableNullClause.ts
 const getTableNullClause = (key) => ({
@@ -76,35 +76,33 @@ const getTableNullClause = (key) => ({
 });
 //#endregion
 //#region src/services/table/serializeKey.ts
-const serializeKey = (key) => KeysToCapitalize.has(key) ? capitalize(key) : key;
+const serializeKey = (key) => KEYS_TO_CAPITALIZE.has(key) ? capitalize(key) : key;
 //#endregion
 //#region src/services/transformer/constants.ts
+const DATETIME_LITERAL_PREFIX = "datetime'";
 const VALUE_REGEX = [
 	true,
 	false,
-	String.raw`datetime'[^']*'`,
+	String.raw`${DATETIME_LITERAL_PREFIX}[^']*'`,
 	String.raw`\d{4}-\d{2}-\d{2}T[^\s]+`,
 	String(null),
 	String.raw`-?\d+(?:\.\d+)?`,
 	String(NaN),
 	"'(?:[^']|'')*'"
-].join(ID_SEPARATOR);
-const CLAUSE_REGEX = new RegExp(String.raw`^(?<not>not\s+)?(?<key>[A-Za-z0-9_]*)\s*(?<operator>${BinaryOperators.join(ID_SEPARATOR)})\s+(?<value>${VALUE_REGEX})$`, "iu");
+].join("|");
+const CLAUSE_REGEX = new RegExp(String.raw`^(?<not>not\s+)?(?<key>[A-Za-z0-9_]*)\s*(?<operator>${BinaryOperators.join("|")})\s+(?<value>${VALUE_REGEX})$`, "iu");
 //#endregion
 //#region src/services/transformer/deserializeValue.ts
+const parseIsoDate = (isoValue) => getResult(() => new Date(Temporal.Instant.from(isoValue).epochMilliseconds)).unwrapOr(void 0);
 const deserializeValue = (serializedValue) => {
 	if (serializedValue === String(true)) return true;
 	else if (serializedValue === String(false)) return false;
 	else if (serializedValue === String(null)) return null;
 	else if (Number.isFinite(Number(serializedValue))) return Number(serializedValue);
 	else if (serializedValue === String(NaN)) return NaN;
-	else if (serializedValue.startsWith("datetime'") && serializedValue.endsWith("'")) return new Date(serializedValue.slice(9, -1));
+	else if (serializedValue.startsWith("datetime'") && serializedValue.endsWith("'")) return parseIsoDate(serializedValue.slice(9, -1)) ?? serializedValue;
 	else if (serializedValue.startsWith("'") && serializedValue.endsWith("'")) return serializedValue.slice(1, -1).replaceAll("''", "'");
-	else {
-		const date = new Date(serializedValue);
-		if (Number.isNaN(date)) return serializedValue;
-		else return date;
-	}
+	else return parseIsoDate(serializedValue) ?? serializedValue;
 };
 //#endregion
 //#region src/services/transformer/deserializeClause.ts
@@ -135,7 +133,7 @@ const RangeOperators = [
 //#endregion
 //#region src/services/transformer/serializeValue.ts
 const serializeValue = (value, isTableFilter = false) => {
-	if (value instanceof Date) return isTableFilter ? `datetime'${value.toISOString()}'` : value.toISOString();
+	if (value instanceof Date) return isTableFilter ? `${DATETIME_LITERAL_PREFIX}${value.toISOString()}'` : value.toISOString();
 	else if (typeof value === "string") return escapeValue(value);
 	else return String(value);
 };
@@ -188,4 +186,4 @@ const getPartitionKeyFilter = (partitionKey) => serializeClauses([{
 //#region src/services/transformer/serializeSearchClauses.ts
 const serializeSearchClauses = (clauses) => serializeClausesCore(clauses, false);
 //#endregion
-export { AZURE_MAX_BATCH_SIZE, AZURE_MAX_PAGE_SIZE, AZURE_MAX_QUEUE_VISIBILITY_TIMEOUT_MS, BinaryOperator, BinaryOperators, CLAUSE_REGEX, CompositeKey, CompositeKeyPropertyNames, KeysToCapitalize, KeysToUncapitalize, RangeOperators, SERIALIZABLE_VALUE_MAX_LENGTH, SearchOperator, UnaryOperator, deserializeClause, deserializeKey, deserializeValue, escapeValue, getPartitionKeyFilter, getSearchNonNullClause, getSearchNullClause, getTableNullClause, serializableValueSchema, serializeClause, serializeClauses, serializeClausesCore, serializeKey, serializeSearchClauses, serializeValue };
+export { AZURE_MAX_BATCH_SIZE, AZURE_MAX_PAGE_SIZE, AZURE_MAX_QUEUE_VISIBILITY_TIMEOUT_MS, BinaryOperator, BinaryOperators, CLAUSE_REGEX, CompositeKey, CompositeKeyPropertyNames, DATETIME_LITERAL_PREFIX, KEYS_TO_CAPITALIZE, KEYS_TO_UNCAPITALIZE, RangeOperators, SERIALIZABLE_VALUE_MAX_LENGTH, SearchOperator, UnaryOperator, deserializeClause, deserializeKey, deserializeValue, escapeValue, getPartitionKeyFilter, getSearchNonNullClause, getSearchNullClause, getTableNullClause, serializableValueSchema, serializeClause, serializeClauses, serializeClausesCore, serializeKey, serializeSearchClauses, serializeValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esposter/azure",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "The Azure wire conventions Esposter's clients and its mocks both speak — OData filter clauses, entity key casing, and service limits.",
   "keywords": [
     "azure",
@@ -47,15 +47,15 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@esposter/shared": "3.2.0"
+    "@esposter/shared": "3.3.0"
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.5",
-    "@esposter/configuration": "3.2.0",
+    "@esposter/configuration": "3.3.0",
     "publint": "^0.3.24",
     "tsdown": "^0.23.0",
     "type-fest": "^5.10.0",
-    "vitest": "^5.0.1"
+    "vitest": "^5.0.2"
   },
   "peerDependencies": {
     "@azure/data-tables": "^13.3.2",
@@ -64,5 +64,5 @@
   "inlinedDependencies": {
     "type-fest": "5.10.0"
   },
-  "gitHead": "bc055ed2f154eff219a355016a6b586962dbfa9c"
+  "gitHead": "5854a00717502d8de96adc8b44d3621ab85f9b57"
 }