azure-mock 2.11.0 → 2.13.0

package/README.md

@@ -23,7 +23,7 @@ pnpm i -D azure-mock
 
 ## <a name="documentation">📖 Documentation</a>
 
-We highly recommend you take a look at the [documentation](https://esposter.com/docs/modules/azure_mock.html) to level up.
+We highly recommend you take a look at the [documentation](https://esposter.com/docs/modules/azure-mock.html) to level up.
 
 ### Usage
 

package/dist/index.d.ts

@@ -1530,9 +1530,10 @@ declare enum BinaryOperator {
   gt = "gt",
   le = "le",
   lt = "lt",
+  ne = "ne",
 }
 //#endregion
-//#region src/models/shared/Operation.d.ts
+//#region src/models/azure/Literal.d.ts
 
 //#endregion
 //#region ../../node_modules/.pnpm/type-fest@4.41.0/node_modules/type-fest/source/observable-like.d.ts
@@ -1593,6 +1594,7 @@ const update2: UpdateOperation<User> = {
 //#region src/models/tableFilter/Clause.d.ts
 interface Clause {
   key: string;
+  not?: boolean;
   operator: BinaryOperator;
   value: string;
 }
@@ -1609,7 +1611,14 @@ declare const CLAUSE_REGEX: RegExp;
 //#region src/util/tableFilter/createTableFilterPredicate.d.ts
 declare const createTableFilterPredicate: <T extends object>(filter: string) => ((entity: TableEntity<T>) => boolean);
 //#endregion
+//#region src/util/tableFilter/isNullClause.d.ts
+declare const isNullClause: ({
+  not,
+  operator,
+  value
+}: Clause) => boolean;
+//#endregion
 //#region src/util/tableFilter/parseClause.d.ts
 declare const parseClause: (rawClause: string) => Clause;
 //#endregion
-export { BlobHierarchyItem, CLAUSE_REGEX, Clause, MockBlobBatchClient, MockBlobClient, MockBlockBlobClient, MockContainerClient, MockContainerDatabase, MockRestError, MockTableClient, MockTableDatabase, PageSettings, PagedAsyncIterableIterator, applyTableFilter, bodyToBuffer, compare, createTableFilterPredicate, getAzureErrorXml, getBlobItemXml, getBlobPrefixXml, getListBlobsXml, isReadableStream, parseClause, toWebResourceLike };
+export { BlobHierarchyItem, CLAUSE_REGEX, Clause, MockBlobBatchClient, MockBlobClient, MockBlockBlobClient, MockContainerClient, MockContainerDatabase, MockRestError, MockTableClient, MockTableDatabase, PageSettings, PagedAsyncIterableIterator, applyTableFilter, bodyToBuffer, compare, createTableFilterPredicate, getAzureErrorXml, getBlobItemXml, getBlobPrefixXml, getListBlobsXml, isNullClause, isReadableStream, parseClause, toWebResourceLike };

package/dist/index.js

@@ -11,8 +11,13 @@ let BinaryOperator = /* @__PURE__ */ function(BinaryOperator$1) {
 	BinaryOperator$1["gt"] = "gt";
 	BinaryOperator$1["le"] = "le";
 	BinaryOperator$1["lt"] = "lt";
+	BinaryOperator$1["ne"] = "ne";
 	return BinaryOperator$1;
 }({});
+let Literal = /* @__PURE__ */ function(Literal$1) {
+	Literal$1["NaN"] = "NaN";
+	return Literal$1;
+}({});
 var InvalidOperationError = class extends Error {
 	constructor(operation, name, message) {
 		super(`Invalid operation: ${operation}, name: ${name}, ${message}`);
@@ -1135,12 +1140,18 @@ const compare = (operator, leftHandSide, rightHandSide) => {
 		case BinaryOperator.gt: return leftHandSide > rightHandSide;
 		case BinaryOperator.le: return leftHandSide <= rightHandSide;
 		case BinaryOperator.lt: return leftHandSide < rightHandSide;
+		case BinaryOperator.ne: return leftHandSide !== rightHandSide;
+		default: exhaustiveGuard(operator);
 	}
 };
 
+//#endregion
+//#region src/util/tableFilter/isNullClause.ts
+const isNullClause = ({ not, operator, value }) => Boolean(not) && operator === BinaryOperator.ne && value === Literal.NaN;
+
 //#endregion
 //#region src/util/tableFilter/constants.ts
-const CLAUSE_REGEX = /^(?<key>[A-Za-z0-9_]+)\s+(?<operator>eq|gt|ge|lt|le)\s+'(?<value>[^']+)'$/i;
+const CLAUSE_REGEX = new RegExp(`^(?<not>not\\s+)?(?<key>[A-Za-z0-9_]+)\\s+(?<operator>${Object.values(BinaryOperator).join("|")})\\s+(?<value>'[^']*'|${Object.values(Literal).join("|")})$`, "i");
 
 //#endregion
 //#region src/util/tableFilter/parseClause.ts
@@ -1149,18 +1160,19 @@ const parseClause = (rawClause) => {
 	if (!match) throw new NotFoundError(parseClause.name, rawClause);
 	const groups = match.groups;
 	if (!groups) throw new NotFoundError(parseClause.name, rawClause);
-	const { key, operator, value } = groups;
+	const normalizedValue = groups.value.startsWith("'") && groups.value.endsWith("'") ? groups.value.slice(1, -1) : groups.value;
 	return {
-		key,
-		operator,
-		value
+		...groups,
+		not: Boolean(groups.not),
+		operator: groups.operator,
+		value: normalizedValue
 	};
 };
 
 //#endregion
 //#region src/util/tableFilter/createTableFilterPredicate.ts
 const createTableFilterPredicate = (filter) => {
-	const normalizedFilter = filter.replaceAll(String.raw`(`, "").replaceAll(String.raw`)`, "");
+	const normalizedFilter = filter.replaceAll(String.raw`(`, " ").replaceAll(String.raw`)`, "");
 	const andGroups = normalizedFilter.split(/\s+and\s+/i).filter(Boolean);
 	const orGroups = andGroups.map((group) => group.split(/\s+or\s+/i).filter(Boolean));
 	return (entity) => {
@@ -1174,7 +1186,13 @@ const createTableFilterPredicate = (filter) => {
 					filter,
 					key: normalizedClauseKey
 				}));
-				if (compare(clause.operator, String(entity[normalizedClauseKey]), clause.value)) {
+				let isMatched = false;
+				if (isNullClause(clause)) isMatched = compare(BinaryOperator.eq, String(entity[normalizedClauseKey]), "null");
+				else {
+					const comparisonResult = compare(clause.operator, String(entity[normalizedClauseKey]), clause.value);
+					isMatched = clause.not ? !comparisonResult : comparisonResult;
+				}
+				if (isMatched) {
 					isGroupMatched = true;
 					break;
 				}
@@ -1321,4 +1339,4 @@ var MockTableClient = class {
 };
 
 //#endregion
-export { CLAUSE_REGEX, MockBlobBatchClient, MockBlobClient, MockBlockBlobClient, MockContainerClient, MockContainerDatabase, MockRestError, MockTableClient, MockTableDatabase, applyTableFilter, bodyToBuffer, compare, createTableFilterPredicate, getAzureErrorXml, getBlobItemXml, getBlobPrefixXml, getListBlobsXml, isReadableStream, parseClause, toWebResourceLike };
+export { CLAUSE_REGEX, MockBlobBatchClient, MockBlobClient, MockBlockBlobClient, MockContainerClient, MockContainerDatabase, MockRestError, MockTableClient, MockTableDatabase, applyTableFilter, bodyToBuffer, compare, createTableFilterPredicate, getAzureErrorXml, getBlobItemXml, getBlobPrefixXml, getListBlobsXml, isNullClause, isReadableStream, parseClause, toWebResourceLike };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-mock",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "description": "A library that contains azure mock classes.",
   "type": "module",
   "homepage": "https://github.com/Esposter/Esposter#readme",
@@ -36,5 +36,5 @@
     "@azure/data-tables": "^13.3.1",
     "@azure/storage-blob": "^12.28.0"
   },
-  "gitHead": "e3d27b0dd40f23eebc5236a975406d0ada8e66c4"
+  "gitHead": "1765c0d90ecc03c94e942d88b8d8da962a8f53bc"
 }