fix: remove the need to install @pinia/colada

package.json

@@ -92,6 +92,22 @@
       "require": "./dist/types.js",
       "import": "./dist/types.mjs"
     },
+    "./data-fetching/entries/basic": {
+      "types": {
+        "require": "./dist/data-fetching/entries/basic.d.ts",
+        "import": "./dist/data-fetching/entries/basic.d.mts"
+      },
+      "require": "./dist/data-fetching/entries/basic.js",
+      "import": "./dist/data-fetching/entries/basic.mjs"
+    },
+    "./data-fetching/entries/pinia-colada": {
+      "types": {
+        "require": "./dist/data-fetching/entries/pinia-colada.d.ts",
+        "import": "./dist/data-fetching/entries/pinia-colada.d.mts"
+      },
+      "require": "./dist/data-fetching/entries/pinia-colada.js",
+      "import": "./dist/data-fetching/entries/pinia-colada.mjs"
+    },
     "./client": {
       "types": "./client.d.ts"
     }

src/codegen/vueRouterModule.ts

@@ -16,8 +16,9 @@ export {
   definePage,
   // new data fetching
   DataLoaderPlugin,
-  defineBasicLoader,
-  defineColadaLoader,
+  // FIXME: automatically add?
+  // defineBasicLoader,
+  // defineColadaLoader,
   NavigationResult,
 } from 'unplugin-vue-router/runtime'
 

src/core/context.ts

@@ -1,13 +1,7 @@
 import { ResolvedOptions } from '../options'
 import { TreeNode, PrefixTree } from './tree'
 import { promises as fs } from 'fs'
-import {
-  appendExtensionListToPattern,
-  asRoutePath,
-  ImportsMap,
-  logTree,
-  throttle,
-} from './utils'
+import { asRoutePath, ImportsMap, logTree, throttle } from './utils'
 import { generateRouteNamedMap } from '../codegen/generateRouteMap'
 import { MODULE_ROUTES_PATH, MODULE_VUE_ROUTER } from './moduleConstants'
 import { generateRouteRecord } from '../codegen/generateRouteRecords'
@@ -209,7 +203,6 @@ export function createRoutesContext(options: ResolvedOptions) {
   }
 
   let lastDTS: string | undefined
