better-ship 0.35.0 → 0.36.0

package/dist/tanstack/oxlint.d.ts

@@ -0,0 +1,10 @@
+//#region src/infrastructure/tanstack/oxlint/index.d.ts
+/**
+ * Oxlint plugin for TanStack Form and Query.
+ * Enable the `tanstack/*` rules from `jsPlugins`.
+ * Ported from Suparelay `packages/tanstack-lint`. The rule ids are unchanged.
+ */
+declare const tanstackPlugin: import("@oxlint/plugins").Plugin;
+//#endregion
+export { tanstackPlugin as default };
+//# sourceMappingURL=oxlint.d.ts.map

package/dist/tanstack/oxlint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oxlint.d.ts","names":[],"sources":["../../src/infrastructure/tanstack/oxlint/index.ts"],"mappings":";;;;;;cAaM,0CAAc"}

package/dist/tanstack/oxlint.js

@@ -0,0 +1,256 @@
+import { defineRule, eslintCompatPlugin } from "@oxlint/plugins";
+
+//#region src/infrastructure/tanstack/oxlint/form-options.ts
+const FORM_HOOKS = /* @__PURE__ */ new Set(["useForm", "useAppForm"]);
+const SAFETY = /(?:^|[^\p{L}\p{N}_])SAFETY\s*:\s*\S/u;
+/** The options object of a `useForm({ … })` or `useAppForm({ … })` call. */
+function formOptions(node) {
+	if (node.callee.type !== "Identifier" || !FORM_HOOKS.has(node.callee.name)) return null;
+	const [options] = node.arguments;
+	return options?.type === "ObjectExpression" ? options : null;
+}
+/** A plain `name: value` property of an object literal. */
+function propertyNamed(object, name) {
+	for (const property of object.properties) {
+		if (property.type !== "Property" || property.computed) continue;
+		const key = property.key;
+		if (key.type === "Identifier" && key.name === name) return property;
+		if (key.type === "Literal" && key.value === name) return property;
+	}
+	return null;
+}
+/** A `// SAFETY:` comment directly before the node allows one exception. */
+function hasSafetyComment(sourceCode, node) {
+	return sourceCode.getCommentsBefore(node).some((comment) => SAFETY.test(comment.value));
+}
+/** Every node under `root`. Parent links are not followed. */
+function* descendants(root) {
+	for (const [key, value] of Object.entries(root)) {
+		if (key === "parent") continue;
+		const children = Array.isArray(value) ? value : [value];
+		for (const child of children) if (isAstNode(child)) {
+			yield child;
+			yield* descendants(child);
+		}
+	}
+}
+function isAstNode(value) {
+	return value instanceof Object && "type" in value && "start" in value;
+}
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/form-schema-validators.ts
+const DYNAMIC_SLOTS = /* @__PURE__ */ new Set(["onDynamic", "onDynamicAsync"]);
+/**
+* Require one named schema on `useForm` and `useAppForm`.
+* `validationLogic` must call `revalidateLogic`. The schema sits on `validators.onDynamic`.
+* A `// SAFETY:` comment before the call allows one form.
+*/
+const formSchemaValidatorsRule = defineRule({
+	meta: {
+		type: "problem",
+		docs: { description: "Require `validationLogic: revalidateLogic(…)` and `validators: { onDynamic: Schema }` on every TanStack form." },
+		messages: {
+			logic: "Choose the timing with validationLogic: revalidateLogic({ mode, modeAfterSubmission }).",
+			missing: "Validate the form with one schema: validators: { onDynamic: Schema }.",
+			slot: "Replace {{slot}} with onDynamic; revalidateLogic sets the timing.",
+			inline: "Pass a schema, not a function: validators: { onDynamic: Schema }."
+		}
+	},
+	createOnce(context) {
+		return { CallExpression(node) {
+			const options = formOptions(node);
+			if (options === null || hasSafetyComment(context.sourceCode, node)) return;
+			const logic = propertyNamed(options, "validationLogic");
+			if (logic === null || logic.value.type !== "CallExpression" || logic.value.callee.type !== "Identifier" || logic.value.callee.name !== "revalidateLogic") context.report({
+				node: logic ?? node,
+				messageId: "logic"
+			});
+			const validators = propertyNamed(options, "validators");
+			if (validators === null || validators.value.type !== "ObjectExpression") {
+				context.report({
+					node: validators ?? node,
+					messageId: "missing"
+				});
+				return;
+			}
+			for (const slot of validators.value.properties) {
+				if (slot.type !== "Property" || slot.key.type !== "Identifier") continue;
+				if (!DYNAMIC_SLOTS.has(slot.key.name)) context.report({
+					node: slot,
+					messageId: "slot",
+					data: { slot: slot.key.name }
+				});
+				else if (slot.value.type !== "Identifier" && slot.value.type !== "MemberExpression") context.report({
+					node: slot.value,
+					messageId: "inline"
+				});
+			}
+		} };
+	}
+});
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/form-stable-default-values.ts
+/** A call whose result changes between renders, such as the current time or a random id. */
+function isUnstable(node) {
+	if (node.type === "NewExpression") return node.callee.type === "Identifier" && node.callee.name === "Date";
+	if (node.type !== "CallExpression" || node.callee.type !== "MemberExpression") return false;
+	const { object, property } = node.callee;
+	if (object.type !== "Identifier" || property.type !== "Identifier") return false;
+	return object.name === "Date" && property.name === "now" || object.name === "Math" && property.name === "random" || object.name === "crypto" && property.name === "randomUUID";
+}
+/**
+* Reject a time or random value written inside `defaultValues`.
+* TanStack Form applies a changed default to an untouched form on the next render.
+*/
+const formStableDefaultValuesRule = defineRule({
+	meta: {
+		type: "problem",
+		docs: { description: "Disallow time or random values computed inline in `defaultValues`." },
+		messages: { unstable: "Compute this default once with useState(() => …) or a module constant; an inline value resets the form on render." }
+	},
+	createOnce(context) {
+		return { CallExpression(node) {
+			const options = formOptions(node);
+			const defaults = options === null ? null : propertyNamed(options, "defaultValues");
+			if (defaults === null) return;
+			for (const child of [defaults.value, ...descendants(defaults.value)]) if (isUnstable(child)) context.report({
+				node: child,
+				messageId: "unstable"
+			});
+		} };
+	}
+});
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/no-field-validators.ts
+const FIELD_COMPONENTS = /* @__PURE__ */ new Set(["Field", "AppField"]);
+/** Reject field-level `validators`. The form schema is the only validation source. */
+const noFieldValidatorsRule = defineRule({
+	meta: {
+		type: "problem",
+		docs: { description: "Disallow field-level `validators`; the form schema validates." },
+		messages: { fieldValidators: "Remove validators from the field. Put the rule in the form schema." }
+	},
+	createOnce(context) {
+		return {
+			JSXOpeningElement(node) {
+				if (node.name.type !== "JSXMemberExpression") return;
+				if (!FIELD_COMPONENTS.has(node.name.property.name)) return;
+				for (const attribute of node.attributes) if (attribute.type === "JSXAttribute" && attribute.name.type === "JSXIdentifier" && attribute.name.name === "validators") context.report({
+					node: attribute,
+					messageId: "fieldValidators"
+				});
+			},
+			CallExpression(node) {
+				if (node.callee.type !== "Identifier" || node.callee.name !== "useField") return;
+				const [options] = node.arguments;
+				if (options?.type !== "ObjectExpression") return;
+				const validators = propertyNamed(options, "validators");
+				if (validators !== null) context.report({
+					node: validators,
+					messageId: "fieldValidators"
+				});
+			}
+		};
+	}
+});
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/no-submit-branching.ts
+const BRANCH_OPERATORS = /* @__PURE__ */ new Set([
+	"??",
+	"||",
+	"&&"
+]);
+function isBranch(node) {
+	if (node.type === "IfStatement" || node.type === "ConditionalExpression") return true;
+	return node.type === "LogicalExpression" && BRANCH_OPERATORS.has(node.operator);
+}
+/**
+* Reject a condition inside `onSubmit`.
+* The schema already accepted the values. A `// SAFETY:` comment on `onSubmit` allows one check.
+*/
+const noSubmitBranchingRule = defineRule({
+	meta: {
+		type: "problem",
+		docs: { description: "Disallow conditions in a TanStack form's `onSubmit`." },
+		messages: { branch: "Move this check into the form schema. Use Schema.parse(value) when the submitted type must be narrowed." }
+	},
+	createOnce(context) {
+		return { CallExpression(node) {
+			const options = formOptions(node);
+			const submit = options === null ? null : propertyNamed(options, "onSubmit");
+			if (submit === null || hasSafetyComment(context.sourceCode, submit)) return;
+			for (const child of descendants(submit.value)) if (isBranch(child)) context.report({
+				node: child,
+				messageId: "branch"
+			});
+		} };
+	}
+});
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/query-key-from-factory.ts
+const CACHE_METHODS = /* @__PURE__ */ new Set([
+	"getQueryData",
+	"setQueryData",
+	"getQueryState",
+	"ensureQueryData"
+]);
+/**
+* Reject a query key array written outside a `*-queries.ts` factory.
+* Invalidation then reads the same key the factory stored.
+*/
+const queryKeyFromFactoryRule = defineRule({
+	meta: {
+		type: "problem",
+		docs: { description: "Disallow query key arrays outside `*-queries.ts` factory files." },
+		messages: { literal: "Read this key from the entity's query factory, for example entityQueries.lists() or entityQueries.detail(input).queryKey." }
+	},
+	createOnce(context) {
+		const inFactory = () => context.filename.endsWith("-queries.ts");
+		return {
+			Property(node) {
+				if (inFactory() || node.computed || node.key.type !== "Identifier") return;
+				if (node.key.name === "queryKey" && node.value.type === "ArrayExpression") context.report({
+					node: node.value,
+					messageId: "literal"
+				});
+			},
+			CallExpression(node) {
+				if (inFactory() || node.callee.type !== "MemberExpression") return;
+				const method = node.callee.property;
+				if (method.type !== "Identifier" || !CACHE_METHODS.has(method.name)) return;
+				const [key] = node.arguments;
+				if (key?.type === "ArrayExpression") context.report({
+					node: key,
+					messageId: "literal"
+				});
+			}
+		};
+	}
+});
+
+//#endregion
+//#region src/infrastructure/tanstack/oxlint/index.ts
+/**
+* Oxlint plugin for TanStack Form and Query.
+* Enable the `tanstack/*` rules from `jsPlugins`.
+* Ported from Suparelay `packages/tanstack-lint`. The rule ids are unchanged.
+*/
+const tanstackPlugin = eslintCompatPlugin({
+	meta: { name: "tanstack" },
+	rules: {
+		"form-schema-validators": formSchemaValidatorsRule,
+		"form-stable-default-values": formStableDefaultValuesRule,
+		"no-field-validators": noFieldValidatorsRule,
+		"no-submit-branching": noSubmitBranchingRule,
+		"query-key-from-factory": queryKeyFromFactoryRule
+	}
+});
+
+//#endregion
+export { tanstackPlugin as default };
+//# sourceMappingURL=oxlint.js.map

