@siftline/core 0.1.0 → 0.1.1

package/README.md

@@ -42,4 +42,4 @@ ESM only. Node 22.14 or newer.
 
 ## Licence
 
-MIT — see [LICENSE](./LICENSE).
+MIT. See [LICENSE](./LICENSE).

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { a as entryType, c as parseRecipe, d as recipeSchema, f as score, i as defineRecipe, l as questionName, n as isObjectLike, p as serializeRecipe, r as choice, s as noul, t as parseJsonLines, u as questionSchema } from "./jsonl-Cyqrt9-a.mjs";
+import { a as entryType, c as parseRecipe, d as recipeSchema, f as score, i as defineRecipe, l as questionName, n as decodeThrown, p as serializeRecipe, r as choice, s as noul, t as parseJsonLines, u as questionSchema } from "./jsonl-CzTtnvyn.mjs";
 import { z } from "zod";
 //#region package.json
-var version = "0.1.0";
+var version = "0.1.1";
 //#endregion
 //#region src/decision.ts
 /** Strict: an unknown key is a bad Record, not a field to ignore. */
@@ -15,6 +15,8 @@ const answerValue = z.union([
 	z.boolean(),
 	z.number()
 ]);
+const label = z.string();
+const level = z.number().int().min(0);
 /**
 * Why `value` is not an answer to `asked`, or `null` when it is. Rules and Fixtures both
 * validate against the Recipe with it, so the two report the same words.
@@ -22,13 +24,13 @@ const answerValue = z.union([
 function answerValueProblem(asked, value) {
 	const shown = JSON.stringify(value);
 	if (asked.type === "choice") {
-		if (typeof value !== "string") return `value ${shown} is not a label`;
-		return Object.hasOwn(asked.criteria, value) ? null : `unknown label ${shown}`;
+		const parsed = label.safeParse(value);
+		if (!parsed.success) return `value ${shown} is not a label`;
+		return Object.hasOwn(asked.criteria, parsed.data) ? null : `unknown label ${shown}`;
 	}
-	if (asked.type === "noul") return typeof value === "boolean" ? null : `value ${shown} is not a boolean`;
+	if (asked.type === "noul") return value === true || value === false ? null : `value ${shown} is not a boolean`;
 	const last = asked.criteria.length - 1;
-	if (typeof value !== "number" || !Number.isInteger(value) || value < 0 || value > last) return `level index ${shown} is out of range (0-${last})`;
-	return null;
+	return level.max(last).safeParse(value).success ? null : `level index ${shown} is out of range (0-${last})`;
 }
 const unit = z.number().min(0).max(1);
 const levelIndex = z.string().regex(/^\d+$/);
@@ -163,13 +165,15 @@ const ruleSchema = z.object({
 	condition: ruleConditionSchema,
 	action: z.string().min(1).nullable()
 }).strict();
+const levelAnswer = z.number();
 function matches(answers, condition) {
 	const actual = answers[condition.question];
 	if (actual === void 0) return false;
 	if (condition.comparator === "is") return actual === condition.value;
-	if (condition.comparator === "isOneOf") return typeof actual === "string" && condition.value.includes(actual);
-	if (typeof actual !== "number") return false;
-	return condition.comparator === "atLeast" ? actual >= condition.value : actual <= condition.value;
+	if (condition.comparator === "isOneOf") return condition.value.some((label) => label === actual);
+	const level = levelAnswer.safeParse(actual);
+	if (!level.success) return false;
+	return condition.comparator === "atLeast" ? level.data >= condition.value : level.data <= condition.value;
 }
 /** Pure, first match wins, no review gate. Cloud runs it again on corrected answers. */
 function evaluateRules(answers, rules) {
@@ -221,7 +225,7 @@ function validateRules(rules, recipe) {
 			report(`unknown question "${question}"`);
 			continue;
 		}
-		if (!comparatorsFor[asked.type].includes(comparator)) {
+		if (!comparatorsFor[asked.type].some((allowed) => allowed === comparator)) {
 			report(`comparator "${comparator}" is not valid for a ${asked.type} question`);
 			continue;
 		}
@@ -312,40 +316,25 @@ function createGate(limit) {
 		return release;
 	};
 }
-function errorType(thrown) {
-	const body = thrown["body"];
-	if (!isObjectLike(body)) return void 0;
-	const detail = body["detail"];
-	if (!isObjectLike(detail)) return void 0;
-	const type = detail["error_type"];
-	return typeof type === "string" ? type : void 0;
-}
+const errorBodySchema = z.object({ detail: z.object({ error_type: z.string() }) });
 function reasonOf(thrown, status) {
-	if (status === null) {
-		const name = thrown["name"];
-		return typeof name === "string" && /timeout/i.test(name) ? "timeout" : "network";
-	}
-	const type = errorType(thrown);
+	if (status === null) return thrown.name !== void 0 && /timeout/i.test(thrown.name) ? "timeout" : "network";
+	const body = errorBodySchema.safeParse(thrown.body);
+	const type = body.success ? body.data.detail.error_type : void 0;
 	if (type === "api_usage_error" || type === "max_tokens_exceeded") return type;
 	return "unknown";
 }
 function isAbort(cause, thrown, signal) {
 	if (signal?.aborted === true && cause === signal.reason) return true;
-	const name = thrown["name"];
-	return name === "AbortError" || name === "APIUserAbortError";
+	return thrown.name === "AbortError" || thrown.name === "APIUserAbortError";
 }
-/** Duck typing, because core cannot import the SDK's error classes. Never returns. */
+/** Core cannot import the SDK's error classes, so it decodes their fields. Never returns. */
 function mapClientError(cause, signal) {
-	const thrown = isObjectLike(cause) ? cause : {};
+	const thrown = decodeThrown(cause);
 	if (isAbort(cause, thrown, signal)) throw cause;
-	const rawStatus = thrown["status"];
-	const status = typeof rawStatus === "number" ? rawStatus : null;
-	const rawMessage = thrown["message"];
-	const message = typeof rawMessage === "string" && rawMessage !== "" ? rawMessage : String(cause);
-	if (status === 429 || status === 529) {
-		const retryAfterMs = thrown["retryAfterMs"];
-		throw new JudgeExhaustedError(message, typeof retryAfterMs === "number" ? retryAfterMs : null, { cause });
-	}
+	const status = thrown.status ?? null;
+	const message = thrown.message !== void 0 && thrown.message !== "" ? thrown.message : String(cause);
+	if (status === 429 || status === 529) throw new JudgeExhaustedError(message, thrown.retryAfterMs ?? null, { cause });
 	throw new JudgeError(message, reasonOf(thrown, status), status, { cause });
 }
 function invalidAnswers(message) {
@@ -365,7 +354,7 @@ function rebuild(name, keys, source) {
 	const probabilities = {};
 	for (const key of keys) {
 		const probability = source[key];
-		if (typeof probability !== "number") throw invalidAnswers(`question ${name} has no probability for ${key}`);
+		if (probability === void 0) throw invalidAnswers(`question ${name} has no probability for ${key}`);
 		probabilities[key] = probability;
 	}
 	return probabilities;
@@ -505,13 +494,14 @@ function parseFixture(line) {
 }
 /** The only writer. One compact line, no trailing newline, absent optionals omitted. */
 function serializeFixture(fixture) {
-	const line = {};
-	if (fixture.id !== void 0) line["id"] = fixture.id;
-	if (fixture.origin !== void 0) line["origin"] = fixture.origin;
-	if (fixture.by !== void 0) line["by"] = fixture.by;
-	line["state"] = fixture.state;
-	line["expect"] = fixture.expect;
-	return JSON.stringify(line);
+	const { id, origin, by, state, expect } = fixture;
+	return JSON.stringify({
+		id,
+		origin,
+		by,
+		state,
+		expect
+	});
 }
 function parseFixtures(text) {
 	return parseJsonLines(text, parseFixture, (line, cause) => new FixtureParseError(`fixture line ${line} is not a valid Fixture`, line, { cause }));

package/dist/{jsonl-Cyqrt9-a.mjs → jsonl-CzTtnvyn.mjs}

@@ -103,10 +103,19 @@ function serializeRecipe(recipe) {
 	}, null, 2)}\n`;
 }
 //#endregion
-//#region src/object.ts
-/** Anything a property can be read off. Arrays count; the callers read named keys only. */
-function isObjectLike(value) {
-	return typeof value === "object" && value !== null;
+//#region src/thrown.ts
+const thrownSchema = z.object({
+	name: z.string().optional().catch(void 0),
+	message: z.string().optional().catch(void 0),
+	status: z.number().optional().catch(void 0),
+	retryAfterMs: z.number().optional().catch(void 0),
+	requestId: z.string().optional().catch(void 0),
+	body: z.unknown().optional()
+});
+/** Anything that is not an object carries no fields. */
+function decodeThrown(cause) {
+	const decoded = thrownSchema.safeParse(cause);
+	return decoded.success ? decoded.data : {};
 }
 //#endregion
 //#region src/jsonl.ts
@@ -127,4 +136,4 @@ function parseJsonLines(text, parseLine, fail) {
 	return values;
 }
 //#endregion
-export { entryType as a, parseRecipe as c, recipeSchema as d, score as f, defineRecipe as i, questionName as l, isObjectLike as n, jsonValue as o, serializeRecipe as p, choice as r, noul as s, parseJsonLines as t, questionSchema as u };
+export { entryType as a, parseRecipe as c, recipeSchema as d, score as f, defineRecipe as i, questionName as l, decodeThrown as n, jsonValue as o, serializeRecipe as p, choice as r, noul as s, parseJsonLines as t, questionSchema as u };

package/dist/testing.mjs

@@ -1,4 +1,4 @@
-import { a as entryType, n as isObjectLike, o as jsonValue, t as parseJsonLines, u as questionSchema } from "./jsonl-Cyqrt9-a.mjs";
+import { a as entryType, n as decodeThrown, o as jsonValue, t as parseJsonLines, u as questionSchema } from "./jsonl-CzTtnvyn.mjs";
 import { z } from "zod";
 //#region src/testing.ts
 const probability = z.number().min(0).max(1);
@@ -82,13 +82,14 @@ function createScriptedClient(script) {
 		}
 	};
 }
-function deepEqual(a, b) {
-	if (a === b) return true;
-	if (!isObjectLike(a) || !isObjectLike(b)) return false;
-	if (Array.isArray(a) !== Array.isArray(b)) return false;
-	const keys = Object.keys(a);
-	if (keys.length !== Object.keys(b).length) return false;
-	return keys.every((key) => key in b && deepEqual(a[key], b[key]));
+/** Objects write their keys sorted, so two values that differ only in key order match. */
+function canonicalJson(value) {
+	if (value === null || !(value instanceof Object)) return JSON.stringify(value);
+	if (Array.isArray(value)) return `[${value.map(canonicalJson).join(",")}]`;
+	return `{${Object.entries(value).toSorted(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, member]) => `${JSON.stringify(key)}:${canonicalJson(member)}`).join(",")}}`;
+}
+function requestKey(request) {
+	return canonicalJson(jsonValue.parse(JSON.parse(JSON.stringify(request))));
 }
 /** Rebuilds what the SDK threw closely enough for the Judge's duck typing to see it. */
 function replayError(recorded) {
@@ -103,29 +104,28 @@ function replayError(recorded) {
 }
 /** Answers the line whose `request` is deep-equal to the incoming one. Key order is free. */
 function createReplayClient(lines) {
+	const keyed = lines.map((line) => ({
+		key: requestKey(line.request),
+		line
+	}));
 	return { systemOne: async (request) => {
-		const line = lines.find((candidate) => deepEqual(candidate.request, request));
+		const key = requestKey(request);
+		const line = keyed.find((candidate) => candidate.key === key)?.line;
 		if (!line) throw new Error(`no replay line matches the request for model ${request.model} and questions ${Object.keys(request.questions).join(", ")}`);
 		if ("error" in line) throw replayError(line.error);
 		return line.response;
 	} };
 }
-function asString(value) {
-	return typeof value === "string" ? value : void 0;
-}
-function asNumber(value) {
-	return typeof value === "number" ? value : null;
-}
-/** Duck typing, because core cannot name the SDK's error classes. */
+/** Core cannot name the SDK's error classes, so it decodes their fields. */
 function recordError(cause) {
-	const thrown = isObjectLike(cause) ? cause : {};
+	const thrown = decodeThrown(cause);
 	return {
-		name: asString(thrown["name"]) ?? "Error",
-		message: asString(thrown["message"]) ?? String(cause),
-		status: asNumber(thrown["status"]),
-		retryAfterMs: asNumber(thrown["retryAfterMs"]),
-		requestId: asString(thrown["requestId"]),
-		body: thrown["body"]
+		name: thrown.name ?? "Error",
+		message: thrown.message ?? String(cause),
+		status: thrown.status ?? null,
+		retryAfterMs: thrown.retryAfterMs ?? null,
+		requestId: thrown.requestId,
+		body: thrown.body
 	};
 }
 /** Wraps a live client and hands one replay line per call to `sink`. The live test's half. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siftline/core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "The Siftline engine: recipes, rules, fixtures and the judge wrapper.",
   "keywords": [
     "classification",