style: up prettier

posva · Feb 21, 2024 · 4e94786 · 4e94786
1 parent 15aa3d1
commit 4e94786
Show file tree

Hide file tree

Showing 20 changed files with 76 additions and 76 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -4,3 +4,4 @@ dist
 .output
 coverage
 typed-router.d.ts
+auto-imports.d.ts
diff --git a/package.json b/package.json
@@ -178,7 +178,7 @@
     "nodemon": "^3.0.3",
     "p-series": "^3.0.0",
     "pinia": "^2.1.7",
-    "prettier": "^2.8.8",
+    "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "rollup": "^4.12.0",
     "semver": "^7.6.0",

diff --git a/playground/auto-imports.d.ts b/playground/auto-imports.d.ts
@@ -6,7 +6,7 @@
 export {}
 declare global {
   const defineBasicLoader: typeof import('unplugin-vue-router/runtime')['defineBasicLoader']
-  const defineLoader: typeof import('unplugin-vue-router/runtime')['_defineLoader']
+  const defineLoader: (typeof import('unplugin-vue-router/runtime'))['_defineLoader']
   const definePage: typeof import('unplugin-vue-router/runtime')['definePage']
   const onBeforeRouteLeave: typeof import('vue-router/auto')['onBeforeRouteLeave']
   const onBeforeRouteUpdate: typeof import('vue-router/auto')['onBeforeRouteUpdate']

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
@@ -43,7 +43,7 @@ export interface RouteRecordInfo<
   // TODO: could probably be inferred from the Params
   ParamsRaw extends RouteParamsRaw = RouteParamsRaw,
   Params extends RouteParams = RouteParams,
-  Meta extends RouteMeta = RouteMeta
+  Meta extends RouteMeta = RouteMeta,
 > {
   name: Name
   path: Path

diff --git a/src/codegen/generateRouteParams.ts b/src/codegen/generateRouteParams.ts
@@ -11,10 +11,10 @@ export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
             (param.modifier === '+'
               ? `ParamValueOneOrMore<${isRaw}>`
               : param.modifier === '*'
-              ? `ParamValueZeroOrMore<${isRaw}>`
-              : param.modifier === '?'
-              ? `ParamValueZeroOrOne<${isRaw}>`
-              : `ParamValue<${isRaw}>`)
+                ? `ParamValueZeroOrMore<${isRaw}>`
+                : param.modifier === '?'
+                  ? `ParamValueZeroOrOne<${isRaw}>`
+                  : `ParamValue<${isRaw}>`)
         )
         .join(', ')} }`
     : // no params allowed
@@ -29,7 +29,7 @@ export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
  */
 export type ParamValueOneOrMore<isRaw extends boolean> = [
   ParamValue<isRaw>,
-  ...ParamValue<isRaw>[]
+  ...ParamValue<isRaw>[],
 ]
 
 /**

diff --git a/src/core/context.ts b/src/core/context.ts
@@ -31,8 +31,8 @@ export function createRoutesContext(options: ResolvedOptions) {
     preferDTS === false
       ? false
       : preferDTS === true
-      ? resolve(root, 'typed-router.d.ts')
-      : resolve(root, preferDTS)
+        ? resolve(root, 'typed-router.d.ts')
+        : resolve(root, preferDTS)
 
   const routeTree = new PrefixTree(options)
   const editableRoutes = new EditableTreeNode(routeTree)

diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
@@ -96,10 +96,10 @@ class _TreeNodeValueBase {
         nameA === nameB
           ? 0
           : // EDITS_OVERRIDE_NAME should always be last
-          nameA !== EDITS_OVERRIDE_NAME &&
-            (nameA < nameB || nameB === EDITS_OVERRIDE_NAME)
-          ? -1
-          : 1
+            nameA !== EDITS_OVERRIDE_NAME &&
+              (nameA < nameB || nameB === EDITS_OVERRIDE_NAME)
+            ? -1
+            : 1
       )
       .reduce((acc, [_path, routeBlock]) => {
         return mergeRouteRecordOverride(acc, routeBlock)
@@ -305,17 +305,18 @@ function parseFileSegment(
           ? '*'
           : '?'
         : currentTreeRouteParam.repeatable
-        ? '+'
-        : ''
+          ? '+'
+          : ''
       buffer = ''
       pathSegment += `:${currentTreeRouteParam.paramName}${
         currentTreeRouteParam.isSplat
           ? '(.*)'
           : // Only append () if necessary
-          pos < segment.length - 1 && IS_VARIABLE_CHAR_RE.test(segment[pos + 1])
-          ? '()'
-          : // allow routes like /[id]_suffix to make suffix static and not part of the param
-            ''
+            pos < segment.length - 1 &&
+              IS_VARIABLE_CHAR_RE.test(segment[pos + 1])
+            ? '()'
+            : // allow routes like /[id]_suffix to make suffix static and not part of the param
+              ''
       }${currentTreeRouteParam.modifier}`
       params.push(currentTreeRouteParam)
       subSegments.push(currentTreeRouteParam)

diff --git a/src/data-fetching/createDataLoader.ts b/src/data-fetching/createDataLoader.ts
@@ -12,7 +12,7 @@ import { _Router } from '../type-extensions/router'
  */
 export interface DataLoaderEntryBase<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > {
   /**
    * Data stored in the entry.
@@ -129,7 +129,7 @@ export function createDataLoader<Context extends DataLoaderContextBase>({
 }
 
 export interface CreateDataLoaderOptions<
-  Context extends DataLoaderContextBase
+  Context extends DataLoaderContextBase,
 > {
   // TODO: should return a different value than context to know if we should skip the data loader execution
   // TODO: rename to make more sense e.g. load, preload
@@ -195,7 +195,7 @@ export interface DefineDataLoader<Context extends DataLoaderContextBase> {
  */
 export interface UseDataLoader<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > {
   [IS_USE_DATA_LOADER_KEY]: true
 
@@ -241,7 +241,7 @@ export interface UseDataLoader<
  */
 export interface UseDataLoaderInternals<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > {
   /**
    * Loads the data from the cache if possible, otherwise loads it from the loader and awaits it.
@@ -283,7 +283,7 @@ export type _DataMaybeLazy<Data, isLazy extends boolean = boolean> =
  */
 export interface UseDataLoaderResult<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > {
   /**
    * Data returned by the loader. If the data loader is lazy, it will be undefined until the first load.
@@ -347,7 +347,7 @@ function _testing() {
 export interface DefineLoaderFn<
   Data,
   Context extends DataLoaderContextBase = DataLoaderContextBase,
-  Route = _RouteLocationNormalizedLoaded
+  Route = _RouteLocationNormalizedLoaded,
 > {
   (route: Route, context: Context): Promise<Data>
 }
diff --git a/src/data-fetching/defineColadaLoader.ts b/src/data-fetching/defineColadaLoader.ts
@@ -55,7 +55,7 @@ import {
 export function defineColadaLoader<
   Name extends _RouteRecordName,
   Data,
-  isLazy extends boolean
+  isLazy extends boolean,
 >(
   name: Name,
   options: DefineDataLoaderOptions<isLazy, Name, Data>
@@ -452,7 +452,7 @@ export function defineColadaLoader<Data, isLazy extends boolean>(
 export interface DefineDataLoaderOptions<
   isLazy extends boolean,
   Name extends _RouteRecordName,
-  Data
+  Data,
 > extends DefineDataLoaderOptionsBase<isLazy>,
     Omit<UseQueryOptions<unknown>, 'query' | 'key'> {
   /**

diff --git a/src/data-fetching/defineLoader.ts b/src/data-fetching/defineLoader.ts
@@ -40,7 +40,7 @@ import { NavigationResult } from './navigation-guard'
 export function defineBasicLoader<
   Name extends _RouteRecordName,
   Data,
-  isLazy extends boolean
+  isLazy extends boolean,
 >(
   name: Name,
   loader: DefineLoaderFn<

diff --git a/src/data-fetching/defineQueryLoader.ts b/src/data-fetching/defineQueryLoader.ts
@@ -39,7 +39,7 @@ import type { _Router } from '../type-extensions/router'
 export function defineQueryLoader<
   Name extends _RouteRecordName,
   Data,
-  isLazy extends boolean
+  isLazy extends boolean,
 >(
   name: Name,
   loader: DefineLoaderFn<
@@ -350,7 +350,7 @@ export interface DefineQueryLoaderOptions<isLazy extends boolean, Data>
 
 export interface QueryLoaderEntry<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > extends DataLoaderEntryBase<isLazy, Data> {
   vq: UseQueryReturnType<Data, unknown>
 }

diff --git a/src/data-fetching/defineVueFireLoader.ts b/src/data-fetching/defineVueFireLoader.ts
@@ -29,7 +29,7 @@ import { Ref, UnwrapRef, ref, shallowRef } from 'vue'
 
 export function defineVueFireLoader<
   Doc extends DocumentReference<unknown, DocumentData>,
-  isLazy extends boolean
+  isLazy extends boolean,
 >(
   loader: (route: RouteLocationNormalizedLoaded) => Doc,
   opts?: DefineVueFireDataLoaderOptions<isLazy>
@@ -277,9 +277,8 @@ export function defineVueFireLoader<
   return useDataLoader
 }
 
-type _ExtractDocumentType<Doc> = Doc extends DocumentReference<infer D, any>
-  ? D
-  : unknown
+type _ExtractDocumentType<Doc> =
+  Doc extends DocumentReference<infer D, any> ? D : unknown
 
 export interface DefineVueFireDataLoaderOptions<isLazy extends boolean>
   extends DefineDataLoaderOptionsBase<isLazy>,
@@ -292,7 +291,7 @@ export interface DefineVueFireDataLoaderOptions<isLazy extends boolean>
 
 export interface VueFireDataLoaderEntry<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 > extends DataLoaderEntryBase<isLazy, Data> {
   children: Set<VueFireDataLoaderEntry>
 
@@ -312,7 +311,7 @@ const DEFAULT_DEFINE_LOADER_OPTIONS = {
 
 function createDefineVueFireLoaderEntry<
   isLazy extends boolean = boolean,
-  Data = unknown
+  Data = unknown,
 >(
   loader: (to: RouteLocationNormalizedLoaded) => _RefFirestore<Data>,
   options: Required<DefineVueFireDataLoaderOptions<isLazy>>,

diff --git a/src/data-fetching/meta-extensions.ts b/src/data-fetching/meta-extensions.ts
@@ -18,7 +18,7 @@ export type _DefineLoaderEntryMap<
   DataLoaderEntry extends DataLoaderEntryBase<
     boolean,
     unknown
-  > = DataLoaderEntryBase<boolean, unknown>
+  > = DataLoaderEntryBase<boolean, unknown>,
 > = WeakMap<
   // Depending on the `defineLoader()` they might use a different thing as key
   // e.g. an function for basic defineLoader, a doc instance for VueFire

diff --git a/src/data-fetching/utils.ts b/src/data-fetching/utils.ts
@@ -17,7 +17,7 @@ export let currentContext:
   | readonly [
       entry: DataLoaderEntryBase,
       router: _Router,
-      route: _RouteLocationNormalizedLoaded
+      route: _RouteLocationNormalizedLoaded,
     ]
   | undefined
   | null

diff --git a/src/type-extensions/RouterLink.ts b/src/type-extensions/RouterLink.ts
@@ -31,7 +31,7 @@ import type {
  */
 export interface RouterLinkPropsTyped<
   RouteMap extends _RouteMapGeneric,
-  Name extends keyof RouteMap = keyof RouteMap
+  Name extends keyof RouteMap = keyof RouteMap,
 > extends Omit<_RouterLinkProps, 'to'> {
   to:
     | RouteLocationAsString<RouteMap>
@@ -62,7 +62,7 @@ export interface RouterLinkTyped<RouteMap extends _RouteMapGeneric> {
  */
 export interface _UseLinkReturnTyped<
   RouteMap extends _RouteMapGeneric,
-  Name extends keyof RouteMap = keyof RouteMap
+  Name extends keyof RouteMap = keyof RouteMap,
 > {
   route: ComputedRef<RouteLocationResolvedTypedList<RouteMap>[Name]>
   href: ComputedRef<string>

diff --git a/src/type-extensions/navigationGuards.ts b/src/type-extensions/navigationGuards.ts
@@ -41,7 +41,7 @@ export type NavigationGuardReturn = NavigationGuardReturnTyped<RouteNamedMap>
  */
 export interface NavigationGuardWithThisTyped<
   T,
-  RouteMap extends _RouteMapGeneric
+  RouteMap extends _RouteMapGeneric,
 > {
   (
     this: T,