@oomol-lab/open-flow 0.1.0-beta.87 → 0.1.0-beta.88

package/dist/common/control-api-conformance.js

@@ -12476,6 +12476,14 @@ function runEvents(value) {
 	};
 }
 var segment = encodeURIComponent;
+async function responseJson(response, signal) {
+	try {
+		return await response.json();
+	} catch (error) {
+		if (signal?.aborted) throw signal.reason ?? error;
+		return invalidResponse(`HTTP ${response.status} response body is not JSON.`);
+	}
+}
 function operationKey(operation) {
 	return `${operation}-${randomId()}`;
 }
@@ -12774,7 +12782,7 @@ var ControlClient = class {
 		};
 		return {
 			modified: true,
-			data: query.decode(await response.json()),
+			data: query.decode(await responseJson(response, signal)),
 			etag: nextETag
 		};
 	}
@@ -12803,7 +12811,7 @@ var ControlClient = class {
 			};
 		}
 		return {
-			data: decodeTriggerCatalog(await response.json()),
+			data: decodeTriggerCatalog(await responseJson(response, signal)),
 			etag: response.headers.get("etag")?.trim() || null
 		};
 	}
@@ -13312,7 +13320,7 @@ var ControlClient = class {
 			try {
 				value = await response.json();
 			} catch {
-				return invalidResponse();
+				return invalidResponse(`HTTP ${response.status} response did not include a JSON error body.`);
 			}
 			const error = record$1(value).error;
 			const source = error == null ? void 0 : record$1(error);
@@ -13321,12 +13329,7 @@ var ControlClient = class {
 		return response;
 	}
 	async request(path, init = {}) {
-		const response = await this.response(path, init);
-		try {
-			return await response.json();
-		} catch {
-			return invalidResponse();
-		}
+		return await responseJson(await this.response(path, init), init.signal);
 	}
 };
 //#endregion

package/dist/common/control-api.js

@@ -13165,6 +13165,14 @@ function runEvents(value) {
 	};
 }
 var segment = encodeURIComponent;
+async function responseJson(response, signal) {
+	try {
+		return await response.json();
+	} catch (error) {
+		if (signal?.aborted) throw signal.reason ?? error;
+		return invalidResponse(`HTTP ${response.status} response body is not JSON.`);
+	}
+}
 function operationKey(operation) {
 	return `${operation}-${randomId()}`;
 }
@@ -13463,7 +13471,7 @@ var ControlClient = class {
 		};
 		return {
 			modified: true,
-			data: query.decode(await response.json()),
+			data: query.decode(await responseJson(response, signal)),
 			etag: nextETag
 		};
 	}
@@ -13492,7 +13500,7 @@ var ControlClient = class {
 			};
 		}
 		return {
-			data: decodeTriggerCatalog(await response.json()),
+			data: decodeTriggerCatalog(await responseJson(response, signal)),
 			etag: response.headers.get("etag")?.trim() || null
 		};
 	}
@@ -14001,7 +14009,7 @@ var ControlClient = class {
 			try {
 				value = await response.json();
 			} catch {
-				return invalidResponse();
+				return invalidResponse(`HTTP ${response.status} response did not include a JSON error body.`);
 			}
 			const error = record(value).error;
 			const source = error == null ? void 0 : record(error);
@@ -14010,12 +14018,7 @@ var ControlClient = class {
 		return response;
 	}
 	async request(path, init = {}) {
-		const response = await this.response(path, init);
-		try {
-			return await response.json();
-		} catch {
-			return invalidResponse();
-		}
+		return await responseJson(await this.response(path, init), init.signal);
 	}
 };
 //#endregion

package/dist/common/control-requests.js

