@bcts/dcbor-pattern 1.0.0-alpha.12 → 1.0.0-alpha.14

package/dist/index.cjs

@@ -1,5 +1,6 @@
 let _bcts_dcbor = require("@bcts/dcbor");
 let _bcts_known_values = require("@bcts/known-values");
+let _bcts_dcbor_parse = require("@bcts/dcbor-parse");
 let _bcts_components = require("@bcts/components");
 
 //#region src/error.ts
@@ -76,8 +77,6 @@ const errorToString = (error) => {
 		case "InvalidDigestPattern": return `Invalid digest pattern: ${error.message} at ${error.span.start}..${error.span.end}`;
 		case "UnterminatedDigestQuoted": return `Unterminated digest quoted pattern at ${error.span.start}..${error.span.end}`;
 		case "UnterminatedDateQuoted": return `Unterminated date quoted pattern at ${error.span.start}..${error.span.end}`;
-		case "InvalidDigest": return `Invalid digest at ${error.span.start}..${error.span.end}`;
-		case "InvalidDate": return `Invalid date at ${error.span.start}..${error.span.end}`;
 		case "Unknown": return "Unknown error";
 	}
 };
@@ -187,14 +186,6 @@ const adjustSpan = (error, offset) => {
 			type: "UnterminatedDateQuoted",
 			span: span(offset + error.span.start, offset + error.span.end)
 		};
-		case "InvalidDigest": return {
-			type: "InvalidDigest",
-			span: span(offset + error.span.start, offset + error.span.end)
-		};
-		case "InvalidDate": return {
-			type: "InvalidDate",
-			span: span(offset + error.span.start, offset + error.span.end)
-		};
 		case "EmptyInput":
 		case "UnexpectedEndOfInput":
 		case "Unknown": return error;
