@hypequery/protocol 0.17.0 → 0.18.0

package/dist/events/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/events/validate.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,wBAAwB,EAExB,kBAAkB,EAElB,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AA4OpB,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,kBAAkB,CAuDpB;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CA+B1B"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/events/validate.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,wBAAwB,EAExB,kBAAkB,EAElB,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AAuRpB,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,kBAAkB,CAiDpB;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CAiC1B"}

package/dist/events/validate.js

@@ -25,7 +25,7 @@ const DIAGNOSTICS_CONTEXT = {
     fail: diagnosticsError,
 };
 const HEX64_PATTERN = /^[0-9a-f]{64}$/;
-const OCCURRED_AT_PATTERN = /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\.[0-9]{1,3})?Z$/;
+const OCCURRED_AT_PATTERN = /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.[0-9]{3})?Z$/;
 const OPERATIONS = ['query', 'command', 'insert'];
 const OUTCOMES = ['success', 'failure'];
 const ERROR_CATEGORIES = [
@@ -84,20 +84,37 @@ function requireString(context, value, path) {
         context.fail(context.codes.type, path);
     return value;
 }
-function hasControlCharacter(text) {
+// The compiler's debug form spans lines, so debugQuery alone may carry tab,
+// line feed, and carriage return.
+const LINE_BREAK_CHARACTERS = new Set([0x09, 0x0a, 0x0d]);
+// Rejects C0 controls, DEL, the C1 range, and unpaired surrogates, which have
+// no UTF-8 encoding and so no canonical bytes.
+function hasForbiddenCodeUnit(text, allowLineBreaks) {
     for (let index = 0; index < text.length; index += 1) {
         const code = text.charCodeAt(index);
+        if (code <= 0x1f && allowLineBreaks && LINE_BREAK_CHARACTERS.has(code))
+            continue;
         if (code <= 0x1f || (code >= 0x7f && code <= 0x9f))
             return true;
+        if (code >= 0xd800 && code <= 0xdbff) {
+            // charCodeAt past the end is NaN, which fails the range check.
+            const low = text.charCodeAt(index + 1);
+            if (!(low >= 0xdc00 && low <= 0xdfff))
+                return true;
+            index += 1;
+        }
+        else if (code >= 0xdc00 && code <= 0xdfff) {
+            return true;
+        }
     }
     return false;
 }
-function boundedText(context, value, path, maximum) {
+function boundedText(context, value, path, maximum, allowLineBreaks = false) {
     const text = requireString(context, value, path);
     if (text.length > maximum || textEncoder.encode(text).byteLength > maximum) {
         context.fail(context.codes.tooLarge, path);
     }
-    if (hasControlCharacter(text)) {
+    if (hasForbiddenCodeUnit(text, allowLineBreaks)) {
         context.fail(context.codes.invalidValue, path);
     }
     return text;
@@ -110,7 +127,21 @@ function hexIdentity(context, value, path) {
 }
 function occurredAt(context, value, path) {
     const text = requireString(context, value, path);
-    if (!OCCURRED_AT_PATTERN.test(text) || Number.isNaN(Date.parse(text))) {
+    const match = OCCURRED_AT_PATTERN.exec(text);
+    if (!match)
+        context.fail(context.codes.invalidValue, path);
+    const [year, month, day, hour, minute, second] = match.slice(1).map(Number);
+    // Round-trip through Date so impossible dates (2026-02-30) and 24:00 fail
+    // rather than rolling over. setUTCFullYear avoids Date.UTC's 0-99 remap.
+    const date = new Date(0);
+    date.setUTCFullYear(year, month - 1, day);
+    date.setUTCHours(hour, minute, second, 0);
+    if (date.getUTCFullYear() !== year
+        || date.getUTCMonth() !== month - 1
+        || date.getUTCDate() !== day
+        || date.getUTCHours() !== hour
+        || date.getUTCMinutes() !== minute
+        || date.getUTCSeconds() !== second) {
         context.fail(context.codes.invalidValue, path);
     }
     return text;
@@ -166,10 +197,18 @@ function kindAndVersion(context, value, kind) {
         fail(codes.invalidVersion, '$.version');
     }
 }
+function outcomeWithCategory(context, value, hasCategory) {
+    const outcome = stringChoice(context, value.outcome, '$.outcome', OUTCOMES);
+    if ((outcome === 'failure') !== hasCategory) {
+        context.fail(context.codes.invalidValue, '$.errorCategory');
+    }
+    return outcome;
+}
 export function validateProtocolQueryEvent(input, options = {}) {
     const limits = resolveQueryEventLimits(options);
     const context = EVENT_CONTEXT;
     const value = requireRecord(context, input, '$');
+    kindAndVersion(context, value, 'hypequery-query-event');
     exactFields(context, value, [
         'kind',
         'version',
@@ -181,15 +220,8 @@ export function validateProtocolQueryEvent(input, options = {}) {
         'outcome',
         'durationMs',
     ], ['errorCategory', 'rowCount', 'tenantFingerprint', 'correlationId'], '$');
-    kindAndVersion(context, value, 'hypequery-query-event');
-    const outcome = stringChoice(context, value.outcome, '$.outcome', OUTCOMES);
     const hasCategory = Object.hasOwn(value, 'errorCategory');
-    if (outcome === 'failure' && !hasCategory) {
-        eventError('HQ_EVENT_INVALID_VALUE', '$.errorCategory');
-    }
-    if (outcome === 'success' && hasCategory) {
-        eventError('HQ_EVENT_INVALID_VALUE', '$.errorCategory');
-    }
+    // Object literal entries evaluate in order, so fields are checked in RFC order.
     return freezeRecord({
         kind: 'hypequery-query-event',
         version: 1,
@@ -198,7 +230,7 @@ export function validateProtocolQueryEvent(input, options = {}) {
         target: queryTarget(context, value.target, '$.target'),
         queryName: queryName(context, value.queryName, '$.queryName'),
         operation: stringChoice(context, value.operation, '$.operation', OPERATIONS),
-        outcome,
+        outcome: outcomeWithCategory(context, value, hasCategory),
         ...(hasCategory ? {
             errorCategory: stringChoice(context, value.errorCategory, '$.errorCategory', ERROR_CATEGORIES),
         } : {}),
@@ -218,8 +250,8 @@ export function validateProtocolQueryDiagnostics(input, options = {}) {
     const limits = resolveQueryEventLimits(options);
     const context = DIAGNOSTICS_CONTEXT;
     const value = requireRecord(context, input, '$');
-    exactFields(context, value, ['kind', 'version', 'eventId', 'queryId', 'terminalReason', 'attempts'], ['runtimeIdentity', 'debugQuery', 'safeMessage'], '$');
     kindAndVersion(context, value, 'hypequery-query-diagnostics');
+    exactFields(context, value, ['kind', 'version', 'eventId', 'queryId', 'terminalReason', 'attempts'], ['runtimeIdentity', 'debugQuery', 'safeMessage'], '$');
     return freezeRecord({
         kind: 'hypequery-query-diagnostics',
         version: 1,
@@ -231,7 +263,7 @@ export function validateProtocolQueryDiagnostics(input, options = {}) {
             runtimeIdentity: hexIdentity(context, value.runtimeIdentity, '$.runtimeIdentity'),
         } : {}),
         ...(Object.hasOwn(value, 'debugQuery') ? {
-            debugQuery: boundedText(context, value.debugQuery, '$.debugQuery', limits.maxDebugBytes),
+            debugQuery: boundedText(context, value.debugQuery, '$.debugQuery', limits.maxDebugBytes, true),
         } : {}),
         ...(Object.hasOwn(value, 'safeMessage') ? {
             safeMessage: boundedText(context, value.safeMessage, '$.safeMessage', limits.maxStringBytes),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/protocol",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Portable analytics contracts and TypeScript reference implementation for Hypequery",
   "keywords": [
     "hypequery",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "typescript": "^5.7.3",
-    "vitest": "^3.2.6"
+    "vitest": "^5.0.2"
   },
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
   "scripts": {
     "build": "tsc --project tsconfig.json",
     "dev": "tsc --project tsconfig.json --watch",
-    "lint": "eslint --ext .ts \"src/**/*.ts\"",
+    "lint": "eslint \"src/**/*.ts\"",
     "test": "vitest run",
     "types": "tsc --project tsconfig.json --noEmit && tsc --project tsconfig.test.json"
   }