@tanstack/eslint-plugin-router 1.66.1 → 1.70.0

package/dist/cjs/rules/create-route-property-order/constants.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const createRoutePropertyOrder_utils = require("./create-route-property-order.utils.cjs");
 const createRouteFunctionsIndirect = [
   "createFileRoute",
   "createRootRouteWithContext"
@@ -13,11 +14,17 @@ const createRouteFunctions = [
   ...createRouteFunctionsIndirect
 ];
 const sortRules = [
-  [["params", "validateSearch"], ["loaderDeps"]],
+  [["params", "validateSearch"], ["search"]],
+  [["search"], ["loaderDeps"]],
   [["loaderDeps"], ["context"]],
   [["context"], ["beforeLoad"]],
-  [["beforeLoad"], ["loader"]]
+  [["beforeLoad"], ["loader"]],
+  [
+    ["loader"],
+    ["onEnter", "onStay", "onLeave", "meta", "links", "scripts", "headers"]
+  ]
 ];
+createRoutePropertyOrder_utils.getCheckedProperties(sortRules);
 exports.createRouteFunctions = createRouteFunctions;
 exports.createRouteFunctionsDirect = createRouteFunctionsDirect;
 exports.createRouteFunctionsIndirect = createRouteFunctionsIndirect;

package/dist/cjs/rules/create-route-property-order/constants.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"constants.cjs","sources":["../../../../src/rules/create-route-property-order/constants.ts"],"sourcesContent":["export const createRouteFunctionsIndirect = [\n  'createFileRoute',\n  'createRootRouteWithContext',\n] as const\nexport const createRouteFunctionsDirect = [\n  'createRootRoute',\n  'createRoute',\n] as const\n\nexport const createRouteFunctions = [\n  ...createRouteFunctionsDirect,\n  ...createRouteFunctionsIndirect,\n] as const\n\nexport type CreateRouteFunction = (typeof createRouteFunctions)[number]\n\nexport const checkedProperties = [\n  'params',\n  'validateSearch',\n  'loaderDeps',\n  'context',\n  'beforeLoad',\n  'loader',\n] as const\n\nexport const sortRules = [\n  [['params', 'validateSearch'], ['loaderDeps']],\n  [['loaderDeps'], ['context']],\n  [['context'], ['beforeLoad']],\n  [['beforeLoad'], ['loader']],\n] as const\n"],"names":[],"mappings":";;AAAO,MAAM,+BAA+B;AAAA,EAC1C;AAAA,EACA;AACF;AACO,MAAM,6BAA6B;AAAA,EACxC;AAAA,EACA;AACF;AAEO,MAAM,uBAAuB;AAAA,EAClC,GAAG;AAAA,EACH,GAAG;AACL;AAaO,MAAM,YAAY;AAAA,EACvB,CAAC,CAAC,UAAU,gBAAgB,GAAG,CAAC,YAAY,CAAC;AAAA,EAC7C,CAAC,CAAC,YAAY,GAAG,CAAC,SAAS,CAAC;AAAA,EAC5B,CAAC,CAAC,SAAS,GAAG,CAAC,YAAY,CAAC;AAAA,EAC5B,CAAC,CAAC,YAAY,GAAG,CAAC,QAAQ,CAAC;AAC7B;;;;;"}
+{"version":3,"file":"constants.cjs","sources":["../../../../src/rules/create-route-property-order/constants.ts"],"sourcesContent":["import { getCheckedProperties } from './create-route-property-order.utils'\n\nexport const createRouteFunctionsIndirect = [\n  'createFileRoute',\n  'createRootRouteWithContext',\n] as const\nexport const createRouteFunctionsDirect = [\n  'createRootRoute',\n  'createRoute',\n] as const\n\nexport const createRouteFunctions = [\n  ...createRouteFunctionsDirect,\n  ...createRouteFunctionsIndirect,\n] as const\n\nexport type CreateRouteFunction = (typeof createRouteFunctions)[number]\n\nexport const sortRules = [\n  [['params', 'validateSearch'], ['search']],\n  [['search'], ['loaderDeps']],\n  [['loaderDeps'], ['context']],\n  [['context'], ['beforeLoad']],\n  [['beforeLoad'], ['loader']],\n  [\n    ['loader'],\n    ['onEnter', 'onStay', 'onLeave', 'meta', 'links', 'scripts', 'headers'],\n  ],\n] as const\n\nexport type CheckedProperties = (typeof sortRules)[number][number][number]\nexport const checkedProperties = getCheckedProperties(sortRules)\n"],"names":["getCheckedProperties"],"mappings":";;;AAEO,MAAM,+BAA+B;AAAA,EAC1C;AAAA,EACA;AACF;AACO,MAAM,6BAA6B;AAAA,EACxC;AAAA,EACA;AACF;AAEO,MAAM,uBAAuB;AAAA,EAClC,GAAG;AAAA,EACH,GAAG;AACL;AAIO,MAAM,YAAY;AAAA,EACvB,CAAC,CAAC,UAAU,gBAAgB,GAAG,CAAC,QAAQ,CAAC;AAAA,EACzC,CAAC,CAAC,QAAQ,GAAG,CAAC,YAAY,CAAC;AAAA,EAC3B,CAAC,CAAC,YAAY,GAAG,CAAC,SAAS,CAAC;AAAA,EAC5B,CAAC,CAAC,SAAS,GAAG,CAAC,YAAY,CAAC;AAAA,EAC5B,CAAC,CAAC,YAAY,GAAG,CAAC,QAAQ,CAAC;AAAA,EAC3B;AAAA,IACE,CAAC,QAAQ;AAAA,IACT,CAAC,WAAW,UAAU,WAAW,QAAQ,SAAS,WAAW,SAAS;AAAA,EACxE;AACF;AAGiCA,+BAAAA,qBAAqB,SAAS;;;;;"}