-  let lastTypesConfigDTS: string | undefined
   async function _writeConfigFiles() {
     logger.time('writeConfigFiles')
 

src/core/utils.ts

@@ -3,10 +3,6 @@ import type { RouteRecordOverride, TreeRouteParam } from './treeNodeValue'
 import { pascalCase } from 'scule'
 import { ResolvedOptions, RoutesFolderOption } from '../options'
 
-export type LiteralStringUnion<LiteralType, BaseType extends string = string> =
-  | LiteralType
-  | (BaseType & Record<never, never>)
-
 export function warn(
   msg: string,
   type: 'warn' | 'error' | 'debug' = 'warn'

src/data-fetching/createDataLoader.ts

@@ -1,5 +1,5 @@
 import { type ShallowRef } from 'vue'
-import { IS_USE_DATA_LOADER_KEY, STAGED_NO_VALUE } from './meta-extensions'
+import type { IS_USE_DATA_LOADER_KEY, STAGED_NO_VALUE } from './meta-extensions'
 import { type _PromiseMerged } from './utils'
 import { type NavigationResult } from './navigation-guard'
 import type {

src/data-fetching/defineColadaLoader.ts

@@ -9,7 +9,7 @@ import type {
   RouteRecordName,
   Router,
 } from 'unplugin-vue-router/types'
-import {
+import type {
   DataLoaderContextBase,
   DataLoaderEntryBase,
   DefineDataLoaderOptionsBase,
@@ -30,7 +30,7 @@ import {
 } from './meta-extensions'
 import {
   IS_CLIENT,
-  _PromiseMerged,
+  type _PromiseMerged,
   assign,
   getCurrentContext,
   isSubsetOf,
@@ -40,9 +40,9 @@ import {
 import { type ShallowRef, shallowRef, watch } from 'vue'
 import { NavigationResult } from './navigation-guard'
 import {
-  UseQueryKey,
-  UseQueryOptions,
-  UseQueryReturn,
+  type UseQueryKey,
+  type UseQueryOptions,
+  type UseQueryReturn,
   useQuery,
 } from '@pinia/colada'
 

src/data-fetching/defineLoader.ts

@@ -4,7 +4,7 @@ import type {
   RouteRecordName,
   Router,
 } from 'unplugin-vue-router/types'
-import {
+import type {
   DataLoaderContextBase,
   DataLoaderEntryBase,
   DefineDataLoaderOptionsBase,
@@ -49,23 +49,23 @@ export function defineBasicLoader<
     RouteLocationNormalizedLoaded<Name>
   >,
   options?: DefineDataLoaderOptions<isLazy>
-): UseDataLoader<isLazy, Data>
+): UseDataLoaderBasic<isLazy, Data>
 export function defineBasicLoader<Data, isLazy extends boolean>(
   loader: DefineLoaderFn<
     Data,
     DataLoaderContext,
     RouteLocationNormalizedLoaded
   >,
   options?: DefineDataLoaderOptions<isLazy>
-): UseDataLoader<isLazy, Data>
+): UseDataLoaderBasic<isLazy, Data>
 
 export function defineBasicLoader<Data, isLazy extends boolean>(
   nameOrLoader: RouteRecordName | DefineLoaderFn<Data, DataLoaderContext>,
   _loaderOrOptions?:
     | DefineDataLoaderOptions<isLazy>
     | DefineLoaderFn<Data, DataLoaderContext>,
   opts?: DefineDataLoaderOptions<isLazy>
-): UseDataLoader<isLazy, Data> {
+): UseDataLoaderBasic<isLazy, Data> {
   // TODO: make it DEV only and remove the first argument in production mode
   // resolve option overrides
   const loader =
@@ -268,7 +268,7 @@ export function defineBasicLoader<Data, isLazy extends boolean>(
 
   // @ts-expect-error: requires the internals and symbol that are added later
   const useDataLoader: // for ts
-  UseDataLoader<isLazy, Data> = () => {
+  UseDataLoaderBasic<isLazy, Data> = () => {
     // work with nested data loaders
     const [parentEntry, _router, _route] = getCurrentContext()
     // fallback to the global router and routes for useDataLoaders used within components
@@ -378,7 +378,7 @@ export interface DataLoaderContext extends DataLoaderContextBase {}
 const DEFAULT_DEFINE_LOADER_OPTIONS = {
   lazy: false as boolean,
   server: true,
-  commit: 'immediate',
+  commit: 'after-load',
 } satisfies DefineDataLoaderOptions<boolean>
 
 /**
@@ -405,3 +405,6 @@ declare module 'vue-router' {
     [INITIAL_DATA_KEY]?: Record<string, unknown> | false
   }
 }
+
+export interface UseDataLoaderBasic<isLazy extends boolean, Data>
+  extends UseDataLoader<isLazy, Data> {}

src/data-fetching/entries/basic.ts

@@ -0,0 +1,19 @@
+export { defineBasicLoader } from '../defineLoader'
+export type {
+  UseDataLoaderBasic,
+  DataLoaderContext,
+  DefineDataLoaderOptions,
+} from '../defineLoader'
+
+export type {
+  UseDataLoader,
+  UseDataLoaderInternals,
+  UseDataLoaderResult,
+  DataLoaderContextBase,
+  DataLoaderEntryBase,
+  DefineDataLoaderOptionsBase,
+  DefineLoaderFn,
+  _DataMaybeLazy,
+  DefineDataLoader,
+  DefineDataLoaderCommit,
+} from '../createDataLoader'

src/data-fetching/entries/pinia-colada.ts

@@ -0,0 +1,20 @@
+export { defineColadaLoader } from '../defineColadaLoader'
+export type {
+  DataLoaderColadaEntry,
+  DataColadaLoaderContext,
+  DefineDataColadaLoaderOptions,
+  UseDataLoaderColada,
+  UseDataLoaderColadaResult,
+} from '../defineColadaLoader.ts'
+export type {
+  UseDataLoader,
+  UseDataLoaderInternals,
+  UseDataLoaderResult,
+  DataLoaderContextBase,
+  DataLoaderEntryBase,
+  DefineDataLoaderOptionsBase,
+  DefineLoaderFn,
+  _DataMaybeLazy,
+  DefineDataLoader,
+  DefineDataLoaderCommit,
+} from '../createDataLoader'

src/index.ts

@@ -18,7 +18,7 @@ export * from './types'
 
 export { DEFAULT_OPTIONS }
 
-export default createUnplugin<Options | undefined>((opt = {}, meta) => {
+export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
   const options = resolveOptions(opt)
   const ctx = createRoutesContext(options)
 
@@ -71,6 +71,7 @@ export default createUnplugin<Options | undefined>((opt = {}, meta) => {
       if (routeBlockQueryRE.test(id)) {
         return ROUTE_BLOCK_ID
       }
+      return undefined // ok TS...
     },
 
     buildStart() {
@@ -124,6 +125,8 @@ export default createUnplugin<Options | undefined>((opt = {}, meta) => {
       if (resolvedId === MODULE_VUE_ROUTER) {
         return ctx.generateVueRouterProxy()
       }
+
+      return undefined // ok TS...
     },
 
     // improves DX

src/options.ts

@@ -6,6 +6,8 @@ import { EditableTreeNode } from './core/extendRoutes'
 import { type ParseSegmentOptions } from './core/treeNodeValue'
 import { type _Awaitable } from './utils'
 
+// TODO: remove from exports and move export to src/index?
+
 /**
  * Options for a routes folder.
  */

src/runtime.ts

@@ -12,11 +12,6 @@ export type {
 } from './data-fetching/createDataLoader'
 
 // new data fetching
-export { defineBasicLoader } from './data-fetching/defineLoader'
-export type {
-  DataLoaderContext,
-  DefineDataLoaderOptions,
-} from './data-fetching/defineLoader'
 export {
   DataLoaderPlugin,
   NavigationResult,
@@ -27,15 +22,6 @@ export type {
   _DataLoaderRedirectResult,
 } from './data-fetching/navigation-guard'
 
-export type {
-  DataLoaderColadaEntry,
-  DataColadaLoaderContext,
-  DefineDataColadaLoaderOptions,
-  UseDataLoaderColada,
-  UseDataLoaderColadaResult,
-} from './data-fetching/defineColadaLoader'
-export { defineColadaLoader } from './data-fetching/defineColadaLoader'
-
 // NOTE: for tests only
 // export * from './data-fetching/defineQueryLoader'
 

src/type-extensions/routeLocation.ts

@@ -10,7 +10,8 @@ import type {
   RouteRecordName,
 } from 'vue-router'
 import type { _RouteMapGeneric } from '../codegen/generateRouteMap'
-import type { LiteralStringUnion } from '../core/utils'
+import type { LiteralStringUnion } from '../utils'
+// inlining the type as it avoids code splitting issues
 import type { RouteNamedMap } from './types-config'
 
 export type _RouteRecordName = keyof RouteNamedMap

src/types.ts

@@ -3,8 +3,6 @@
  * https://github.com/posva/unplugin-vue-router/issues/136
  */
 
-export type { Options } from './options'
-
 export type {
   _RouteMapGeneric,
   RouteRecordInfo,
@@ -66,9 +64,3 @@ export type {
   ParamValueZeroOrMore,
   ParamValueZeroOrOne,
 } from './codegen/generateRouteParams'
-
-export type { TreeNode } from './core/tree'
-export type {
-  TreeNodeValueParam,
-  TreeNodeValueStatic,
-} from './core/treeNodeValue'

src/utils/index.ts

@@ -3,3 +3,11 @@
  * @internal
  */
 export type _Awaitable<T> = T | PromiseLike<T>
+
+/**
+ * Creates a union type that still allows autocompletion for strings.
+ *@internal
+ */
+export type LiteralStringUnion<LiteralType, BaseType extends string = string> =
+  | LiteralType
+  | (BaseType & Record<never, never>)

tsup-runtime.config.ts

@@ -5,7 +5,7 @@ export default defineConfig([
   {
     ...commonOptions,
     clean: false,
-    entry: ['./src/runtime.ts'],
+    entry: ['./src/runtime.ts', './src/data-fetching/entries/*'],
     external: [...commonOptions.external, 'unplugin-vue-router/types'],
   },
 ])

tsup.config.ts

@@ -20,6 +20,8 @@ export default defineConfig([
   {
     ...commonOptions,
     entry: [
+      './src/index.ts',
+      './src/options.ts',
       './src/esbuild.ts',
       './src/rollup.ts',
       './src/vite.ts',