@mnmal-ai/substrate-nl 1.0.0-alpha.8 → 1.0.0-alpha.9

package/dist/ask/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/ask/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAa,MAAM,aAAa,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAgFD,wBAAuB,MAAM,CAC3B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,OAAO,GACZ,cAAc,CAAC,OAAO,CAAC,CAqHzB"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/ask/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,KAAK,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAa,MAAM,aAAa,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAkID,wBAAuB,MAAM,CAC3B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,OAAO,GACZ,cAAc,CAAC,OAAO,CAAC,CAqHzB"}

package/dist/{bootstrap-BAz6il5S.js → bootstrap-Ck2fkpjP.js}

@@ -1011,17 +1011,53 @@ async function rows(c, source, http, deps, handoff) {
 	const frame = executable(c, deps.pack);
 	const key = Object.keys(frame)[0];
 	const env = await deps.engine.query(frame, http);
-	const present = env.data !== void 0 && key in env.data;
+	const data = env.data !== void 0 && key in env.data ? env.data?.[key] : void 0;
+	const errors = [...env.errors ?? []];
+	let count;
+	if (c.answer === "count" && Array.isArray(data)) {
+		const counted = await countRest(frame, key, data.length, env, http, deps);
+		if (typeof counted === "number") count = counted;
+		else errors.push(counted);
+	}
 	return {
 		kind: "rows",
 		frame,
 		answer: c.answer,
-		data: present ? env.data?.[key] : void 0,
-		...env.errors !== void 0 && env.errors.length > 0 ? { errors: env.errors } : {},
+		data,
+		...count !== void 0 ? { count } : {},
+		...errors.length > 0 ? { errors } : {},
 		source,
 		...handoff !== void 0 ? { handoff } : {}
 	};
 }
+const MAX_COUNT_PAGES = 1e3;
+/** The population a count candidate matches: `seen` rows from page one, then id-only pages after its cursor. */
+async function countRest(frame, key, seen, first, http, deps) {
+	const params = frame[key]?.params ?? {};
+	let count = seen;
+	let page = first._pagination?.[key];
+	for (let pages = 1; page?.hasMore === true; pages++) {
+		if (pages >= MAX_COUNT_PAGES || page.nextCursor === void 0 || isAborted(http)) return {
+			code: "count_incomplete",
+			message: `counted ${count} rows and stopped before the end; the true count is higher`
+		};
+		const env = await deps.engine.query({ [key]: {
+			params: {
+				...params,
+				cursor: page.nextCursor
+			},
+			fields: { id: true }
+		} }, http);
+		const rows = env.data?.[key];
+		if (!Array.isArray(rows)) return {
+			code: "count_incomplete",
+			message: `counted ${count} rows, then a page failed: ${JSON.stringify(env.errors ?? [])}`
+		};
+		count += rows.length;
+		page = env._pagination?.[key];
+	}
+	return count;
+}
 async function recall(query, ns, type, http, deps) {
 	const frame = { "recall/Hit": {
 		params: {

package/dist/bootstrap.js

@@ -1,3 +1,3 @@
-import { n as bootstrap, t as NlBootstrapConfigSchema } from "./bootstrap-BAz6il5S.js";
+import { n as bootstrap, t as NlBootstrapConfigSchema } from "./bootstrap-Ck2fkpjP.js";
 
 export { NlBootstrapConfigSchema, bootstrap, bootstrap as default };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as askHandler, c as profileNamespace, d as mergeRulings, f as readRulings, g as parseQuestion, h as parseWithJudge, i as createNlPlugin, l as buildNamespacePack, m as runAsk, n as bootstrap, o as packHandler, p as OllamaJudge, r as CONTRACT_VERSION, s as PackService, t as NlBootstrapConfigSchema, u as NamespaceRulingsSchema } from "./bootstrap-BAz6il5S.js";
+import { a as askHandler, c as profileNamespace, d as mergeRulings, f as readRulings, g as parseQuestion, h as parseWithJudge, i as createNlPlugin, l as buildNamespacePack, m as runAsk, n as bootstrap, o as packHandler, p as OllamaJudge, r as CONTRACT_VERSION, s as PackService, t as NlBootstrapConfigSchema, u as NamespaceRulingsSchema } from "./bootstrap-Ck2fkpjP.js";
 import { complete } from "./complete.js";
 
 export { CONTRACT_VERSION, NamespaceRulingsSchema, NlBootstrapConfigSchema, OllamaJudge, PackService, askHandler, bootstrap, buildNamespacePack, complete, createNlPlugin, mergeRulings, packHandler, parseQuestion, parseWithJudge, profileNamespace, readRulings, runAsk };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mnmal-ai/substrate-nl",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "Natural-language questions for Substrate — a deterministic parser with an optional constrained judge, served at POST /substrate/v1/nl and GET /substrate/v1/nl/pack/:ns, plus browser-safe completion.",
   "license": "Apache-2.0",
   "repository": {
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.6.2",
-    "@mnmal-ai/substrate": "1.0.0-alpha.8",
-    "@mnmal-ai/substrate-config": "1.0.0-alpha.8",
+    "@mnmal-ai/substrate": "1.0.0-alpha.9",
+    "@mnmal-ai/substrate-config": "1.0.0-alpha.9",
     "@types/node": "^26.6.4",
     "tsdown": "^0.23.0",
     "typescript": "^7.0.2",