package/dist/cjs/rules/create-route-property-order/constants.d.cts

@@ -2,5 +2,6 @@ export declare const createRouteFunctionsIndirect: readonly ["createFileRoute",
 export declare const createRouteFunctionsDirect: readonly ["createRootRoute", "createRoute"];
 export declare const createRouteFunctions: readonly ["createRootRoute", "createRoute", "createFileRoute", "createRootRouteWithContext"];
 export type CreateRouteFunction = (typeof createRouteFunctions)[number];
-export declare const checkedProperties: readonly ["params", "validateSearch", "loaderDeps", "context", "beforeLoad", "loader"];
-export declare const sortRules: readonly [readonly [readonly ["params", "validateSearch"], readonly ["loaderDeps"]], readonly [readonly ["loaderDeps"], readonly ["context"]], readonly [readonly ["context"], readonly ["beforeLoad"]], readonly [readonly ["beforeLoad"], readonly ["loader"]]];
+export declare const sortRules: readonly [readonly [readonly ["params", "validateSearch"], readonly ["search"]], readonly [readonly ["search"], readonly ["loaderDeps"]], readonly [readonly ["loaderDeps"], readonly ["context"]], readonly [readonly ["context"], readonly ["beforeLoad"]], readonly [readonly ["beforeLoad"], readonly ["loader"]], readonly [readonly ["loader"], readonly ["onEnter", "onStay", "onLeave", "meta", "links", "scripts", "headers"]]];
+export type CheckedProperties = (typeof sortRules)[number][number][number];
+export declare const checkedProperties: readonly ("meta" | "search" | "params" | "validateSearch" | "loaderDeps" | "context" | "beforeLoad" | "loader" | "onEnter" | "onStay" | "onLeave" | "links" | "scripts" | "headers")[];

package/dist/cjs/rules/create-route-property-order/create-route-property-order.utils.cjs

@@ -43,5 +43,9 @@ function sortDataByOrder(data, orderRules, key) {
   }
   return result;
 }
+function getCheckedProperties(orderRules) {
+  return [...new Set(orderRules.flat(2))];
+}
+exports.getCheckedProperties = getCheckedProperties;
 exports.sortDataByOrder = sortDataByOrder;
 //# sourceMappingURL=create-route-property-order.utils.cjs.map

