refactor: use path util

bun.lock

@@ -8,11 +8,25 @@
         "@types/bun": "latest",
       },
     },
+    "packages/convex": {
+      "name": "@fileone/convex",
+      "peerDependencies": {
+        "convex": "^1.27.0",
+        "typescript": "^5",
+      },
+    },
+    "packages/path": {
+      "name": "@fileone/path",
+      "peerDependencies": {
+        "typescript": "^5",
+      },
+    },
     "packages/web": {
       "name": "@fileone/web",
       "version": "0.1.0",
       "dependencies": {
         "@convex-dev/workos": "^0.0.1",
+        "@fileone/convex": "workspace:*",
         "@radix-ui/react-checkbox": "^1.3.3",
         "@radix-ui/react-context-menu": "^2.2.16",
         "@radix-ui/react-dialog": "^1.1.15",
@@ -180,6 +194,10 @@
 
     "@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.4", "", { "os": "win32", "cpu": "x64" }, "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ=="],
 
+    "@fileone/convex": ["@fileone/convex@workspace:packages/convex"],
+
+    "@fileone/path": ["@fileone/path@workspace:packages/path"],
+
     "@fileone/web": ["@fileone/web@workspace:packages/web"],
 
     "@floating-ui/core": ["@floating-ui/core@1.7.3", "", { "dependencies": { "@floating-ui/utils": "^0.2.10" } }, "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w=="],

packages/convex/files.ts

@@ -1,4 +1,4 @@
-import type { Id } from "@convex/_generated/dataModel"
+import type { Id } from "@fileone/convex/_generated/dataModel"
 import { v } from "convex/values"
 import { authenticatedMutation, authenticatedQuery } from "./functions"
 import type { DirectoryItem } from "./model/directories"

packages/convex/model/directories.ts

@@ -1,4 +1,5 @@
-import type { Doc, Id } from "@convex/_generated/dataModel"
+import type { Doc, Id } from "@fileone/convex/_generated/dataModel"
+import { joinPath, PATH_SEPARATOR } from "@fileone/path"
 import type {
 	AuthenticatedMutationCtx,
 	AuthenticatedQueryCtx,
@@ -94,7 +95,7 @@ export async function create(
 		userId: ctx.user._id,
 		createdAt: now,
 		updatedAt: now,
-		path: parentDir ? `${parentDir.path}/${name}` : "/",
+		path: parentDir ? joinPath(parentDir.path, name) : PATH_SEPARATOR,
 	})
 }
 

packages/convex/package.json

@@ -0,0 +1,12 @@
+{
+	"name": "@fileone/convex",
+	"module": "index.ts",
+	"type": "module",
+	"dependencies": {
+		"@fileone/path": "workspace:*"
+	},
+	"peerDependencies": {
+		"typescript": "^5",
+		"convex": "^1.27.0"
+	}
+}

packages/path/.gitignore

@@ -0,0 +1,34 @@
+# dependencies (bun install)
+node_modules
+
+# output
+out
+dist
+*.tgz
+
+# code coverage
+coverage
+*.lcov
+
+# logs
+logs
+_.log
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# caches
+.eslintcache
+.cache
+*.tsbuildinfo
+
+# IntelliJ based IDEs
+.idea
+
+# Finder (MacOS) folder config
+.DS_Store

packages/path/README.md

@@ -0,0 +1,15 @@
+# @fileone/path
+
+To install dependencies:
+
+```bash
+bun install
+```
+
+To run:
+
+```bash
+bun run index.ts
+```
+
+This project was created using `bun init` in bun v1.2.22. [Bun](https://bun.com) is a fast all-in-one JavaScript runtime.

packages/path/index.ts

@@ -0,0 +1,9 @@
+export const PATH_SEPARATOR = "/"
+
+export function baseName(path: string): string {
+	return path.split(PATH_SEPARATOR).pop() ?? ""
+}
+
+export function joinPath(...paths: string[]): string {
+	return paths.join(PATH_SEPARATOR)
+}

packages/path/package.json

@@ -0,0 +1,8 @@
+{
+	"name": "@fileone/path",
+	"module": "index.ts",
+	"type": "module",
+	"peerDependencies": {
+		"typescript": "^5"
+	}
+}

packages/path/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    // Environment setup & latest features
+    "lib": ["ESNext"],
+    "target": "ESNext",
+    "module": "Preserve",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+
+    // Best practices
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true,
+
+    // Some stricter flags (disabled by default)
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false
+  }
+}

packages/web/package.json

@@ -10,6 +10,7 @@
 	},
 	"dependencies": {
 		"@convex-dev/workos": "^0.0.1",
+		"@fileone/convex": "workspace:*",
 		"@radix-ui/react-checkbox": "^1.3.3",
 		"@radix-ui/react-context-menu": "^2.2.16",
 		"@radix-ui/react-dialog": "^1.1.15",

packages/web/src/files/file-table.tsx

@@ -1,6 +1,5 @@
-import { api } from "@convex/_generated/api"
+import { api } from "@fileone/convex/_generated/api"
-import type { Id } from "@convex/_generated/dataModel"
+import type { DirectoryItem } from "@fileone/convex/model/directories"
-import type { DirectoryItem } from "@convex/model/directories"
 import { useMutation } from "@tanstack/react-query"
 import {
 	type ColumnDef,

packages/web/src/files/files-page.tsx

@@ -1,4 +1,4 @@
-import { api } from "@convex/_generated/api"
+import { api } from "@fileone/convex/_generated/api"
 import { useMutation } from "@tanstack/react-query"
 import { useMutation as useConvexMutation } from "convex/react"
 import { useSetAtom } from "jotai"

packages/web/src/files/state.ts

@@ -1,9 +1,9 @@
-import { atom } from "jotai"
+import type { Id } from "@fileone/convex/_generated/dataModel"
-import type { Id } from "@convex/_generated/dataModel"
 import type {
 	DirectoryItem,
 	DirectoryItemKind,
-} from "@convex/model/directories"
+} from "@fileone/convex/model/directories"
+import { atom } from "jotai"
 
 export const contextMenuTargeItemAtom = atom<DirectoryItem | null>(null)
 export const optimisticDeletedItemsAtom = atom(

packages/web/src/lib/error.ts

@@ -1,5 +1,8 @@
+import {
+	Code as ErrorCode,
+	isApplicationError,
+} from "@fileone/convex/model/error"
 import { toast } from "sonner"
-import { Code as ErrorCode, isApplicationError } from "@convex/model/error"
 
 const ERROR_MESSAGE = {
 	[ErrorCode.DirectoryExists]: "Directory already exists",

packages/web/src/routes/login_.callback.tsx

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

packages/web/tsconfig.json

@@ -23,8 +23,7 @@
 
 		"baseUrl": ".",
 		"paths": {
-			"@/*": ["./src/*"],
+			"@/*": ["./src/*"]
-			"@convex/*": ["../../convex/*"]
 		},
 
 		// Some stricter flags (disabled by default)