@alint-js/plugin-js 0.4.0 → 0.5.0

package/dist/effect-Df2gY8Wx-nOf2Ahg5.mjs

@@ -0,0 +1,8 @@
+import { r as tryImport } from "./index-DoHiaFQM-CRsQPut_.mjs";
+//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_fc4c9b616e7b9dad1be842cce987659a/node_modules/xsschema/dist/effect-Df2gY8Wx.js
+const getToJsonSchemaFn = async () => {
+	const { JSONSchema } = await tryImport(import("./esm-DxmkD6o9.mjs"), "effect");
+	return (schema) => JSONSchema.make(schema);
+};
+//#endregion
+export { getToJsonSchemaFn };

package/dist/{index-DoHiaFQM-DimeKT70.mjs → index-DoHiaFQM-CRsQPut_.mjs}

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_2fbd9cf5ae1608dbd5cb0576dee823ee/node_modules/xsschema/dist/index-DoHiaFQM.js
+//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_fc4c9b616e7b9dad1be842cce987659a/node_modules/xsschema/dist/index-DoHiaFQM.js
 const strictJsonSchema = (schema) => ({
 	...schema,
 	additionalProperties: false,

package/dist/index.d.mts

@@ -746,7 +746,7 @@ interface Config$1<TIssue extends BaseIssue$1<unknown>> {
   readonly abortPipeEarly?: boolean | undefined;
 }
 //#endregion
-//#region ../core/dist/types-deBCDA4_.d.mts
+//#region ../core/dist/types-BK5CADYK.d.mts
 //#region src/config/types.d.ts
 type ModelSize = 'large' | 'medium' | 'small';
 interface RunnerCacheConfig {
@@ -973,8 +973,10 @@ interface RuleInferenceUsageRecord {
   totalTokens?: number;
 }
 /**
- * - `'any'` — every registered language, and never a failure. A rule that works from `FunctionInfo`
- *   alone wants this: a language pack the user installs later is covered without a new release.
+ * - `'any'` — every language except `plaintext`, and never a failure. Plain text is what a file
+ *   falls back to when no language claims it, so a rule asking for any language is asking for a
+ *   real one. Rules that work from `FunctionInfo` alone want this: install another language pack
+ *   and they cover it too, unchanged.
  * - A list of language ids — `LanguageDefinition.name` values such as `go` or `typescript`, never
  *   file extensions. The rule handles exactly these. Files of other languages are skipped
  *   rather than failed, so one plugin can carry rules for several languages behind one `files:`

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { n as __exportAll, r as __toESM, t as __commonJSMin } from "./rolldown-runtime-DC62tzP2.mjs";
-import { n as strictJsonSchema } from "./index-DoHiaFQM-DimeKT70.mjs";
+import { n as strictJsonSchema } from "./index-DoHiaFQM-CRsQPut_.mjs";
 import { isAbsolute, normalize, relative, resolve, sep } from "node:path";
 import * as nativeFs from "fs";
 import { readdir, readdirSync, realpath, realpathSync, stat, statSync } from "fs";
@@ -1347,7 +1347,7 @@ function toStandardJsonSchema(schema) {
 	} };
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@xsai+shared@0.5.0-beta.7/node_modules/@xsai/shared/dist/index.js
+//#region ../../node_modules/.pnpm/@xsai+shared@0.5.0-beta.8/node_modules/@xsai/shared/dist/index.js
 var XSAIError = class extends Error {
 	constructor(message, code, options = {}) {
 		super(message, { cause: options.cause });
@@ -1394,12 +1394,6 @@ var JSONParseError = class extends XSAIError {
 		this.text = options.text;
 	}
 };
-var ToolExecutionError = class extends XSAIError {
-	constructor(message, options) {
-		super(message, "tool_execution_error", options);
-		Object.assign(this, options);
-	}
-};
 const strCamelToSnake = (str) => str.replace(/[A-Z]/g, (s) => `_${s.toLowerCase()}`);
 const objCamelToSnake = (obj) => Object.fromEntries(Object.entries(obj).map(([k, v]) => [strCamelToSnake(k), v]));
 const clean = (obj) => Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== void 0));
@@ -1468,7 +1462,7 @@ const trampoline = async (fn) => {
 	return result;
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@xsai+shared-chat@0.5.0-beta.7/node_modules/@xsai/shared-chat/dist/index.js
+//#region ../../node_modules/.pnpm/@xsai+shared-chat@0.5.0-beta.8/node_modules/@xsai/shared-chat/dist/index.js
 const chat = async (options) => postJSON("chat/completions", {
 	...options,
 	maxSteps: void 0,
@@ -1493,7 +1487,12 @@ const toToolMessageContent = (result) => {
 	}
 	return JSON.stringify(result);
 };
-const isAbortError = (error, abortSignal) => abortSignal?.aborted === true && error === abortSignal.reason || error instanceof Error && error.name === "AbortError";
+const toCompletionToolCall = (toolCall) => ({
+	args: toolCall.function.arguments ?? "",
+	toolCallId: toolCall.id,
+	toolCallType: "function",
+	toolName: toolCall.function.name ?? ""
+});
 const parseToolInput = async (tool, input) => {
 	let result;
 	try {
@@ -1516,17 +1515,18 @@ const parseToolInput = async (tool, input) => {
 	}
 	return result;
 };
-const runTool = async (tool, options) => {
+const createErrorToolResult = (toolCall, args, cause, abortSignal) => ({
+	args,
+	isError: true,
+	result: `Tool "${toolCall.toolName}" execution failed: ${abortSignal?.aborted === true ? "This operation was aborted" : cause instanceof Error ? cause.message : String(cause)}`,
+	toolCallId: toolCall.toolCallId,
+	toolName: toolCall.toolName
+});
+const catchToolError = async (toolCall, abortSignal, callback) => {
 	try {
-		return await tool.execute(options.args, options.toolExecuteOptions);
+		return await callback(toolCall);
 	} catch (cause) {
-		if (isAbortError(cause, options.toolExecuteOptions.abortSignal)) throw cause;
-		throw new ToolExecutionError(`Tool "${tool.function.name}" execution failed.`, {
-			cause,
-			toolCallId: options.toolExecuteOptions.toolCallId,
-			toolInput: options.args,
-			toolName: tool.function.name
-		});
+		return createErrorToolResult(toolCall, InvalidToolInputError.isInstance(cause) ? cause.toolInput : toolCall.args, cause, abortSignal);
 	}
 };
 const assertSameToolCallId = (source, next, label) => {
@@ -1573,29 +1573,34 @@ const executeTool = async ({ abortSignal, messages, postToolCall, preToolCall, t
 		toolName
 	};
 	let completionToolResult;
-	const preToolCallResult = await preToolCall?.(completionToolCall, toolExecuteOptions);
+	let parsedArgs;
+	let shouldPostToolCall = false;
+	const preToolCallResult = await catchToolError(completionToolCall, abortSignal, async (toolCall2) => preToolCall?.(toolCall2, toolExecuteOptions));
 	if (preToolCallResult) {
 		assertSameToolCallId(completionToolCall.toolCallId, preToolCallResult, "preToolCallResult");
 		if ("result" in preToolCallResult) completionToolResult = preToolCallResult;
 		else completionToolCall = preToolCallResult;
 	}
-	if (completionToolResult == null) {
+	completionToolResult ??= await catchToolError(completionToolCall, abortSignal, async () => {
 		const tool = findTool(tools, completionToolCall.toolName, completionToolCall);
-		const args = await parseToolInput(tool, completionToolCall.args);
-		completionToolResult = {
-			args,
-			result: await runTool(tool, {
-				args,
-				toolExecuteOptions
-			}),
+		parsedArgs = await parseToolInput(tool, completionToolCall.args);
+		if (abortSignal?.aborted === true) return createErrorToolResult(completionToolCall, parsedArgs, abortSignal.reason, abortSignal);
+		shouldPostToolCall = true;
+		const result = await tool.execute(parsedArgs, toolExecuteOptions);
+		return {
+			args: parsedArgs,
+			result,
 			toolCallId: completionToolCall.toolCallId,
 			toolName: completionToolCall.toolName
 		};
-	}
-	const postToolCallResult = await postToolCall?.(completionToolResult, toolExecuteOptions);
-	if (postToolCallResult) {
-		assertSameToolCallId(completionToolResult.toolCallId, postToolCallResult, "postToolCallResult");
-		completionToolResult = postToolCallResult;
+	});
+	if (shouldPostToolCall) {
+		completionToolResult.args = parsedArgs;
+		const postToolCallResult = await catchToolError(completionToolResult, abortSignal, async (toolResult) => postToolCall?.(toolResult, toolExecuteOptions));
+		if (postToolCallResult) {
+			assertSameToolCallId(completionToolResult.toolCallId, postToolCallResult, "postToolCallResult");
+			completionToolResult = postToolCallResult;
+		}
 	}
 	return {
 		completionToolCall,
@@ -1629,7 +1634,7 @@ const normalizeChatCompletionUsage = (usage) => ({
 	totalTokens: usage.total_tokens
 });
 //#endregion
-//#region ../../node_modules/.pnpm/@xsai+generate-text@0.5.0-beta.7/node_modules/@xsai/generate-text/dist/index.js
+//#region ../../node_modules/.pnpm/@xsai+generate-text@0.5.0-beta.8/node_modules/@xsai/generate-text/dist/index.js
 const rawGenerateText = async (options) => {
 	const messages = options.steps == null ? structuredClone(options.messages) : options.messages;
 	const steps = options.steps ?? [];
@@ -1660,13 +1665,26 @@ const rawGenerateText = async (options) => {
 				responseBody
 			});
 		}
-		const toolCalls = [];
-		const toolResults = [];
 		const { finish_reason: finishReason, message } = choices[0];
 		const msgToolCalls = message?.tool_calls ?? [];
+		const toolCalls = msgToolCalls.map(toCompletionToolCall);
+		const toolResults = [];
 		const stopWhen = options.stopWhen ?? stepCountAtLeast(1);
 		messages.push(message);
-		if (msgToolCalls.length > 0) {
+		const step = {
+			finishReason,
+			text: Array.isArray(message.content) ? message.content.filter((m) => m.type === "text").map((m) => m.text).join("\n") : message.content,
+			toolCalls,
+			toolResults,
+			usage
+		};
+		if (options.abortSignal?.aborted === true) throw options.abortSignal.reason ?? /* @__PURE__ */ new Error("This operation was aborted");
+		const stop = shouldStop(stopWhen, {
+			input: messages,
+			step,
+			steps: [...steps, step]
+		});
+		if (!stop && msgToolCalls.length > 0) {
 			const results = await Promise.all(msgToolCalls.map(async (toolCall) => executeTool({
 				abortSignal: options.abortSignal,
 				messages,
@@ -1675,6 +1693,7 @@ const rawGenerateText = async (options) => {
 				toolCall,
 				tools: options.tools
 			})));
+			toolCalls.length = 0;
 			for (const { completionToolCall, completionToolResult, result } of results) {
 				toolCalls.push(completionToolCall);
 				toolResults.push(completionToolResult);
@@ -1685,19 +1704,7 @@ const rawGenerateText = async (options) => {
 				});
 			}
 		}
-		const step = {
-			finishReason,
-			text: Array.isArray(message.content) ? message.content.filter((m) => m.type === "text").map((m) => m.text).join("\n") : message.content,
-			toolCalls,
-			toolResults,
-			usage
-		};
-		const stop = shouldStop(stopWhen, {
-			input: messages,
-			step,
-			steps: [...steps, step]
-		});
-		const willContinue = toolCalls.length > 0 && !stop;
+		const willContinue = toolCalls.length > 0 && !stop && !options.abortSignal?.aborted;
 		steps.push(step);
 		if (options.onStepFinish) await options.onStepFinish(step);
 		if (!willContinue) return {
@@ -1721,7 +1728,7 @@ const rawGenerateText = async (options) => {
 };
 const generateText = async (options) => trampoline(async () => rawGenerateText(options));
 //#endregion
-//#region ../../node_modules/.pnpm/@xsai+tool@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3____f38a8212ad071b3d82e34970cca0a89a/node_modules/@xsai/tool/dist/index.js
+//#region ../../node_modules/.pnpm/@xsai+tool@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3____61a066324c36664bceb0a54542d37106/node_modules/@xsai/tool/dist/index.js
 const rawTool = ({ description, execute, name, parameters, strict }) => ({
 	execute,
 	function: {
@@ -1881,20 +1888,32 @@ function parseStructuredResponse(schema, toolName, response) {
 		retriable: true
 	};
 	const toolResults = response.toolResults.filter((result) => result.toolName === toolName);
-	if (toolResults.length === 0) return {
+	const toolCalls = response.toolCalls.filter((call) => call.toolName === toolName);
+	const matches = toolResults.length + toolCalls.length;
+	if (matches === 0) return {
 		error: `Missing ${toolName} tool result; finishReason=${response.finishReason}`,
 		ok: false,
 		retriable: true
 	};
-	if (toolResults.length > 1) return {
-		error: `Expected one ${toolName} tool result, received ${toolResults.length}`,
+	if (matches > 1) return {
+		error: `Expected one ${toolName} tool result, received ${matches}`,
 		ok: false,
 		retriable: true
 	};
+	let value;
+	try {
+		value = toolResults[0] !== void 0 ? toolResults[0].result : JSON.parse(toolCalls[0].args);
+	} catch (error) {
+		return {
+			error: `Tool call failed before validation: ${errorMessageFrom(error) ?? String(error)}`,
+			ok: false,
+			retriable: true
+		};
+	}
 	try {
 		return {
 			ok: true,
-			value: parse(schema, toolResults[0].result)
+			value: parse(schema, value)
 		};
 	} catch (error) {
 		return {

package/dist/sury-BoOvxlMw-BIcL68MH.mjs

@@ -0,0 +1,8 @@
+import { r as tryImport } from "./index-DoHiaFQM-CRsQPut_.mjs";
+//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_fc4c9b616e7b9dad1be842cce987659a/node_modules/xsschema/dist/sury-BoOvxlMw.js
+const getToJsonSchemaFn = async () => {
+	const { toJSONSchema } = await tryImport(import("./S-0EivakUR.mjs"), "sury");
+	return (schema) => toJSONSchema(schema);
+};
+//#endregion
+export { getToJsonSchemaFn };

package/dist/valibot-_ibN3zSD-DRGYRzRP.mjs

@@ -0,0 +1,8 @@
+import { r as tryImport } from "./index-DoHiaFQM-CRsQPut_.mjs";
+//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_fc4c9b616e7b9dad1be842cce987659a/node_modules/xsschema/dist/valibot-_ibN3zSD.js
+const getToJsonSchemaFn = async () => {
+	const { toJsonSchema } = await tryImport(import("./index.mjs").then((n) => n.t), "@valibot/to-json-schema");
+	return (schema) => toJsonSchema(schema);
+};
+//#endregion
+export { getToJsonSchemaFn };

package/dist/{zod-DjyNjMBF-V31Nndqr.mjs → zod-DjyNjMBF-DsAUxgA4.mjs}

@@ -1,5 +1,5 @@
-import { t as missingDependenciesUrl } from "./index-DoHiaFQM-DimeKT70.mjs";
-//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_2fbd9cf5ae1608dbd5cb0576dee823ee/node_modules/xsschema/dist/zod-DjyNjMBF.js
+import { t as missingDependenciesUrl } from "./index-DoHiaFQM-CRsQPut_.mjs";
+//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.8_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_fc4c9b616e7b9dad1be842cce987659a/node_modules/xsschema/dist/zod-DjyNjMBF.js
 const getToJsonSchemaFn = async () => {
 	let zodV4toJSONSchema = (_schema) => {
 		throw new Error(`xsschema: Missing zod v4 dependencies "zod". see ${missingDependenciesUrl}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alint-js/plugin-js",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -16,9 +16,9 @@
     "@valibot/to-json-schema": "^1.7.1",
     "apeira": "^0.0.7",
     "valibot": "^1.4.2",
-    "@alint-js/plugin": "0.4.0",
-    "@alint-js/tools-fs": "0.4.0",
-    "@alint-js/core": "0.4.0"
+    "@alint-js/core": "0.5.0",
+    "@alint-js/plugin": "0.5.0",
+    "@alint-js/tools-fs": "0.5.0"
   },
   "scripts": {
     "build": "tsdown",

package/dist/effect-Df2gY8Wx-N2a-MVEf.mjs

@@ -1,8 +0,0 @@
-import { r as tryImport } from "./index-DoHiaFQM-DimeKT70.mjs";
-//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_2fbd9cf5ae1608dbd5cb0576dee823ee/node_modules/xsschema/dist/effect-Df2gY8Wx.js
-const getToJsonSchemaFn = async () => {
-	const { JSONSchema } = await tryImport(import("./esm-DxmkD6o9.mjs"), "effect");
-	return (schema) => JSONSchema.make(schema);
-};
-//#endregion
-export { getToJsonSchemaFn };

package/dist/sury-BoOvxlMw-GVAcG3Zv.mjs

@@ -1,8 +0,0 @@
-import { r as tryImport } from "./index-DoHiaFQM-DimeKT70.mjs";
-//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_2fbd9cf5ae1608dbd5cb0576dee823ee/node_modules/xsschema/dist/sury-BoOvxlMw.js
-const getToJsonSchemaFn = async () => {
-	const { toJSONSchema } = await tryImport(import("./S-0EivakUR.mjs"), "sury");
-	return (schema) => toJSONSchema(schema);
-};
-//#endregion
-export { getToJsonSchemaFn };

package/dist/valibot-_ibN3zSD-D92Bs_Da.mjs

@@ -1,8 +0,0 @@
-import { r as tryImport } from "./index-DoHiaFQM-DimeKT70.mjs";
-//#region ../../node_modules/.pnpm/xsschema@0.5.0-beta.7_@valibot+to-json-schema@1.7.1_valibot@1.4.2_typescript@6.0.3___ef_2fbd9cf5ae1608dbd5cb0576dee823ee/node_modules/xsschema/dist/valibot-_ibN3zSD.js
-const getToJsonSchemaFn = async () => {
-	const { toJsonSchema } = await tryImport(import("./index.mjs").then((n) => n.t), "@valibot/to-json-schema");
-	return (schema) => toJsonSchema(schema);
-};
-//#endregion
-export { getToJsonSchemaFn };