package/dist/cjs/rules/create-route-property-order/create-route-property-order.utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"create-route-property-order.utils.cjs","sources":["../../../../src/rules/create-route-property-order/create-route-property-order.utils.ts"],"sourcesContent":["export function sortDataByOrder<T, TKey extends keyof T>(\n  data: Array<T> | ReadonlyArray<T>,\n  orderRules: ReadonlyArray<\n    Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>\n  >,\n  key: TKey,\n): Array<T> | null {\n  const getSubsetIndex = (\n    item: T[TKey],\n    subsets: ReadonlyArray<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  ): number | null => {\n    for (let i = 0; i < subsets.length; i++) {\n      if (subsets[i]?.includes(item)) {\n        return i\n      }\n    }\n    return null\n  }\n\n  const orderSets = orderRules.reduce(\n    (sets, [A, B]) => [...sets, A, B],\n    [] as Array<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  )\n\n  const inOrderArray = data.filter(\n    (item) => getSubsetIndex(item[key], orderSets) !== null,\n  )\n\n  let wasResorted = false as boolean\n\n  // Sort by the relative order defined by the rules\n  const sortedArray = inOrderArray.sort((a, b) => {\n    const aKey = a[key],\n      bKey = b[key]\n    const aSubsetIndex = getSubsetIndex(aKey, orderSets)\n    const bSubsetIndex = getSubsetIndex(bKey, orderSets)\n\n    // If both items belong to different subsets, sort by their subset order\n    if (\n      aSubsetIndex !== null &&\n      bSubsetIndex !== null &&\n      aSubsetIndex !== bSubsetIndex\n    ) {\n      return aSubsetIndex - bSubsetIndex\n    }\n\n    // If both items belong to the same subset or neither is in the subset, keep their relative order\n    return 0\n  })\n\n  const inOrderIterator = sortedArray.values()\n  const result = data.map((item) => {\n    if (getSubsetIndex(item[key], orderSets) !== null) {\n      const sortedItem = inOrderIterator.next().value!\n      if (sortedItem[key] !== item[key]) {\n        wasResorted = true\n      }\n      return sortedItem\n    }\n    return item\n  })\n\n  if (!wasResorted) {\n    return null\n  }\n  return result\n}\n"],"names":[],"mappings":";;AAAgB,SAAA,gBACd,MACA,YAGA,KACiB;AACX,QAAA,iBAAiB,CACrB,MACA,YACkB;;AAClB,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,WAAI,aAAQ,CAAC,MAAT,mBAAY,SAAS,OAAO;AACvB,eAAA;AAAA,MACT;AAAA,IACF;AACO,WAAA;AAAA,EAAA;AAGT,QAAM,YAAY,WAAW;AAAA,IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAChC,CAAC;AAAA,EAAA;AAGH,QAAM,eAAe,KAAK;AAAA,IACxB,CAAC,SAAS,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM;AAAA,EAAA;AAGrD,MAAI,cAAc;AAGlB,QAAM,cAAc,aAAa,KAAK,CAAC,GAAG,MAAM;AAC9C,UAAM,OAAO,EAAE,GAAG,GAChB,OAAO,EAAE,GAAG;AACR,UAAA,eAAe,eAAe,MAAM,SAAS;AAC7C,UAAA,eAAe,eAAe,MAAM,SAAS;AAGnD,QACE,iBAAiB,QACjB,iBAAiB,QACjB,iBAAiB,cACjB;AACA,aAAO,eAAe;AAAA,IACxB;AAGO,WAAA;AAAA,EAAA,CACR;AAEK,QAAA,kBAAkB,YAAY;AACpC,QAAM,SAAS,KAAK,IAAI,CAAC,SAAS;AAChC,QAAI,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM,MAAM;AAC3C,YAAA,aAAa,gBAAgB,KAAA,EAAO;AAC1C,UAAI,WAAW,GAAG,MAAM,KAAK,GAAG,GAAG;AACnB,sBAAA;AAAA,MAChB;AACO,aAAA;AAAA,IACT;AACO,WAAA;AAAA,EAAA,CACR;AAED,MAAI,CAAC,aAAa;AACT,WAAA;AAAA,EACT;AACO,SAAA;AACT;;"}
+{"version":3,"file":"create-route-property-order.utils.cjs","sources":["../../../../src/rules/create-route-property-order/create-route-property-order.utils.ts"],"sourcesContent":["export function sortDataByOrder<T, TKey extends keyof T>(\n  data: Array<T> | ReadonlyArray<T>,\n  orderRules: ReadonlyArray<\n    Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>\n  >,\n  key: TKey,\n): Array<T> | null {\n  const getSubsetIndex = (\n    item: T[TKey],\n    subsets: ReadonlyArray<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  ): number | null => {\n    for (let i = 0; i < subsets.length; i++) {\n      if (subsets[i]?.includes(item)) {\n        return i\n      }\n    }\n    return null\n  }\n\n  const orderSets = orderRules.reduce(\n    (sets, [A, B]) => [...sets, A, B],\n    [] as Array<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  )\n\n  const inOrderArray = data.filter(\n    (item) => getSubsetIndex(item[key], orderSets) !== null,\n  )\n\n  let wasResorted = false as boolean\n\n  // Sort by the relative order defined by the rules\n  const sortedArray = inOrderArray.sort((a, b) => {\n    const aKey = a[key],\n      bKey = b[key]\n    const aSubsetIndex = getSubsetIndex(aKey, orderSets)\n    const bSubsetIndex = getSubsetIndex(bKey, orderSets)\n\n    // If both items belong to different subsets, sort by their subset order\n    if (\n      aSubsetIndex !== null &&\n      bSubsetIndex !== null &&\n      aSubsetIndex !== bSubsetIndex\n    ) {\n      return aSubsetIndex - bSubsetIndex\n    }\n\n    // If both items belong to the same subset or neither is in the subset, keep their relative order\n    return 0\n  })\n\n  const inOrderIterator = sortedArray.values()\n  const result = data.map((item) => {\n    if (getSubsetIndex(item[key], orderSets) !== null) {\n      const sortedItem = inOrderIterator.next().value!\n      if (sortedItem[key] !== item[key]) {\n        wasResorted = true\n      }\n      return sortedItem\n    }\n    return item\n  })\n\n  if (!wasResorted) {\n    return null\n  }\n  return result\n}\n\nexport function getCheckedProperties<T>(\n  orderRules: ReadonlyArray<ReadonlyArray<ReadonlyArray<T>>>,\n): ReadonlyArray<T> {\n  return [...new Set<T>(orderRules.flat(2))]\n}\n"],"names":[],"mappings":";;AAAgB,SAAA,gBACd,MACA,YAGA,KACiB;AACX,QAAA,iBAAiB,CACrB,MACA,YACkB;;AAClB,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,WAAI,aAAQ,CAAC,MAAT,mBAAY,SAAS,OAAO;AACvB,eAAA;AAAA,MACT;AAAA,IACF;AACO,WAAA;AAAA,EAAA;AAGT,QAAM,YAAY,WAAW;AAAA,IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAChC,CAAC;AAAA,EAAA;AAGH,QAAM,eAAe,KAAK;AAAA,IACxB,CAAC,SAAS,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM;AAAA,EAAA;AAGrD,MAAI,cAAc;AAGlB,QAAM,cAAc,aAAa,KAAK,CAAC,GAAG,MAAM;AAC9C,UAAM,OAAO,EAAE,GAAG,GAChB,OAAO,EAAE,GAAG;AACR,UAAA,eAAe,eAAe,MAAM,SAAS;AAC7C,UAAA,eAAe,eAAe,MAAM,SAAS;AAGnD,QACE,iBAAiB,QACjB,iBAAiB,QACjB,iBAAiB,cACjB;AACA,aAAO,eAAe;AAAA,IACxB;AAGO,WAAA;AAAA,EAAA,CACR;AAEK,QAAA,kBAAkB,YAAY;AACpC,QAAM,SAAS,KAAK,IAAI,CAAC,SAAS;AAChC,QAAI,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM,MAAM;AAC3C,YAAA,aAAa,gBAAgB,KAAA,EAAO;AAC1C,UAAI,WAAW,GAAG,MAAM,KAAK,GAAG,GAAG;AACnB,sBAAA;AAAA,MAChB;AACO,aAAA;AAAA,IACT;AACO,WAAA;AAAA,EAAA,CACR;AAED,MAAI,CAAC,aAAa;AACT,WAAA;AAAA,EACT;AACO,SAAA;AACT;AAEO,SAAS,qBACd,YACkB;AACX,SAAA,CAAC,GAAG,IAAI,IAAO,WAAW,KAAK,CAAC,CAAC,CAAC;AAC3C;;;"}

