refactor: add import maps for generated code

- Add export mappings in @fileone/convex package.json for cleaner imports
- Map @fileone/convex/dataModel to _generated/dataModel.d.ts
- Map @fileone/convex/api to _generated/api.js
- Map @fileone/convex/server to _generated/server.js
- Update all imports across packages/convex and apps/drive-web
- Maintain backward compatibility with _generated/* exports

Co-authored-by: Ona <no-reply@ona.com>

apps/drive-web/src/dashboard/dashboard-sidebar.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { Link, useLocation } from "@tanstack/react-router"
 import { useQuery as useConvexQuery } from "convex/react"
 import { useAtomValue } from "jotai"

apps/drive-web/src/directories/directory-page/context.ts

@@ -1,4 +1,4 @@
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import type { FileSystemItem } from "@fileone/convex/filesystem"
 import type { DirectoryInfo } from "@fileone/convex/types"
 import { createContext } from "react"

apps/drive-web/src/directories/directory-page/directory-content-context-menu.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { newFileSystemHandle } from "@fileone/convex/filesystem"
 import { useMutation } from "@tanstack/react-query"
 import { useMutation as useContextMutation } from "convex/react"

apps/drive-web/src/directories/directory-page/directory-content-table.tsx

@@ -1,4 +1,4 @@
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import {
 	type DirectoryHandle,
 	type FileHandle,

apps/drive-web/src/directories/directory-page/file-path-breadcrumb.tsx

@@ -1,4 +1,4 @@
-import type { Id } from "@fileone/convex/_generated/dataModel"
+import type { Id } from "@fileone/convex/dataModel"
 import type {
 	DirectoryHandle,
 	DirectoryPathComponent,
@@ -86,6 +86,8 @@ function FilePathBreadcrumbItem({
 
 	const dirName = component.name || rootLabel
 
+	console.log({ dirName, isDraggedOver, dropHandlers })
+
 	return (
 		<Tooltip open={isDraggedOver}>
 			<TooltipTrigger asChild>

apps/drive-web/src/directories/directory-page/new-directory-dialog.tsx

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Id } from "@fileone/convex/_generated/dataModel"
+import type { Id } from "@fileone/convex/dataModel"
 import { useMutation } from "@tanstack/react-query"
 import { useMutation as useContextMutation } from "convex/react"
 import { useId } from "react"

apps/drive-web/src/directories/directory-page/rename-file-dialog.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { type FileSystemItem, FileType } from "@fileone/convex/filesystem"
 import { useMutation } from "@tanstack/react-query"
 import { useMutation as useContextMutation } from "convex/react"

apps/drive-web/src/directories/directory-page/state.ts

@@ -1,5 +1,5 @@
-import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
-import type { FileSystemItem, FileType } from "@fileone/convex/filesystem"
+import type { FileSystemItem } from "@fileone/convex/filesystem"
 import type { RowSelectionState } from "@tanstack/react-table"
 import { atom } from "jotai"
 import type { FileDragInfo } from "../../files/use-file-drop"

apps/drive-web/src/files/file-preview-dialog.tsx

@@ -1,4 +1,4 @@
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import { ImagePreviewDialog } from "./image-preview-dialog"
 
 export function FilePreviewDialog({

apps/drive-web/src/files/file-table.tsx

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import type { DirectoryItem } from "@fileone/convex/types"
 import { useMutation } from "@tanstack/react-query"
 import { Link } from "@tanstack/react-router"

apps/drive-web/src/files/files-page.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { baseName, splitPath } from "@fileone/path"
 import { useMutation } from "@tanstack/react-query"
 import { Link } from "@tanstack/react-router"

apps/drive-web/src/files/image-preview-dialog.tsx

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import { DialogTitle } from "@radix-ui/react-dialog"
 import { useQuery as useConvexQuery } from "convex/react"
 import { atom, useAtom, useAtomValue, useSetAtom } from "jotai"

apps/drive-web/src/files/rename-file-dialog.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { useMutation } from "@tanstack/react-query"
 import { useMutation as useContextMutation } from "convex/react"
 import { atom, useAtom, useStore } from "jotai"

apps/drive-web/src/files/state.ts

@@ -1,4 +1,4 @@
-import type { Id } from "@fileone/convex/_generated/dataModel"
+import type { Id } from "@fileone/convex/dataModel"
 import type {
 	DirectoryItem,
 	DirectoryItemKind,

apps/drive-web/src/files/upload-file-dialog.tsx

@@ -1,4 +1,4 @@
-import type { Doc } from "@fileone/convex/_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import { mutationOptions } from "@tanstack/react-query"
 import { atom, useAtom, useAtomValue, useSetAtom, useStore } from "jotai"
 import { atomEffect } from "jotai-effect"

apps/drive-web/src/files/use-file-drop.ts

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import * as Err from "@fileone/convex/error"
 import {
 	type DirectoryHandle,
@@ -71,7 +71,6 @@ export function useFileDrop({
 
 	const handleDrop = (_e: React.DragEvent) => {
 		const dragInfo = store.get(dragInfoAtom)
-		console.log("handleDrop", { dragInfo, destItem })
 		if (dragInfo && destItem) {
 			const items = dragInfo.items.filter(
 				(item) => !isSameHandle(item, destItem),
@@ -89,6 +88,7 @@ export function useFileDrop({
 
 	const handleDragOver = (e: React.DragEvent) => {
 		const dragInfo = store.get(dragInfoAtom)
+		console.log({ dragInfo, destItem })
 		if (dragInfo && destItem) {
 			e.preventDefault()
 			e.dataTransfer.dropEffect = "move"

apps/drive-web/src/files/use-upload-file.ts

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import { useMutation as useConvexMutation } from "convex/react"
 import { useCallback } from "react"
 

apps/drive-web/src/routes/_authenticated/_sidebar-layout/directories.$directoryId.tsx

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import {
 	type FileSystemItem,
 	FileType,

apps/drive-web/src/routes/_authenticated/_sidebar-layout/trash.directories.$directoryId.tsx

@@ -1,5 +1,5 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
-import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import {
 	type FileSystemItem,
 	FileType,

apps/drive-web/src/routes/login_.callback.tsx

@@ -1,4 +1,4 @@
-import { api } from "@fileone/convex/_generated/api"
+import { api } from "@fileone/convex/api"
 import { useMutation } from "@tanstack/react-query"
 import { createFileRoute, useNavigate } from "@tanstack/react-router"
 import { useConvexAuth, useMutation as useConvexMutation } from "convex/react"

packages/convex/auth.ts

@@ -1,8 +1,8 @@
 import { createClient, type GenericCtx } from "@convex-dev/better-auth"
 import { convex, crossDomain } from "@convex-dev/better-auth/plugins"
 import { betterAuth } from "better-auth"
-import { components } from "./_generated/api"
+import { components } from "@fileone/convex/api"
-import type { DataModel } from "./_generated/dataModel"
+import type { DataModel } from "@fileone/convex/dataModel"
 import authSchema from "./betterauth/schema"
 
 const siteUrl = process.env.SITE_URL!

packages/convex/files.ts

@@ -1,5 +1,5 @@
 import { v } from "convex/values"
-import type { Id } from "./_generated/dataModel"
+import type { Id } from "@fileone/convex/dataModel"
 import { authenticatedMutation, authenticatedQuery, authorizedGet } from "./functions"
 import * as Directories from "./model/directories"
 import * as Files from "./model/files"

packages/convex/functions.ts

@@ -9,9 +9,9 @@ import {
 	customMutation,
 	customQuery,
 } from "convex-helpers/server/customFunctions"
-import type { DataModel } from "./_generated/dataModel"
+import type { DataModel } from "@fileone/convex/dataModel"
-import type { MutationCtx, QueryCtx } from "./_generated/server"
+import type { MutationCtx, QueryCtx } from "@fileone/convex/server"
-import { mutation, query } from "./_generated/server"
+import { mutation, query } from "@fileone/convex/server"
 import { type AuthUser, userIdentityOrThrow, userOrThrow } from "./model/user"
 
 export type AuthenticatedQueryCtx = QueryCtx & {

packages/convex/model/directories.ts

@@ -1,4 +1,4 @@
-import type { Doc, Id } from "../_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import type {
 	AuthenticatedMutationCtx,
 	AuthenticatedQueryCtx,

packages/convex/model/files.ts

@@ -1,4 +1,4 @@
-import type { Doc, Id } from "../_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import { type AuthenticatedMutationCtx, authorizedGet } from "../functions"
 import * as Err from "../shared/error"
 import type { DirectoryHandle, FileHandle } from "../shared/filesystem"

packages/convex/model/filesystem.ts

@@ -1,5 +1,5 @@
 import { v } from "convex/values"
-import type { Doc, Id } from "../_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import {
 	type AuthenticatedMutationCtx,
 	type AuthenticatedQueryCtx,

packages/convex/model/user.ts

@@ -1,4 +1,4 @@
-import type { MutationCtx, QueryCtx } from "../_generated/server"
+import type { MutationCtx, QueryCtx } from "@fileone/convex/server"
 import { authComponent } from "../auth"
 import * as Err from "../shared/error"
 

packages/convex/package.json

@@ -6,6 +6,9 @@
 		"./filesystem": "./shared/filesystem.ts",
 		"./error": "./shared/error.ts",
 		"./types": "./shared/types.ts",
+		"./dataModel": "./_generated/dataModel.d.ts",
+		"./api": "./_generated/api.js",
+		"./server": "./_generated/server.js",
 		"./_generated/*": "./_generated/*",
 		"./model/*": "./model/*",
 		"./shared/*": "./shared/*"

packages/convex/shared/filesystem.ts

@@ -4,7 +4,7 @@
  * NO server-only dependencies should be imported here.
  */
 
-import type { Doc, Id } from "../_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/dataModel"
 import type * as Err from "./error"
 
 export enum FileType {

packages/convex/shared/types.ts

@@ -3,7 +3,7 @@
  * This file should NOT import any server-only dependencies.
  */
 
-import type { Doc } from "../_generated/dataModel"
+import type { Doc } from "@fileone/convex/dataModel"
 import type { DirectoryPath } from "./filesystem"
 
 export type DirectoryInfo = Doc<"directories"> & { path: DirectoryPath }