@@ -16388,6 +16388,12 @@ function sourceOutputLabel(source) {
 function isResolutionNode(node) {
 	return node?.kind == "approval" || node?.kind == "wait";
 }
+function keywordMismatchDetail(mismatch) {
+	if (mismatch?.kind != "keyword") return "";
+	const location = mismatch.path.length == 0 ? "" : ` at ${mismatch.path.join(".")}`;
+	const declared = mismatch.source === void 0 ? "does not declare it" : `declares ${JSON.stringify(mismatch.source)}`;
+	return ` The input requires ${mismatch.keyword} ${JSON.stringify(mismatch.target)}${location}; the output ${declared}.`;
+}
 function graphDiagnostic(code, message, path, values, mismatch) {
 	return {
 		code,
@@ -16610,7 +16616,7 @@ function checkSource(source, graph, document, targetInput, path, diagnostics) {
 			}
 			if (targetInput != null) {
 				const comparison = comparePorts(selected, targetInput);
-				if (comparison.kind != "compatible") diagnostics.push(graphDiagnostic("graph.node-output-incompatible", `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.`, path, {
+				if (comparison.kind != "compatible") diagnostics.push(graphDiagnostic("graph.node-output-incompatible", `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.${comparison.kind == "incompatible" ? keywordMismatchDetail(comparison.mismatch) : ""}`, path, {
 					nodeId: source.nodeId,
 					output: source.output,
 					...source.field === void 0 ? {} : { field: source.field }
@@ -18115,7 +18121,7 @@ async function compileAuthoring(base, request, host) {
 		operations.push(...checked);
 	}
 	function resolve(ref) {
-		return ref.startsWith("$") ? (Object.hasOwn(aliases, ref.slice(1)) ? aliases[ref.slice(1)] : void 0) ?? fail("node.alias-missing", `Unknown alias ${ref}.`) : ref;
+		return ref.startsWith("$") ? (Object.hasOwn(aliases, ref.slice(1)) ? aliases[ref.slice(1)] : void 0) ?? fail("node.alias-missing", `Unknown alias ${ref}. Set the as field to ${JSON.stringify(ref.slice(1))} on an earlier node.add in the same request.`) : ref;
 	}
 	function source(value) {
 		if (value.kind == "output" || value.kind == "system") {

package/dist/common/flow-semantics.js

@@ -12879,6 +12879,12 @@ function sourceOutputLabel(source) {
 function isResolutionNode(node) {
 	return node?.kind == "approval" || node?.kind == "wait";
 }
+function keywordMismatchDetail(mismatch) {
+	if (mismatch?.kind != "keyword") return "";
+	const location = mismatch.path.length == 0 ? "" : ` at ${mismatch.path.join(".")}`;
+	const declared = mismatch.source === void 0 ? "does not declare it" : `declares ${JSON.stringify(mismatch.source)}`;
+	return ` The input requires ${mismatch.keyword} ${JSON.stringify(mismatch.target)}${location}; the output ${declared}.`;
+}
 function graphDiagnostic(code, message, path, values, mismatch) {
 	return {
 		code,
@@ -13101,7 +13107,7 @@ function checkSource(source, graph, document, targetInput, path, diagnostics) {
 			}
 			if (targetInput != null) {
 				const comparison = comparePorts(selected, targetInput);
-				if (comparison.kind != "compatible") diagnostics.push(graphDiagnostic("graph.node-output-incompatible", `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.`, path, {
+				if (comparison.kind != "compatible") diagnostics.push(graphDiagnostic("graph.node-output-incompatible", `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.${comparison.kind == "incompatible" ? keywordMismatchDetail(comparison.mismatch) : ""}`, path, {
 					nodeId: source.nodeId,
 					output: source.output,
 					...source.field === void 0 ? {} : { field: source.field }

package/dist/common/mcp.js

@@ -12666,6 +12666,14 @@ function runEvents(value) {
 	};
 }
 var segment = encodeURIComponent;
+async function responseJson(response, signal) {
+	try {
+		return await response.json();
+	} catch (error) {
+		if (signal?.aborted) throw signal.reason ?? error;
+		return invalidResponse(`HTTP ${response.status} response body is not JSON.`);
+	}
+}
 function operationKey(operation) {
 	return `${operation}-${randomId()}`;
 }
@@ -12964,7 +12972,7 @@ var ControlClient = class {
 		};
 		return {
 			modified: true,
-			data: query.decode(await response.json()),
+			data: query.decode(await responseJson(response, signal)),
 			etag: nextETag
 		};
 	}
@@ -12993,7 +13001,7 @@ var ControlClient = class {
 			};
 		}
 		return {
-			data: decodeTriggerCatalog(await response.json()),
+			data: decodeTriggerCatalog(await responseJson(response, signal)),
 			etag: response.headers.get("etag")?.trim() || null
 		};
 	}
@@ -13502,7 +13510,7 @@ var ControlClient = class {
 			try {
 				value = await response.json();
 			} catch {
-				return invalidResponse();
+				return invalidResponse(`HTTP ${response.status} response did not include a JSON error body.`);
 			}
 			const error = record(value).error;
 			const source = error == null ? void 0 : record(error);
@@ -13511,12 +13519,7 @@ var ControlClient = class {
 		return response;
 	}
 	async request(path, init = {}) {
-		const response = await this.response(path, init);
-		try {
-			return await response.json();
-		} catch {
-			return invalidResponse();
-		}
+		return await responseJson(await this.response(path, init), init.signal);
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oomol-lab/open-flow",
-  "version": "0.1.0-beta.87",
+  "version": "0.1.0-beta.88",
   "description": "TypeScript contracts and Browser runtime for Open Flow.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {

package/src/control/common/api.ts

@@ -857,6 +857,15 @@ function runEvents(value: unknown): RunEvents {
 
 const segment = encodeURIComponent
 
+async function responseJson(response: Response, signal: AbortSignal | null | undefined): Promise<unknown> {
+  try {
+    return await response.json()
+  } catch (error) {
+    if (signal?.aborted) throw signal.reason ?? error
+    return invalidResponse(`HTTP ${response.status} response body is not JSON.`)
+  }
+}
+
 function operationKey(operation: string): string {
   return `${operation}-${randomId()}`
 }
@@ -1158,7 +1167,7 @@ export class ControlClient {
     const response = await this.response(query.path, { headers, signal }, true)
     const nextETag = response.headers.get('etag')?.trim() || null
     if (response.status == 304) return { modified: false, etag: nextETag }
-    return { modified: true, data: query.decode(await response.json()), etag: nextETag }
+    return { modified: true, data: query.decode(await responseJson(response, signal)), etag: nextETag }
   }
 
   async getTriggerCatalog(locale: string, cached?: TriggerCatalogCache, signal?: AbortSignal): Promise<TriggerCatalogCache> {
@@ -1177,7 +1186,7 @@ export class ControlClient {
       if (cached == null) return invalidResponse()
       return { ...cached, etag: response.headers.get('etag')?.trim() || cached.etag }
     }
-    return { data: decodeTriggerCatalog(await response.json()), etag: response.headers.get('etag')?.trim() || null }
+    return { data: decodeTriggerCatalog(await responseJson(response, signal)), etag: response.headers.get('etag')?.trim() || null }
   }
 
   async getTriggerKey(key: string, signal?: AbortSignal): Promise<TriggerKeySnapshot> {
@@ -1746,7 +1755,7 @@ export class ControlClient {
       try {
         value = await response.json()
       } catch {
-        return invalidResponse()
+        return invalidResponse(`HTTP ${response.status} response did not include a JSON error body.`)
       }
       const error = record(value).error
       const source = error == null ? undefined : record(error)
@@ -1761,11 +1770,6 @@ export class ControlClient {
   }
 
   protected async request<Value = unknown>(path: string, init: RequestInit = {}): Promise<Value> {
-    const response = await this.response(path, init)
-    try {
-      return (await response.json()) as Value
-    } catch {
-      return invalidResponse()
-    }
+    return (await responseJson(await this.response(path, init), init.signal)) as Value
   }
 }

package/src/control/common/authoring.ts

@@ -363,7 +363,8 @@ export async function compileAuthoring(base: RevisionContent, request: Authoring
   }
   function resolve(ref: string) {
     return ref.startsWith('$')
-      ? ((Object.hasOwn(aliases, ref.slice(1)) ? aliases[ref.slice(1)] : undefined) ?? fail('node.alias-missing', `Unknown alias ${ref}.`))
+      ? ((Object.hasOwn(aliases, ref.slice(1)) ? aliases[ref.slice(1)] : undefined) ??
+          fail('node.alias-missing', `Unknown alias ${ref}. Set the as field to ${JSON.stringify(ref.slice(1))} on an earlier node.add in the same request.`))
       : ref
   }
   function source(

package/src/flow/common/graph.ts

@@ -39,6 +39,13 @@ import {
 export function isResolutionNode(node: GraphNode | undefined): node is Extract<GraphNode, { readonly kind: 'approval' | 'wait' }> {
   return node?.kind == 'approval' || node?.kind == 'wait'
 }
+function keywordMismatchDetail(mismatch: SchemaMismatch | undefined): string {
+  if (mismatch?.kind != 'keyword') return ''
+  const location = mismatch.path.length == 0 ? '' : ` at ${mismatch.path.join('.')}`
+  const declared = mismatch.source === undefined ? 'does not declare it' : `declares ${JSON.stringify(mismatch.source)}`
+  return ` The input requires ${mismatch.keyword} ${JSON.stringify(mismatch.target)}${location}; the output ${declared}.`
+}
+
 function graphDiagnostic(
   code: string,
   message: string,
@@ -369,7 +376,9 @@ function checkSource(
           diagnostics.push(
             graphDiagnostic(
               'graph.node-output-incompatible',
-              `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.`,
+              `Upstream node "${source.nodeId}" output ${JSON.stringify(sourceOutputLabel(source))} is not compatible with this input.${
+                comparison.kind == 'incompatible' ? keywordMismatchDetail(comparison.mismatch) : ''
+              }`,
               path,
               { nodeId: source.nodeId, output: source.output, ...(source.field === undefined ? {} : { field: source.field }) },
               comparison.kind == 'incompatible' ? comparison.mismatch : undefined,