@@ -761,7 +752,10 @@ const truncateWithEllipsis = (s, maxLength) => {
 const formatCborElement = (cbor$3, format, maxLength) => {
 	let diagnostic;
 	if (format === PathElementFormat.DiagnosticSummary) diagnostic = (0, _bcts_dcbor.summary)(cbor$3);
-	else diagnostic = (0, _bcts_dcbor.diagnosticOpt)(cbor$3, { flat: true });
+	else diagnostic = (0, _bcts_dcbor.diagnosticOpt)(cbor$3, {
+		flat: true,
+		summarize: true
+	});
 	return truncateWithEllipsis(diagnostic, maxLength);
 };
 /**
@@ -1383,7 +1377,7 @@ const datePatternDisplay = (pattern) => {
 //#endregion
 //#region src/pattern/value/digest-pattern.ts
 /** CBOR tag for digest (BCR-2021-002) */
-const DIGEST_TAG = 40001n;
+const DIGEST_TAG = 40001;
 /** Expected size of a SHA-256 digest */
 const DIGEST_SIZE = 32;
 /**
@@ -1419,7 +1413,8 @@ const digestPatternBinaryRegex = (pattern) => ({
 */
 const extractDigestBytes = (haystack) => {
 	if (!(0, _bcts_dcbor.isTagged)(haystack)) return;
-	if ((0, _bcts_dcbor.tagValue)(haystack) !== DIGEST_TAG) return;
+	const tag = (0, _bcts_dcbor.tagValue)(haystack);
+	if (tag === void 0 || Number(tag) !== DIGEST_TAG) return;
 	const content = (0, _bcts_dcbor.tagContent)(haystack);
 	if (content === void 0) return;
 	const bytes = (0, _bcts_dcbor.asBytes)(content);
@@ -2311,6 +2306,13 @@ const taggedPatternWithRegex = (regex, pattern) => ({
 	pattern
 });
 /**
+* Compare two tag values, handling both number and bigint types.
+*/
+const tagsEqual = (a, b) => {
+	if (a === void 0) return false;
+	return Number(a) === Number(b);
+};
+/**
 * Tests if a CBOR value matches this tagged pattern.
 */
 const taggedPatternMatches = (pattern, haystack) => {
@@ -2320,7 +2322,7 @@ const taggedPatternMatches = (pattern, haystack) => {
 	if (content === void 0) return false;
 	switch (pattern.variant) {
 		case "Any": return true;
-		case "Tag": return tag === pattern.tag.value && matchPattern(pattern.pattern, content);
+		case "Tag": return tagsEqual(tag, pattern.tag.value) && matchPattern(pattern.pattern, content);
 		case "Name": return String(tag) === pattern.name && matchPattern(pattern.pattern, content);
 		case "Regex": {
 			const tagName = String(tag);
@@ -2347,7 +2349,7 @@ const taggedPatternPathsWithCaptures = (pattern, haystack) => {
 	switch (pattern.variant) {
 		case "Any": return [[[haystack]], /* @__PURE__ */ new Map()];
 		case "Tag": {
-			if (tag !== pattern.tag.value) return [[], /* @__PURE__ */ new Map()];
+			if (!tagsEqual(tag, pattern.tag.value)) return [[], /* @__PURE__ */ new Map()];
 			const innerResult = getPatternPathsWithCapturesDirect(pattern.pattern, content);
 			if (innerResult.paths.length === 0) return [[], innerResult.captures];
 			const taggedPaths = innerResult.paths.map((contentPath) => {
@@ -2987,13 +2989,8 @@ const axisChildren = (axis, cbor$3) => {
 		}
 		case "MapValue": {
 			if (!(0, _bcts_dcbor.isMap)(cbor$3)) return [];
-			const keys = (0, _bcts_dcbor.mapKeys)(cbor$3);
-			if (keys === void 0 || keys === null) return [];
-			const values = [];
-			for (const key of keys) {
-				const value = (0, _bcts_dcbor.mapValue)(cbor$3, key);
-				if (value !== void 0 && value !== null) values.push(value);
-			}
+			const values = (0, _bcts_dcbor.mapValues)(cbor$3);
+			if (values === void 0 || values === null) return [];
 			return values;
 		}
 		case "TaggedContent": {
@@ -3216,7 +3213,8 @@ const runThread = (prog, start, out) => {
 				case "Search": {
 					const innerPattern = prog.literals[instr.patternIndex];
 					const result = searchPatternPathsWithCaptures(searchPattern(innerPattern), th.cbor);
-					for (const searchPath of result.paths) {
+					const reversedPaths = [...result.paths].reverse();
+					for (const searchPath of reversedPaths) {
 						const newThread = {
 							pc: th.pc + 1,
 							cbor: th.cbor,
@@ -4954,7 +4952,7 @@ var Lexer = class Lexer {
 		});
 	}
 	/**
-	* Parse a number literal.
+	* Parse a number literal using dcbor-parse for consistency with dCBOR.
 	*/
 	parseNumber(start) {
 		const numStart = this.#position;
@@ -4982,8 +4980,18 @@ var Lexer = class Lexer {
 			});
 			while (isDigit(this.peek() ?? "")) this.advance();
 		}
-		const numStr = this.#input.slice(numStart, this.#position);
-		const value = parseFloat(numStr);
+		const parseResult = (0, _bcts_dcbor_parse.parseDcborItemPartial)(this.#input.slice(numStart, this.#position));
+		if (!parseResult.ok) return Err({
+			type: "InvalidNumberFormat",
+			span: this.spanFrom(start)
+		});
+		const [cbor$3] = parseResult.value;
+		const numValue = cbor$3.asNumber();
+		if (numValue === void 0) return Err({
+			type: "InvalidNumberFormat",
+			span: this.spanFrom(start)
+		});
+		const value = typeof numValue === "bigint" ? Number(numValue) : numValue;
 		if (!isFinite(value)) return Err({
 			type: "InvalidNumberFormat",
 			span: this.spanFrom(start)
@@ -5888,7 +5896,8 @@ const parsePrimary = (lexer) => {
 			});
 		} catch {
 			return Err({
-				type: "InvalidDigest",
+				type: "InvalidDigestPattern",
+				message: `Invalid digest hex: ${token.value}`,
 				span: spanned.span
 			});
 		}
@@ -5905,7 +5914,7 @@ const parsePrimary = (lexer) => {
 			});
 		} catch {
 			return Err({
-				type: "InvalidDate",
+				type: "InvalidDateFormat",
 				span: spanned.span
 			});
 		}