package/dist/tanstack/oxlint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oxlint.js","names":[],"sources":["../../src/infrastructure/tanstack/oxlint/form-options.ts","../../src/infrastructure/tanstack/oxlint/form-schema-validators.ts","../../src/infrastructure/tanstack/oxlint/form-stable-default-values.ts","../../src/infrastructure/tanstack/oxlint/no-field-validators.ts","../../src/infrastructure/tanstack/oxlint/no-submit-branching.ts","../../src/infrastructure/tanstack/oxlint/query-key-from-factory.ts","../../src/infrastructure/tanstack/oxlint/index.ts"],"sourcesContent":["import type { ESTree, SourceCode } from '@oxlint/plugins'\n\nconst FORM_HOOKS = new Set(['useForm', 'useAppForm'])\nconst SAFETY = /(?:^|[^\\p{L}\\p{N}_])SAFETY\\s*:\\s*\\S/u\n\n/** The options object of a `useForm({ … })` or `useAppForm({ … })` call. */\nexport function formOptions(node: ESTree.CallExpression): ESTree.ObjectExpression | null {\n  if (node.callee.type !== 'Identifier' || !FORM_HOOKS.has(node.callee.name)) return null\n  const [options] = node.arguments\n  return options?.type === 'ObjectExpression' ? options : null\n}\n\n/** A plain `name: value` property of an object literal. */\nexport function propertyNamed(\n  object: ESTree.ObjectExpression,\n  name: string,\n): ESTree.ObjectProperty | null {\n  for (const property of object.properties) {\n    if (property.type !== 'Property' || property.computed) continue\n    const key = property.key\n    if (key.type === 'Identifier' && key.name === name) return property\n    if (key.type === 'Literal' && key.value === name) return property\n  }\n  return null\n}\n\n/** A `// SAFETY:` comment directly before the node allows one exception. */\nexport function hasSafetyComment(sourceCode: SourceCode, node: ESTree.Node): boolean {\n  return sourceCode.getCommentsBefore(node).some((comment) => SAFETY.test(comment.value))\n}\n\n/** Every node under `root`. Parent links are not followed. */\nexport function* descendants(root: ESTree.Node): Generator<ESTree.Node> {\n  for (const [key, value] of Object.entries(root)) {\n    if (key === 'parent') continue\n    const children = Array.isArray(value) ? value : [value]\n    for (const child of children) {\n      if (isAstNode(child)) {\n        yield child\n        yield* descendants(child)\n      }\n    }\n  }\n}\n\ntype AstChild =\n  | { type?: string; start?: number }\n  | string\n  | number\n  | boolean\n  | bigint\n  | symbol\n  | null\n  | undefined\n\nfunction isAstNode(value: AstChild): value is ESTree.Node {\n  return value instanceof Object && 'type' in value && 'start' in value\n}\n","import { defineRule } from '@oxlint/plugins'\n\nimport { formOptions, hasSafetyComment, propertyNamed } from './form-options.ts'\n\nconst DYNAMIC_SLOTS = new Set(['onDynamic', 'onDynamicAsync'])\n\n/**\n * Require one named schema on `useForm` and `useAppForm`.\n * `validationLogic` must call `revalidateLogic`. The schema sits on `validators.onDynamic`.\n * A `// SAFETY:` comment before the call allows one form.\n */\nexport const formSchemaValidatorsRule = defineRule({\n  meta: {\n    type: 'problem',\n    docs: {\n      description:\n        'Require `validationLogic: revalidateLogic(…)` and `validators: { onDynamic: Schema }` on every TanStack form.',\n    },\n    messages: {\n      logic:\n        'Choose the timing with validationLogic: revalidateLogic({ mode, modeAfterSubmission }).',\n      missing: 'Validate the form with one schema: validators: { onDynamic: Schema }.',\n      slot: 'Replace {{slot}} with onDynamic; revalidateLogic sets the timing.',\n      inline: 'Pass a schema, not a function: validators: { onDynamic: Schema }.',\n    },\n  },\n  createOnce(context) {\n    return {\n      CallExpression(node) {\n        const options = formOptions(node)\n        if (options === null || hasSafetyComment(context.sourceCode, node)) return\n        const logic = propertyNamed(options, 'validationLogic')\n        if (\n          logic === null ||\n          logic.value.type !== 'CallExpression' ||\n          logic.value.callee.type !== 'Identifier' ||\n          logic.value.callee.name !== 'revalidateLogic'\n        ) {\n          context.report({ node: logic ?? node, messageId: 'logic' })\n        }\n        const validators = propertyNamed(options, 'validators')\n        if (validators === null || validators.value.type !== 'ObjectExpression') {\n          context.report({ node: validators ?? node, messageId: 'missing' })\n          return\n        }\n        for (const slot of validators.value.properties) {\n          if (slot.type !== 'Property' || slot.key.type !== 'Identifier') continue\n          if (!DYNAMIC_SLOTS.has(slot.key.name)) {\n            context.report({ node: slot, messageId: 'slot', data: { slot: slot.key.name } })\n          } else if (slot.value.type !== 'Identifier' && slot.value.type !== 'MemberExpression') {\n            context.report({ node: slot.value, messageId: 'inline' })\n          }\n        }\n      },\n    }\n  },\n})\n","import { defineRule } from '@oxlint/plugins'\nimport type { ESTree } from '@oxlint/plugins'\n\nimport { descendants, formOptions, propertyNamed } from './form-options.ts'\n\n/** A call whose result changes between renders, such as the current time or a random id. */\nfunction isUnstable(node: ESTree.Node): boolean {\n  if (node.type === 'NewExpression') {\n    return node.callee.type === 'Identifier' && node.callee.name === 'Date'\n  }\n  if (node.type !== 'CallExpression' || node.callee.type !== 'MemberExpression') return false\n  const { object, property } = node.callee\n  if (object.type !== 'Identifier' || property.type !== 'Identifier') return false\n  return (\n    (object.name === 'Date' && property.name === 'now') ||\n    (object.name === 'Math' && property.name === 'random') ||\n    (object.name === 'crypto' && property.name === 'randomUUID')\n  )\n}\n\n/**\n * Reject a time or random value written inside `defaultValues`.\n * TanStack Form applies a changed default to an untouched form on the next render.\n */\nexport const formStableDefaultValuesRule = defineRule({\n  meta: {\n    type: 'problem',\n    docs: { description: 'Disallow time or random values computed inline in `defaultValues`.' },\n    messages: {\n      unstable:\n        'Compute this default once with useState(() => …) or a module constant; an inline value resets the form on render.',\n    },\n  },\n  createOnce(context) {\n    return {\n      CallExpression(node) {\n        const options = formOptions(node)\n        const defaults = options === null ? null : propertyNamed(options, 'defaultValues')\n        if (defaults === null) return\n        for (const child of [defaults.value, ...descendants(defaults.value)]) {\n          if (isUnstable(child)) context.report({ node: child, messageId: 'unstable' })\n        }\n      },\n    }\n  },\n})\n","import { defineRule } from '@oxlint/plugins'\n\nimport { propertyNamed } from './form-options.ts'\n\nconst FIELD_COMPONENTS = new Set(['Field', 'AppField'])\n\n/** Reject field-level `validators`. The form schema is the only validation source. */\nexport const noFieldValidatorsRule = defineRule({\n  meta: {\n    type: 'problem',\n    docs: { description: 'Disallow field-level `validators`; the form schema validates.' },\n    messages: {\n      fieldValidators: 'Remove validators from the field. Put the rule in the form schema.',\n    },\n  },\n  createOnce(context) {\n    return {\n      JSXOpeningElement(node) {\n        if (node.name.type !== 'JSXMemberExpression') return\n        if (!FIELD_COMPONENTS.has(node.name.property.name)) return\n        for (const attribute of node.attributes) {\n          if (\n            attribute.type === 'JSXAttribute' &&\n            attribute.name.type === 'JSXIdentifier' &&\n            attribute.name.name === 'validators'\n          ) {\n            context.report({ node: attribute, messageId: 'fieldValidators' })\n          }\n        }\n      },\n      CallExpression(node) {\n        if (node.callee.type !== 'Identifier' || node.callee.name !== 'useField') return\n        const [options] = node.arguments\n        if (options?.type !== 'ObjectExpression') return\n        const validators = propertyNamed(options, 'validators')\n        if (validators !== null) context.report({ node: validators, messageId: 'fieldValidators' })\n      },\n    }\n  },\n})\n","import { defineRule } from '@oxlint/plugins'\nimport type { ESTree } from '@oxlint/plugins'\n\nimport { descendants, formOptions, hasSafetyComment, propertyNamed } from './form-options.ts'\n\nconst BRANCH_OPERATORS = new Set(['??', '||', '&&'])\n\nfunction isBranch(node: ESTree.Node): boolean {\n  if (node.type === 'IfStatement' || node.type === 'ConditionalExpression') return true\n  return node.type === 'LogicalExpression' && BRANCH_OPERATORS.has(node.operator)\n}\n\n/**\n * Reject a condition inside `onSubmit`.\n * The schema already accepted the values. A `// SAFETY:` comment on `onSubmit` allows one check.\n */\nexport const noSubmitBranchingRule = defineRule({\n  meta: {\n    type: 'problem',\n    docs: { description: \"Disallow conditions in a TanStack form's `onSubmit`.\" },\n    messages: {\n      branch:\n        'Move this check into the form schema. Use Schema.parse(value) when the submitted type must be narrowed.',\n    },\n  },\n  createOnce(context) {\n    return {\n      CallExpression(node) {\n        const options = formOptions(node)\n        const submit = options === null ? null : propertyNamed(options, 'onSubmit')\n        if (submit === null || hasSafetyComment(context.sourceCode, submit)) return\n        for (const child of descendants(submit.value)) {\n          if (isBranch(child)) context.report({ node: child, messageId: 'branch' })\n        }\n      },\n    }\n  },\n})\n","import { defineRule } from '@oxlint/plugins'\n\nconst CACHE_METHODS = new Set(['getQueryData', 'setQueryData', 'getQueryState', 'ensureQueryData'])\n\n/**\n * Reject a query key array written outside a `*-queries.ts` factory.\n * Invalidation then reads the same key the factory stored.\n */\nexport const queryKeyFromFactoryRule = defineRule({\n  meta: {\n    type: 'problem',\n    docs: { description: 'Disallow query key arrays outside `*-queries.ts` factory files.' },\n    messages: {\n      literal:\n        \"Read this key from the entity's query factory, for example entityQueries.lists() or entityQueries.detail(input).queryKey.\",\n    },\n  },\n  createOnce(context) {\n    const inFactory = () => context.filename.endsWith('-queries.ts')\n    return {\n      Property(node) {\n        if (inFactory() || node.computed || node.key.type !== 'Identifier') return\n        if (node.key.name === 'queryKey' && node.value.type === 'ArrayExpression') {\n          context.report({ node: node.value, messageId: 'literal' })\n        }\n      },\n      CallExpression(node) {\n        if (inFactory() || node.callee.type !== 'MemberExpression') return\n        const method = node.callee.property\n        if (method.type !== 'Identifier' || !CACHE_METHODS.has(method.name)) return\n        const [key] = node.arguments\n        if (key?.type === 'ArrayExpression') context.report({ node: key, messageId: 'literal' })\n      },\n    }\n  },\n})\n","import { eslintCompatPlugin } from '@oxlint/plugins'\n\nimport { formSchemaValidatorsRule } from './form-schema-validators.ts'\nimport { formStableDefaultValuesRule } from './form-stable-default-values.ts'\nimport { noFieldValidatorsRule } from './no-field-validators.ts'\nimport { noSubmitBranchingRule } from './no-submit-branching.ts'\nimport { queryKeyFromFactoryRule } from './query-key-from-factory.ts'\n\n/**\n * Oxlint plugin for TanStack Form and Query.\n * Enable the `tanstack/*` rules from `jsPlugins`.\n * Ported from Suparelay `packages/tanstack-lint`. The rule ids are unchanged.\n */\nconst tanstackPlugin = eslintCompatPlugin({\n  meta: { name: 'tanstack' },\n  rules: {\n    'form-schema-validators': formSchemaValidatorsRule,\n    'form-stable-default-values': formStableDefaultValuesRule,\n    'no-field-validators': noFieldValidatorsRule,\n    'no-submit-branching': noSubmitBranchingRule,\n    'query-key-from-factory': queryKeyFromFactoryRule,\n  },\n})\n\nexport default tanstackPlugin\n"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "better-ship",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "Foundation for applications on Cloudflare Workers: logger, errors, message bus, infrastructure adapters, and UI primitives",
   "license": "Apache-2.0",
   "repository": {
@@ -64,6 +64,7 @@
     "./stripe/payment-webhook": "./dist/stripe/payment-webhook.js",
     "./stripe/request": "./dist/stripe/request.js",
     "./tanstack": "./dist/tanstack.js",
+    "./tanstack/oxlint": "./dist/tanstack/oxlint.js",
     "./tanstack/server": "./dist/tanstack/server.js",
     "./testing/outbox-repository": "./dist/testing/outbox-repository.js",
     "./testing/payment-service": "./dist/testing/payment-service.js",
@@ -87,9 +88,11 @@
     "@mdn/browser-compat-data": "^8.1.4",
     "@oxlint/plugins": "^1.86.0",
     "@posthog/react": "^1.11.3",
-    "@sentry/cloudflare": "^11.2.0",
-    "@sentry/tanstackstart-react": "^11.2.0",
+    "@sentry/cloudflare": "^11.6.0",
+    "@sentry/tanstackstart-react": "^11.6.0",
     "@tailwindcss/node": "^4.3.3",
+    "@tanstack/react-form": "^1.33.5",
+    "@tanstack/react-query": "^5.104.1",
     "@tanstack/react-router": "^1.170.41",
     "@tanstack/react-start": "^1.168.60",
     "@tanstack/start-client-core": "^1.170.34",
@@ -121,8 +124,8 @@
     "@mdn/browser-compat-data": "^8.1.4",
     "@oxlint/plugins": "^1.86.0",
     "@posthog/react": "^1.11.3",
-    "@sentry/cloudflare": "^11.2.0",
-    "@sentry/tanstackstart-react": "^11.2.0",
+    "@sentry/cloudflare": "^11.6.0",
+    "@sentry/tanstackstart-react": "^11.6.0",
     "@tanstack/react-router": "^1.170.41",
     "@tanstack/react-start": "^1.168.60",
     "better-auth": "^1.7.7",

package/src/infrastructure/tanstack/oxlint/form-options.ts

@@ -0,0 +1,58 @@
+import type { ESTree, SourceCode } from '@oxlint/plugins'
+
+const FORM_HOOKS = new Set(['useForm', 'useAppForm'])
+const SAFETY = /(?:^|[^\p{L}\p{N}_])SAFETY\s*:\s*\S/u
+
+/** The options object of a `useForm({ … })` or `useAppForm({ … })` call. */
+export function formOptions(node: ESTree.CallExpression): ESTree.ObjectExpression | null {
+  if (node.callee.type !== 'Identifier' || !FORM_HOOKS.has(node.callee.name)) return null
+  const [options] = node.arguments
+  return options?.type === 'ObjectExpression' ? options : null
+}
+
+/** A plain `name: value` property of an object literal. */
+export function propertyNamed(
+  object: ESTree.ObjectExpression,
+  name: string,
+): ESTree.ObjectProperty | null {
+  for (const property of object.properties) {
+    if (property.type !== 'Property' || property.computed) continue
+    const key = property.key
+    if (key.type === 'Identifier' && key.name === name) return property
+    if (key.type === 'Literal' && key.value === name) return property
+  }
+  return null
+}
+
+/** A `// SAFETY:` comment directly before the node allows one exception. */
+export function hasSafetyComment(sourceCode: SourceCode, node: ESTree.Node): boolean {
+  return sourceCode.getCommentsBefore(node).some((comment) => SAFETY.test(comment.value))
+}
+
+/** Every node under `root`. Parent links are not followed. */
+export function* descendants(root: ESTree.Node): Generator<ESTree.Node> {
+  for (const [key, value] of Object.entries(root)) {
+    if (key === 'parent') continue
+    const children = Array.isArray(value) ? value : [value]
+    for (const child of children) {
+      if (isAstNode(child)) {
+        yield child
+        yield* descendants(child)
+      }
+    }
+  }
+}
+
+type AstChild =
+  | { type?: string; start?: number }
+  | string
+  | number
+  | boolean
+  | bigint
+  | symbol
+  | null
+  | undefined
+
+function isAstNode(value: AstChild): value is ESTree.Node {
+  return value instanceof Object && 'type' in value && 'start' in value
+}

package/src/infrastructure/tanstack/oxlint/form-schema-validators.ts

@@ -0,0 +1,57 @@
+import { defineRule } from '@oxlint/plugins'
+
+import { formOptions, hasSafetyComment, propertyNamed } from './form-options.ts'
+
+const DYNAMIC_SLOTS = new Set(['onDynamic', 'onDynamicAsync'])
+
+/**
+ * Require one named schema on `useForm` and `useAppForm`.
+ * `validationLogic` must call `revalidateLogic`. The schema sits on `validators.onDynamic`.
+ * A `// SAFETY:` comment before the call allows one form.
+ */
+export const formSchemaValidatorsRule = defineRule({
+  meta: {
+    type: 'problem',
+    docs: {
+      description:
+        'Require `validationLogic: revalidateLogic(…)` and `validators: { onDynamic: Schema }` on every TanStack form.',
+    },
+    messages: {
+      logic:
+        'Choose the timing with validationLogic: revalidateLogic({ mode, modeAfterSubmission }).',
+      missing: 'Validate the form with one schema: validators: { onDynamic: Schema }.',
+      slot: 'Replace {{slot}} with onDynamic; revalidateLogic sets the timing.',
+      inline: 'Pass a schema, not a function: validators: { onDynamic: Schema }.',
+    },
+  },
+  createOnce(context) {
+    return {
+      CallExpression(node) {
+        const options = formOptions(node)
+        if (options === null || hasSafetyComment(context.sourceCode, node)) return
+        const logic = propertyNamed(options, 'validationLogic')
+        if (
+          logic === null ||
+          logic.value.type !== 'CallExpression' ||
+          logic.value.callee.type !== 'Identifier' ||
+          logic.value.callee.name !== 'revalidateLogic'
+        ) {
+          context.report({ node: logic ?? node, messageId: 'logic' })
+        }
+        const validators = propertyNamed(options, 'validators')
+        if (validators === null || validators.value.type !== 'ObjectExpression') {
+          context.report({ node: validators ?? node, messageId: 'missing' })
+          return
+        }
+        for (const slot of validators.value.properties) {
+          if (slot.type !== 'Property' || slot.key.type !== 'Identifier') continue
+          if (!DYNAMIC_SLOTS.has(slot.key.name)) {
+            context.report({ node: slot, messageId: 'slot', data: { slot: slot.key.name } })
+          } else if (slot.value.type !== 'Identifier' && slot.value.type !== 'MemberExpression') {
+            context.report({ node: slot.value, messageId: 'inline' })
+          }
+        }
+      },
+    }
+  },
+})

package/src/infrastructure/tanstack/oxlint/form-stable-default-values.ts

@@ -0,0 +1,46 @@
+import { defineRule } from '@oxlint/plugins'
+import type { ESTree } from '@oxlint/plugins'
+
+import { descendants, formOptions, propertyNamed } from './form-options.ts'
+
+/** A call whose result changes between renders, such as the current time or a random id. */
+function isUnstable(node: ESTree.Node): boolean {
+  if (node.type === 'NewExpression') {
+    return node.callee.type === 'Identifier' && node.callee.name === 'Date'
+  }
+  if (node.type !== 'CallExpression' || node.callee.type !== 'MemberExpression') return false
+  const { object, property } = node.callee
+  if (object.type !== 'Identifier' || property.type !== 'Identifier') return false
+  return (
+    (object.name === 'Date' && property.name === 'now') ||
+    (object.name === 'Math' && property.name === 'random') ||
+    (object.name === 'crypto' && property.name === 'randomUUID')
+  )
+}
+
+/**
+ * Reject a time or random value written inside `defaultValues`.
+ * TanStack Form applies a changed default to an untouched form on the next render.
+ */
+export const formStableDefaultValuesRule = defineRule({
+  meta: {
+    type: 'problem',
+    docs: { description: 'Disallow time or random values computed inline in `defaultValues`.' },
+    messages: {
+      unstable:
+        'Compute this default once with useState(() => …) or a module constant; an inline value resets the form on render.',
+    },
+  },
+  createOnce(context) {
+    return {
+      CallExpression(node) {
+        const options = formOptions(node)
+        const defaults = options === null ? null : propertyNamed(options, 'defaultValues')
+        if (defaults === null) return
+        for (const child of [defaults.value, ...descendants(defaults.value)]) {
+          if (isUnstable(child)) context.report({ node: child, messageId: 'unstable' })
+        }
+      },
+    }
+  },
+})

package/src/infrastructure/tanstack/oxlint/index.ts

@@ -0,0 +1,25 @@
+import { eslintCompatPlugin } from '@oxlint/plugins'
+
+import { formSchemaValidatorsRule } from './form-schema-validators.ts'
+import { formStableDefaultValuesRule } from './form-stable-default-values.ts'
+import { noFieldValidatorsRule } from './no-field-validators.ts'
+import { noSubmitBranchingRule } from './no-submit-branching.ts'
+import { queryKeyFromFactoryRule } from './query-key-from-factory.ts'
+
+/**
+ * Oxlint plugin for TanStack Form and Query.
+ * Enable the `tanstack/*` rules from `jsPlugins`.
+ * Ported from Suparelay `packages/tanstack-lint`. The rule ids are unchanged.
+ */
+const tanstackPlugin = eslintCompatPlugin({
+  meta: { name: 'tanstack' },
+  rules: {
+    'form-schema-validators': formSchemaValidatorsRule,
+    'form-stable-default-values': formStableDefaultValuesRule,
+    'no-field-validators': noFieldValidatorsRule,
+    'no-submit-branching': noSubmitBranchingRule,
+    'query-key-from-factory': queryKeyFromFactoryRule,
+  },
+})
+
+export default tanstackPlugin

package/src/infrastructure/tanstack/oxlint/no-field-validators.ts

@@ -0,0 +1,40 @@
+import { defineRule } from '@oxlint/plugins'
+
+import { propertyNamed } from './form-options.ts'
+
+const FIELD_COMPONENTS = new Set(['Field', 'AppField'])
+
+/** Reject field-level `validators`. The form schema is the only validation source. */
+export const noFieldValidatorsRule = defineRule({
+  meta: {
+    type: 'problem',
+    docs: { description: 'Disallow field-level `validators`; the form schema validates.' },
+    messages: {
+      fieldValidators: 'Remove validators from the field. Put the rule in the form schema.',
+    },
+  },
+  createOnce(context) {
+    return {
+      JSXOpeningElement(node) {
+        if (node.name.type !== 'JSXMemberExpression') return
+        if (!FIELD_COMPONENTS.has(node.name.property.name)) return
+        for (const attribute of node.attributes) {
+          if (
+            attribute.type === 'JSXAttribute' &&
+            attribute.name.type === 'JSXIdentifier' &&
+            attribute.name.name === 'validators'
+          ) {
+            context.report({ node: attribute, messageId: 'fieldValidators' })
+          }
+        }
+      },
+      CallExpression(node) {
+        if (node.callee.type !== 'Identifier' || node.callee.name !== 'useField') return
+        const [options] = node.arguments
+        if (options?.type !== 'ObjectExpression') return
+        const validators = propertyNamed(options, 'validators')
+        if (validators !== null) context.report({ node: validators, messageId: 'fieldValidators' })
+      },
+    }
+  },
+})

package/src/infrastructure/tanstack/oxlint/no-submit-branching.ts

@@ -0,0 +1,38 @@
+import { defineRule } from '@oxlint/plugins'
+import type { ESTree } from '@oxlint/plugins'
+
+import { descendants, formOptions, hasSafetyComment, propertyNamed } from './form-options.ts'
+
+const BRANCH_OPERATORS = new Set(['??', '||', '&&'])
+
+function isBranch(node: ESTree.Node): boolean {
+  if (node.type === 'IfStatement' || node.type === 'ConditionalExpression') return true
+  return node.type === 'LogicalExpression' && BRANCH_OPERATORS.has(node.operator)
+}
+
+/**
+ * Reject a condition inside `onSubmit`.
+ * The schema already accepted the values. A `// SAFETY:` comment on `onSubmit` allows one check.
+ */
+export const noSubmitBranchingRule = defineRule({
+  meta: {
+    type: 'problem',
+    docs: { description: "Disallow conditions in a TanStack form's `onSubmit`." },
+    messages: {
+      branch:
+        'Move this check into the form schema. Use Schema.parse(value) when the submitted type must be narrowed.',
+    },
+  },
+  createOnce(context) {
+    return {
+      CallExpression(node) {
+        const options = formOptions(node)
+        const submit = options === null ? null : propertyNamed(options, 'onSubmit')
+        if (submit === null || hasSafetyComment(context.sourceCode, submit)) return
+        for (const child of descendants(submit.value)) {
+          if (isBranch(child)) context.report({ node: child, messageId: 'branch' })
+        }
+      },
+    }
+  },
+})

package/src/infrastructure/tanstack/oxlint/query-key-from-factory.ts

@@ -0,0 +1,36 @@
+import { defineRule } from '@oxlint/plugins'
+
+const CACHE_METHODS = new Set(['getQueryData', 'setQueryData', 'getQueryState', 'ensureQueryData'])
+
+/**
+ * Reject a query key array written outside a `*-queries.ts` factory.
+ * Invalidation then reads the same key the factory stored.
+ */
+export const queryKeyFromFactoryRule = defineRule({
+  meta: {
+    type: 'problem',
+    docs: { description: 'Disallow query key arrays outside `*-queries.ts` factory files.' },
+    messages: {
+      literal:
+        "Read this key from the entity's query factory, for example entityQueries.lists() or entityQueries.detail(input).queryKey.",
+    },
+  },
+  createOnce(context) {
+    const inFactory = () => context.filename.endsWith('-queries.ts')
+    return {
+      Property(node) {
+        if (inFactory() || node.computed || node.key.type !== 'Identifier') return
+        if (node.key.name === 'queryKey' && node.value.type === 'ArrayExpression') {
+          context.report({ node: node.value, messageId: 'literal' })
+        }
+      },
+      CallExpression(node) {
+        if (inFactory() || node.callee.type !== 'MemberExpression') return
+        const method = node.callee.property
+        if (method.type !== 'Identifier' || !CACHE_METHODS.has(method.name)) return
+        const [key] = node.arguments
+        if (key?.type === 'ArrayExpression') context.report({ node: key, messageId: 'literal' })
+      },
+    }
+  },
+})