package/dist/cjs/rules/create-route-property-order/create-route-property-order.utils.d.cts

@@ -1 +1,2 @@
 export declare function sortDataByOrder<T, TKey extends keyof T>(data: Array<T> | ReadonlyArray<T>, orderRules: ReadonlyArray<Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>>, key: TKey): Array<T> | null;
+export declare function getCheckedProperties<T>(orderRules: ReadonlyArray<ReadonlyArray<ReadonlyArray<T>>>): ReadonlyArray<T>;

package/dist/esm/rules/create-route-property-order/constants.d.ts

@@ -2,5 +2,6 @@ export declare const createRouteFunctionsIndirect: readonly ["createFileRoute",
 export declare const createRouteFunctionsDirect: readonly ["createRootRoute", "createRoute"];
 export declare const createRouteFunctions: readonly ["createRootRoute", "createRoute", "createFileRoute", "createRootRouteWithContext"];
 export type CreateRouteFunction = (typeof createRouteFunctions)[number];
-export declare const checkedProperties: readonly ["params", "validateSearch", "loaderDeps", "context", "beforeLoad", "loader"];
-export declare const sortRules: readonly [readonly [readonly ["params", "validateSearch"], readonly ["loaderDeps"]], readonly [readonly ["loaderDeps"], readonly ["context"]], readonly [readonly ["context"], readonly ["beforeLoad"]], readonly [readonly ["beforeLoad"], readonly ["loader"]]];
+export declare const sortRules: readonly [readonly [readonly ["params", "validateSearch"], readonly ["search"]], readonly [readonly ["search"], readonly ["loaderDeps"]], readonly [readonly ["loaderDeps"], readonly ["context"]], readonly [readonly ["context"], readonly ["beforeLoad"]], readonly [readonly ["beforeLoad"], readonly ["loader"]], readonly [readonly ["loader"], readonly ["onEnter", "onStay", "onLeave", "meta", "links", "scripts", "headers"]]];
+export type CheckedProperties = (typeof sortRules)[number][number][number];
+export declare const checkedProperties: readonly ("meta" | "search" | "params" | "validateSearch" | "loaderDeps" | "context" | "beforeLoad" | "loader" | "onEnter" | "onStay" | "onLeave" | "links" | "scripts" | "headers")[];

package/dist/esm/rules/create-route-property-order/constants.js

@@ -1,3 +1,4 @@
+import { getCheckedProperties } from "./create-route-property-order.utils.js";
 const createRouteFunctionsIndirect = [
   "createFileRoute",
   "createRootRouteWithContext"
@@ -11,11 +12,17 @@ const createRouteFunctions = [
   ...createRouteFunctionsIndirect
 ];
 const sortRules = [
-  [["params", "validateSearch"], ["loaderDeps"]],
+  [["params", "validateSearch"], ["search"]],
+  [["search"], ["loaderDeps"]],
   [["loaderDeps"], ["context"]],
   [["context"], ["beforeLoad"]],
-  [["beforeLoad"], ["loader"]]
+  [["beforeLoad"], ["loader"]],
+  [
+    ["loader"],
+    ["onEnter", "onStay", "onLeave", "meta", "links", "scripts", "headers"]
+  ]
 ];
+getCheckedProperties(sortRules);
 export {
   createRouteFunctions,
   createRouteFunctionsDirect,

package/dist/esm/rules/create-route-property-order/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sources":["../../../../src/rules/create-route-property-order/constants.ts"],"sourcesContent":["export const createRouteFunctionsIndirect = [\n  'createFileRoute',\n  'createRootRouteWithContext',\n] as const\nexport const createRouteFunctionsDirect = [\n  'createRootRoute',\n  'createRoute',\n] as const\n\nexport const createRouteFunctions = [\n  ...createRouteFunctionsDirect,\n  ...createRouteFunctionsIndirect,\n] as const\n\nexport type CreateRouteFunction = (typeof createRouteFunctions)[number]\n\nexport const checkedProperties = [\n  'params',\n  'validateSearch',\n  'loaderDeps',\n  'context',\n  'beforeLoad',\n  'loader',\n] as const\n\nexport const sortRules = [\n  [['params', 'validateSearch'], ['loaderDeps']],\n  [['loaderDeps'], ['context']],\n  [['context'], ['beforeLoad']],\n  [['beforeLoad'], ['loader']],\n] as const\n"],"names":[],"mappings":"AAAO,MAAM,+BAA+B;AAAA,EAC1C;AAAA,EACA;AACF;AACO,MAAM,6BAA6B;AAAA,EACxC;AAAA,EACA;AACF;AAEO,MAAM,uBAAuB;AAAA,EAClC,GAAG;AAAA,EACH,GAAG;AACL;AAaO,MAAM,YAAY;AAAA,EACvB,CAAC,CAAC,UAAU,gBAAgB,GAAG,CAAC,YAAY,CAAC;AAAA,EAC7C,CAAC,CAAC,YAAY,GAAG,CAAC,SAAS,CAAC;AAAA,EAC5B,CAAC,CAAC,SAAS,GAAG,CAAC,YAAY,CAAC;AAAA,EAC5B,CAAC,CAAC,YAAY,GAAG,CAAC,QAAQ,CAAC;AAC7B;"}
+{"version":3,"file":"constants.js","sources":["../../../../src/rules/create-route-property-order/constants.ts"],"sourcesContent":["import { getCheckedProperties } from './create-route-property-order.utils'\n\nexport const createRouteFunctionsIndirect = [\n  'createFileRoute',\n  'createRootRouteWithContext',\n] as const\nexport const createRouteFunctionsDirect = [\n  'createRootRoute',\n  'createRoute',\n] as const\n\nexport const createRouteFunctions = [\n  ...createRouteFunctionsDirect,\n  ...createRouteFunctionsIndirect,\n] as const\n\nexport type CreateRouteFunction = (typeof createRouteFunctions)[number]\n\nexport const sortRules = [\n  [['params', 'validateSearch'], ['search']],\n  [['search'], ['loaderDeps']],\n  [['loaderDeps'], ['context']],\n  [['context'], ['beforeLoad']],\n  [['beforeLoad'], ['loader']],\n  [\n    ['loader'],\n    ['onEnter', 'onStay', 'onLeave', 'meta', 'links', 'scripts', 'headers'],\n  ],\n] as const\n\nexport type CheckedProperties = (typeof sortRules)[number][number][number]\nexport const checkedProperties = getCheckedProperties(sortRules)\n"],"names":[],"mappings":";AAEO,MAAM,+BAA+B;AAAA,EAC1C;AAAA,EACA;AACF;AACO,MAAM,6BAA6B;AAAA,EACxC;AAAA,EACA;AACF;AAEO,MAAM,uBAAuB;AAAA,EAClC,GAAG;AAAA,EACH,GAAG;AACL;AAIO,MAAM,YAAY;AAAA,EACvB,CAAC,CAAC,UAAU,gBAAgB,GAAG,CAAC,QAAQ,CAAC;AAAA,EACzC,CAAC,CAAC,QAAQ,GAAG,CAAC,YAAY,CAAC;AAAA,EAC3B,CAAC,CAAC,YAAY,GAAG,CAAC,SAAS,CAAC;AAAA,EAC5B,CAAC,CAAC,SAAS,GAAG,CAAC,YAAY,CAAC;AAAA,EAC5B,CAAC,CAAC,YAAY,GAAG,CAAC,QAAQ,CAAC;AAAA,EAC3B;AAAA,IACE,CAAC,QAAQ;AAAA,IACT,CAAC,WAAW,UAAU,WAAW,QAAQ,SAAS,WAAW,SAAS;AAAA,EACxE;AACF;AAGiC,qBAAqB,SAAS;"}

package/dist/esm/rules/create-route-property-order/create-route-property-order.utils.d.ts

@@ -1 +1,2 @@
 export declare function sortDataByOrder<T, TKey extends keyof T>(data: Array<T> | ReadonlyArray<T>, orderRules: ReadonlyArray<Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>>, key: TKey): Array<T> | null;
+export declare function getCheckedProperties<T>(orderRules: ReadonlyArray<ReadonlyArray<ReadonlyArray<T>>>): ReadonlyArray<T>;

package/dist/esm/rules/create-route-property-order/create-route-property-order.utils.js

@@ -41,7 +41,11 @@ function sortDataByOrder(data, orderRules, key) {
   }
   return result;
 }
+function getCheckedProperties(orderRules) {
+  return [...new Set(orderRules.flat(2))];
+}
 export {
+  getCheckedProperties,
   sortDataByOrder
 };
 //# sourceMappingURL=create-route-property-order.utils.js.map

package/dist/esm/rules/create-route-property-order/create-route-property-order.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-route-property-order.utils.js","sources":["../../../../src/rules/create-route-property-order/create-route-property-order.utils.ts"],"sourcesContent":["export function sortDataByOrder<T, TKey extends keyof T>(\n  data: Array<T> | ReadonlyArray<T>,\n  orderRules: ReadonlyArray<\n    Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>\n  >,\n  key: TKey,\n): Array<T> | null {\n  const getSubsetIndex = (\n    item: T[TKey],\n    subsets: ReadonlyArray<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  ): number | null => {\n    for (let i = 0; i < subsets.length; i++) {\n      if (subsets[i]?.includes(item)) {\n        return i\n      }\n    }\n    return null\n  }\n\n  const orderSets = orderRules.reduce(\n    (sets, [A, B]) => [...sets, A, B],\n    [] as Array<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  )\n\n  const inOrderArray = data.filter(\n    (item) => getSubsetIndex(item[key], orderSets) !== null,\n  )\n\n  let wasResorted = false as boolean\n\n  // Sort by the relative order defined by the rules\n  const sortedArray = inOrderArray.sort((a, b) => {\n    const aKey = a[key],\n      bKey = b[key]\n    const aSubsetIndex = getSubsetIndex(aKey, orderSets)\n    const bSubsetIndex = getSubsetIndex(bKey, orderSets)\n\n    // If both items belong to different subsets, sort by their subset order\n    if (\n      aSubsetIndex !== null &&\n      bSubsetIndex !== null &&\n      aSubsetIndex !== bSubsetIndex\n    ) {\n      return aSubsetIndex - bSubsetIndex\n    }\n\n    // If both items belong to the same subset or neither is in the subset, keep their relative order\n    return 0\n  })\n\n  const inOrderIterator = sortedArray.values()\n  const result = data.map((item) => {\n    if (getSubsetIndex(item[key], orderSets) !== null) {\n      const sortedItem = inOrderIterator.next().value!\n      if (sortedItem[key] !== item[key]) {\n        wasResorted = true\n      }\n      return sortedItem\n    }\n    return item\n  })\n\n  if (!wasResorted) {\n    return null\n  }\n  return result\n}\n"],"names":[],"mappings":"AAAgB,SAAA,gBACd,MACA,YAGA,KACiB;AACX,QAAA,iBAAiB,CACrB,MACA,YACkB;AAVN;AAWZ,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,WAAI,aAAQ,CAAC,MAAT,mBAAY,SAAS,OAAO;AACvB,eAAA;AAAA,MACT;AAAA,IACF;AACO,WAAA;AAAA,EAAA;AAGT,QAAM,YAAY,WAAW;AAAA,IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAChC,CAAC;AAAA,EAAA;AAGH,QAAM,eAAe,KAAK;AAAA,IACxB,CAAC,SAAS,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM;AAAA,EAAA;AAGrD,MAAI,cAAc;AAGlB,QAAM,cAAc,aAAa,KAAK,CAAC,GAAG,MAAM;AAC9C,UAAM,OAAO,EAAE,GAAG,GAChB,OAAO,EAAE,GAAG;AACR,UAAA,eAAe,eAAe,MAAM,SAAS;AAC7C,UAAA,eAAe,eAAe,MAAM,SAAS;AAGnD,QACE,iBAAiB,QACjB,iBAAiB,QACjB,iBAAiB,cACjB;AACA,aAAO,eAAe;AAAA,IACxB;AAGO,WAAA;AAAA,EAAA,CACR;AAEK,QAAA,kBAAkB,YAAY;AACpC,QAAM,SAAS,KAAK,IAAI,CAAC,SAAS;AAChC,QAAI,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM,MAAM;AAC3C,YAAA,aAAa,gBAAgB,KAAA,EAAO;AAC1C,UAAI,WAAW,GAAG,MAAM,KAAK,GAAG,GAAG;AACnB,sBAAA;AAAA,MAChB;AACO,aAAA;AAAA,IACT;AACO,WAAA;AAAA,EAAA,CACR;AAED,MAAI,CAAC,aAAa;AACT,WAAA;AAAA,EACT;AACO,SAAA;AACT;"}
+{"version":3,"file":"create-route-property-order.utils.js","sources":["../../../../src/rules/create-route-property-order/create-route-property-order.utils.ts"],"sourcesContent":["export function sortDataByOrder<T, TKey extends keyof T>(\n  data: Array<T> | ReadonlyArray<T>,\n  orderRules: ReadonlyArray<\n    Readonly<[ReadonlyArray<T[TKey]>, ReadonlyArray<T[TKey]>]>\n  >,\n  key: TKey,\n): Array<T> | null {\n  const getSubsetIndex = (\n    item: T[TKey],\n    subsets: ReadonlyArray<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  ): number | null => {\n    for (let i = 0; i < subsets.length; i++) {\n      if (subsets[i]?.includes(item)) {\n        return i\n      }\n    }\n    return null\n  }\n\n  const orderSets = orderRules.reduce(\n    (sets, [A, B]) => [...sets, A, B],\n    [] as Array<ReadonlyArray<T[TKey]> | Array<T[TKey]>>,\n  )\n\n  const inOrderArray = data.filter(\n    (item) => getSubsetIndex(item[key], orderSets) !== null,\n  )\n\n  let wasResorted = false as boolean\n\n  // Sort by the relative order defined by the rules\n  const sortedArray = inOrderArray.sort((a, b) => {\n    const aKey = a[key],\n      bKey = b[key]\n    const aSubsetIndex = getSubsetIndex(aKey, orderSets)\n    const bSubsetIndex = getSubsetIndex(bKey, orderSets)\n\n    // If both items belong to different subsets, sort by their subset order\n    if (\n      aSubsetIndex !== null &&\n      bSubsetIndex !== null &&\n      aSubsetIndex !== bSubsetIndex\n    ) {\n      return aSubsetIndex - bSubsetIndex\n    }\n\n    // If both items belong to the same subset or neither is in the subset, keep their relative order\n    return 0\n  })\n\n  const inOrderIterator = sortedArray.values()\n  const result = data.map((item) => {\n    if (getSubsetIndex(item[key], orderSets) !== null) {\n      const sortedItem = inOrderIterator.next().value!\n      if (sortedItem[key] !== item[key]) {\n        wasResorted = true\n      }\n      return sortedItem\n    }\n    return item\n  })\n\n  if (!wasResorted) {\n    return null\n  }\n  return result\n}\n\nexport function getCheckedProperties<T>(\n  orderRules: ReadonlyArray<ReadonlyArray<ReadonlyArray<T>>>,\n): ReadonlyArray<T> {\n  return [...new Set<T>(orderRules.flat(2))]\n}\n"],"names":[],"mappings":"AAAgB,SAAA,gBACd,MACA,YAGA,KACiB;AACX,QAAA,iBAAiB,CACrB,MACA,YACkB;AAVN;AAWZ,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,WAAI,aAAQ,CAAC,MAAT,mBAAY,SAAS,OAAO;AACvB,eAAA;AAAA,MACT;AAAA,IACF;AACO,WAAA;AAAA,EAAA;AAGT,QAAM,YAAY,WAAW;AAAA,IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAChC,CAAC;AAAA,EAAA;AAGH,QAAM,eAAe,KAAK;AAAA,IACxB,CAAC,SAAS,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM;AAAA,EAAA;AAGrD,MAAI,cAAc;AAGlB,QAAM,cAAc,aAAa,KAAK,CAAC,GAAG,MAAM;AAC9C,UAAM,OAAO,EAAE,GAAG,GAChB,OAAO,EAAE,GAAG;AACR,UAAA,eAAe,eAAe,MAAM,SAAS;AAC7C,UAAA,eAAe,eAAe,MAAM,SAAS;AAGnD,QACE,iBAAiB,QACjB,iBAAiB,QACjB,iBAAiB,cACjB;AACA,aAAO,eAAe;AAAA,IACxB;AAGO,WAAA;AAAA,EAAA,CACR;AAEK,QAAA,kBAAkB,YAAY;AACpC,QAAM,SAAS,KAAK,IAAI,CAAC,SAAS;AAChC,QAAI,eAAe,KAAK,GAAG,GAAG,SAAS,MAAM,MAAM;AAC3C,YAAA,aAAa,gBAAgB,KAAA,EAAO;AAC1C,UAAI,WAAW,GAAG,MAAM,KAAK,GAAG,GAAG;AACnB,sBAAA;AAAA,MAChB;AACO,aAAA;AAAA,IACT;AACO,WAAA;AAAA,EAAA,CACR;AAED,MAAI,CAAC,aAAa;AACT,WAAA;AAAA,EACT;AACO,SAAA;AACT;AAEO,SAAS,qBACd,YACkB;AACX,SAAA,CAAC,GAAG,IAAI,IAAO,WAAW,KAAK,CAAC,CAAC,CAAC;AAC3C;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/eslint-plugin-router",
-  "version": "1.66.1",
+  "version": "1.70.0",
   "description": "ESLint plugin for TanStack Router",
   "author": "Manuel Schiller",
   "license": "MIT",

package/src/__tests__/create-route-property-order.rule.test.ts

@@ -21,10 +21,10 @@ const ruleTester = new RuleTester()
 
 // reduce the number of test cases by only testing a subset of the checked properties
 const testedCheckedProperties = [
-  checkedProperties[0],
-  checkedProperties[1],
-  checkedProperties[2],
-  checkedProperties[3],
+  checkedProperties[0]!,
+  checkedProperties[1]!,
+  checkedProperties[2]!,
+  checkedProperties[3]!,
 ]
 type TestedCheckedProperties = (typeof testedCheckedProperties)[number]
 const orderIndependentProps = ['gcTime', '...foo'] as const
@@ -165,6 +165,19 @@ const validTestCases = validTestMatrix.map(
   }),
 )
 
+invalidTestMatrix.push({
+  createRouteFunction: 'createFileRoute',
+  properties: {
+    invalid: ['loader', 'loaderDeps'],
+    valid: ['loaderDeps', 'loader'],
+  },
+})
+
+invalidTestMatrix.push({
+  createRouteFunction: 'createFileRoute',
+  properties: { invalid: ['meta', 'loader'], valid: ['loader', 'meta'] },
+})
+
 const invalidTestCases = invalidTestMatrix.map(
   ({ createRouteFunction, properties }) => ({
     name: `incorrect property order is detected for ${createRouteFunction} with order: ${properties.invalid.join(', ')}`,

package/src/__tests__/create-route-property-order.utils.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, test } from 'vitest'
-import { sortDataByOrder } from '../rules/create-route-property-order/create-route-property-order.utils'
+import {
+  getCheckedProperties,
+  sortDataByOrder,
+} from '../rules/create-route-property-order/create-route-property-order.utils'
 
 describe('create-route-property-order utils', () => {
   describe('sortDataByOrder', () => {
@@ -67,6 +70,63 @@ describe('create-route-property-order utils', () => {
         key: 'key',
         expected: [{ key: 'd' }, { key: 'a' }, { key: 'b' }, { key: 'c' }],
       },
+      {
+        data: [{ key: 'd' }, { key: 'b' }, { key: 'a' }, { key: 'c' }],
+        orderArray: [
+          [['a', 'b'], ['d']],
+          [['d'], ['c']],
+        ],
+        key: 'key',
+        expected: [{ key: 'b' }, { key: 'a' }, { key: 'd' }, { key: 'c' }],
+      },
+      {
+        data: [
+          { key: 'd' },
+          { key: 'b' },
+          { key: 'a' },
+          { key: 'c' },
+          { key: 'f' },
+        ],
+        orderArray: [
+          [
+            ['a', 'b'],
+            ['d', 'f'],
+          ],
+          [['d'], ['c']],
+        ],
+        key: 'key',
+        expected: [
+          { key: 'b' },
+          { key: 'a' },
+          { key: 'd' },
+          { key: 'f' },
+          { key: 'c' },
+        ],
+      },
+      {
+        data: [
+          { key: 'd' },
+          { key: 'b' },
+          { key: 'a' },
+          { key: 'c' },
+          { key: 'f' },
+        ],
+        orderArray: [
+          [
+            ['a', 'b'],
+            ['d', 'f'],
+          ],
+          [['d', 'f'], ['c']],
+        ],
+        key: 'key',
+        expected: [
+          { key: 'b' },
+          { key: 'a' },
+          { key: 'd' },
+          { key: 'f' },
+          { key: 'c' },
+        ],
+      },
     ] as const
     test.each(testCases)(
       '$data $orderArray $key $expected',
@@ -77,3 +137,43 @@ describe('create-route-property-order utils', () => {
     )
   })
 })
+
+describe('getCheckedProperties', () => {
+  const testCases = [
+    {
+      orderRules: [
+        [['a', 'b'], ['c']],
+        [['c'], ['d']],
+      ],
+      expected: ['a', 'b', 'c', 'd'],
+    },
+    {
+      orderRules: [
+        [['a', 'b'], ['c']],
+        [['d'], ['e']],
+      ],
+      expected: ['a', 'b', 'c', 'd', 'e'],
+    },
+    {
+      orderRules: [
+        [['a', 'b'], ['c']],
+        [['d'], ['e']],
+        [['c'], ['f']],
+      ],
+      expected: ['a', 'b', 'c', 'd', 'e', 'f'],
+    },
+    {
+      orderRules: [
+        [['a', 'b'], ['c']],
+        [['d'], ['e']],
+        [['c'], ['f']],
+        [['f'], ['g']],
+      ],
+      expected: ['a', 'b', 'c', 'd', 'e', 'f', 'g'],
+    },
+  ] as const
+  test.each(testCases)('$orderRules $expected', ({ orderRules, expected }) => {
+    const checkedProperties = getCheckedProperties(orderRules)
+    expect(checkedProperties).toEqual(expected)
+  })
+})

package/src/rules/create-route-property-order/constants.ts

@@ -1,3 +1,5 @@
+import { getCheckedProperties } from './create-route-property-order.utils'
+
 export const createRouteFunctionsIndirect = [
   'createFileRoute',
   'createRootRouteWithContext',
@@ -14,18 +16,17 @@ export const createRouteFunctions = [
 
 export type CreateRouteFunction = (typeof createRouteFunctions)[number]
 
-export const checkedProperties = [
-  'params',
-  'validateSearch',
-  'loaderDeps',
-  'context',
-  'beforeLoad',
-  'loader',
-] as const
-
 export const sortRules = [
-  [['params', 'validateSearch'], ['loaderDeps']],
+  [['params', 'validateSearch'], ['search']],
+  [['search'], ['loaderDeps']],
   [['loaderDeps'], ['context']],
   [['context'], ['beforeLoad']],
   [['beforeLoad'], ['loader']],
+  [
+    ['loader'],
+    ['onEnter', 'onStay', 'onLeave', 'meta', 'links', 'scripts', 'headers'],
+  ],
 ] as const
+
+export type CheckedProperties = (typeof sortRules)[number][number][number]
+export const checkedProperties = getCheckedProperties(sortRules)

package/src/rules/create-route-property-order/create-route-property-order.utils.ts

@@ -65,3 +65,9 @@ export function sortDataByOrder<T, TKey extends keyof T>(
   }
   return result
 }
+
+export function getCheckedProperties<T>(
+  orderRules: ReadonlyArray<ReadonlyArray<ReadonlyArray<T>>>,
+): ReadonlyArray<T> {
+  return [...new Set<T>(orderRules.flat(2))]
+}