diff options
Diffstat (limited to 'packages')
55 files changed, 165 insertions, 156 deletions
diff --git a/packages/db/drizzle.config.ts b/packages/db/drizzle.config.ts index dca30914..f7e57e83 100644 --- a/packages/db/drizzle.config.ts +++ b/packages/db/drizzle.config.ts @@ -1,6 +1,6 @@ import "dotenv/config"; import type { Config } from "drizzle-kit"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; const databaseURL = serverConfig.dataDir ? `${serverConfig.dataDir}/db.db` diff --git a/packages/db/package.json b/packages/db/package.json index 071fc153..74f4f84f 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/db", + "name": "@karakeep/db", "version": "0.1.0", "private": true, "main": "index.ts", @@ -11,7 +11,7 @@ }, "dependencies": { "@auth/core": "^0.27.0", - "@hoarder/shared": "workspace:*", + "@karakeep/shared": "workspace:*", "@paralleldrive/cuid2": "^2.2.2", "better-sqlite3": "^11.3.0", "dotenv": "^16.4.1", @@ -19,9 +19,9 @@ "tsx": "^4.7.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", "@types/better-sqlite3": "^7.6.11", "drizzle-kit": "^0.30.01" @@ -29,8 +29,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/db/schema.ts b/packages/db/schema.ts index 7dab7401..d08f0698 100644 --- a/packages/db/schema.ts +++ b/packages/db/schema.ts @@ -11,7 +11,7 @@ import { unique, } from "drizzle-orm/sqlite-core"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; function createdAtField() { return integer("createdAt", { mode: "timestamp" }) diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index 59982ea1..4b2dbfe9 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/e2e_tests/package.json b/packages/e2e_tests/package.json index 2dc05574..9245d366 100644 --- a/packages/e2e_tests/package.json +++ b/packages/e2e_tests/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/e2e_tests", + "name": "@karakeep/e2e_tests", "version": "0.1.0", "private": true, "type": "module", @@ -14,22 +14,22 @@ "test:watch": "vitest" }, "dependencies": { - "@hoarder/trpc": "workspace:^0.1.0", - "@hoarderapp/sdk": "workspace:*", + "@karakeep/sdk": "workspace:*", + "@karakeep/trpc": "workspace:^0.1.0", "superjson": "^2.2.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" }, "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/e2e_tests/tests/api/assets.test.ts b/packages/e2e_tests/tests/api/assets.test.ts index 0ed10dee..8de3c411 100644 --- a/packages/e2e_tests/tests/api/assets.test.ts +++ b/packages/e2e_tests/tests/api/assets.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { assert, beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser, uploadTestAsset } from "../../utils/api"; describe("Assets API", () => { diff --git a/packages/e2e_tests/tests/api/bookmarks.test.ts b/packages/e2e_tests/tests/api/bookmarks.test.ts index df3cefe2..dbd536b1 100644 --- a/packages/e2e_tests/tests/api/bookmarks.test.ts +++ b/packages/e2e_tests/tests/api/bookmarks.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { assert, beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Bookmarks API", () => { diff --git a/packages/e2e_tests/tests/api/highlights.test.ts b/packages/e2e_tests/tests/api/highlights.test.ts index 94a4d28b..1523dc91 100644 --- a/packages/e2e_tests/tests/api/highlights.test.ts +++ b/packages/e2e_tests/tests/api/highlights.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Highlights API", () => { diff --git a/packages/e2e_tests/tests/api/lists.test.ts b/packages/e2e_tests/tests/api/lists.test.ts index 657d8535..2d6ab98c 100644 --- a/packages/e2e_tests/tests/api/lists.test.ts +++ b/packages/e2e_tests/tests/api/lists.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Lists API", () => { diff --git a/packages/e2e_tests/tests/api/tags.test.ts b/packages/e2e_tests/tests/api/tags.test.ts index dfd3f14b..3355bc1e 100644 --- a/packages/e2e_tests/tests/api/tags.test.ts +++ b/packages/e2e_tests/tests/api/tags.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Tags API", () => { diff --git a/packages/e2e_tests/tests/api/users.test.ts b/packages/e2e_tests/tests/api/users.test.ts index 36c0868d..7fe43894 100644 --- a/packages/e2e_tests/tests/api/users.test.ts +++ b/packages/e2e_tests/tests/api/users.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Users API", () => { diff --git a/packages/e2e_tests/tsconfig.json b/packages/e2e_tests/tsconfig.json index dbd0afdc..a795b96a 100644 --- a/packages/e2e_tests/tsconfig.json +++ b/packages/e2e_tests/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/e2e_tests/utils/trpc.ts b/packages/e2e_tests/utils/trpc.ts index 7d916d93..a13e0a83 100644 --- a/packages/e2e_tests/utils/trpc.ts +++ b/packages/e2e_tests/utils/trpc.ts @@ -1,7 +1,7 @@ import { createTRPCClient, httpBatchLink } from "@trpc/client"; import superjson from "superjson"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export function getTrpcClient(apiKey?: string) { return createTRPCClient<AppRouter>({ diff --git a/packages/open-api/lib/bookmarks.ts b/packages/open-api/lib/bookmarks.ts index a1ab1353..b45d6350 100644 --- a/packages/open-api/lib/bookmarks.ts +++ b/packages/open-api/lib/bookmarks.ts @@ -10,7 +10,7 @@ import { zManipulatedTagSchema, zNewBookmarkRequestSchema, zUpdateBookmarksRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { BearerAuth } from "./common"; import { HighlightSchema } from "./highlights"; diff --git a/packages/open-api/lib/highlights.ts b/packages/open-api/lib/highlights.ts index fc4c2aed..2e4ec2d1 100644 --- a/packages/open-api/lib/highlights.ts +++ b/packages/open-api/lib/highlights.ts @@ -8,7 +8,7 @@ import { zHighlightSchema, zNewHighlightSchema, zUpdateHighlightSchema, -} from "@hoarder/shared/types/highlights"; +} from "@karakeep/shared/types/highlights"; import { BearerAuth } from "./common"; import { PaginationSchema } from "./pagination"; diff --git a/packages/open-api/lib/lists.ts b/packages/open-api/lib/lists.ts index 4b728a1e..c66acef4 100644 --- a/packages/open-api/lib/lists.ts +++ b/packages/open-api/lib/lists.ts @@ -8,7 +8,7 @@ import { zBookmarkListSchema, zEditBookmarkListSchema, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import { BookmarkIdSchema } from "./bookmarks"; import { BearerAuth } from "./common"; diff --git a/packages/open-api/lib/pagination.ts b/packages/open-api/lib/pagination.ts index fe98cd62..dfe835e2 100644 --- a/packages/open-api/lib/pagination.ts +++ b/packages/open-api/lib/pagination.ts @@ -1,7 +1,7 @@ import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi"; import { z } from "zod"; -import { zBookmarkSchema } from "@hoarder/shared/types/bookmarks"; +import { zBookmarkSchema } from "@karakeep/shared/types/bookmarks"; extendZodWithOpenApi(z); diff --git a/packages/open-api/lib/tags.ts b/packages/open-api/lib/tags.ts index 10e49d82..e7e6561d 100644 --- a/packages/open-api/lib/tags.ts +++ b/packages/open-api/lib/tags.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { zGetTagResponseSchema, zUpdateTagRequestSchema, -} from "@hoarder/shared/types/tags"; +} from "@karakeep/shared/types/tags"; import { BearerAuth } from "./common"; import { PaginatedBookmarksSchema, PaginationSchema } from "./pagination"; diff --git a/packages/open-api/lib/users.ts b/packages/open-api/lib/users.ts index 657fcdc8..fa512a80 100644 --- a/packages/open-api/lib/users.ts +++ b/packages/open-api/lib/users.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { zUserStatsResponseSchema, zWhoAmIResponseSchema, -} from "@hoarder/shared/types/users"; +} from "@karakeep/shared/types/users"; import { BearerAuth } from "./common"; diff --git a/packages/open-api/package.json b/packages/open-api/package.json index 2d478018..0059f9bf 100644 --- a/packages/open-api/package.json +++ b/packages/open-api/package.json @@ -1,18 +1,18 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/open-api", + "name": "@karakeep/open-api", "version": "0.1.0", "private": true, "type": "module", "dependencies": { "@asteasolutions/zod-to-openapi": "^7.2.0", - "@hoarder/shared": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", "zod": "^3.22.4" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "tsx": "^4.7.1" }, "scripts": { @@ -25,8 +25,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/open-api/tsconfig.json b/packages/open-api/tsconfig.json index 71bf61e7..d97c8ef4 100644 --- a/packages/open-api/tsconfig.json +++ b/packages/open-api/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/sdk/README.md b/packages/sdk/README.md index 5aad1847..1bfc10ac 100644 --- a/packages/sdk/README.md +++ b/packages/sdk/README.md @@ -1,21 +1,21 @@ -# Hoarder SDK +# Karakeep SDK -This package contains the official typescript SDK for the hoarder API. +This package contains the official typescript SDK for the karakeep API. ## Installation ``` -npm install @hoarderapp/sdk +npm install @karakeep/sdk ``` ## Usage ```typescript -import { createHoarderClient } from "@hoarderapp/sdk"; +import { createHoarderClient } from "@karakeep/sdk"; // Create a client const apiKey = "my-super-secret-key"; -const addr = `https://hoarder.mydomain.com`; +const addr = `https://karakeep.mydomain.com`; const client = createHoarderClient({ baseUrl: `${addr}/api/v1/`, headers: { @@ -56,9 +56,9 @@ console.log(searchResponse.status, searchResults, searchError); ## Docs -API docs can be found [here](https://docs.hoarder.app/api). +API docs can be found [here](https://docs.karakeep.app/api). ## Versioning -- This package follows the minor version of the hoarder server. So new APIs introduced in Hoarder version `0.21.0` will be available in this package starting from version `0.21.0`. -- Hoarder strives to maintain backward compatibility in its APIs, so older versions of this package should continue working with newer hoarder server versions. +- This package follows the minor version of the karakeep server. So new APIs introduced in Karakeep version `0.21.0` will be available in this package starting from version `0.21.0`. +- Karakeep strives to maintain backward compatibility in its APIs, so older versions of this package should continue working with newer karakeep server versions. diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 50ffe075..51408f79 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,8 +1,8 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarderapp/sdk", - "version": "0.23.0", - "description": "Typescript SDK for Hoarder", + "name": "@karakeep/sdk", + "version": "0.23.2", + "description": "Typescript SDK for Karakeep", "license": "GNU Affero General Public License version 3", "keywords": [ "hoarder", @@ -17,9 +17,9 @@ "types": "./dist/index.d.ts" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", "tsx": "^4.7.1", "vite": "^5.1.0", @@ -36,19 +36,19 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/hoarder-app/hoarder.git", + "url": "git+https://github.com/karakeep-app/karakeep.git", "directory": "packages/sdk" }, "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ], "ignorePatterns": [ "src/hoarder-api.d.ts" ] }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", "dependencies": { "openapi-fetch": "^0.13.3" } diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json index bf344404..07b074a3 100644 --- a/packages/sdk/tsconfig.json +++ b/packages/sdk/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["src", "vite.config.mts"], "exclude": ["node_modules", "dist"], "compilerOptions": { diff --git a/packages/shared-react/hooks/bookmark-grid-context.tsx b/packages/shared-react/hooks/bookmark-grid-context.tsx index 7d71d28c..190ccd56 100644 --- a/packages/shared-react/hooks/bookmark-grid-context.tsx +++ b/packages/shared-react/hooks/bookmark-grid-context.tsx @@ -2,7 +2,7 @@ import { createContext, useContext } from "react"; -import type { ZGetBookmarksRequest } from "@hoarder/shared/types/bookmarks"; +import type { ZGetBookmarksRequest } from "@karakeep/shared/types/bookmarks"; export const BookmarkGridContext = createContext< ZGetBookmarksRequest | undefined diff --git a/packages/shared-react/hooks/bookmark-list-context.tsx b/packages/shared-react/hooks/bookmark-list-context.tsx index d00e0567..3eb3a6ad 100644 --- a/packages/shared-react/hooks/bookmark-list-context.tsx +++ b/packages/shared-react/hooks/bookmark-list-context.tsx @@ -2,7 +2,7 @@ import { createContext, useContext } from "react"; -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; export const BookmarkListContext = createContext<ZBookmarkList | undefined>( undefined, diff --git a/packages/shared-react/hooks/lists.ts b/packages/shared-react/hooks/lists.ts index ecb5d408..4dd9bc2b 100644 --- a/packages/shared-react/hooks/lists.ts +++ b/packages/shared-react/hooks/lists.ts @@ -1,8 +1,8 @@ -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; import { listsToTree, ZBookmarkListRoot, -} from "@hoarder/shared/utils/listUtils"; +} from "@karakeep/shared/utils/listUtils"; import { api } from "../trpc"; diff --git a/packages/shared-react/package.json b/packages/shared-react/package.json index 5678274a..8d0d6f64 100644 --- a/packages/shared-react/package.json +++ b/packages/shared-react/package.json @@ -1,19 +1,19 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/shared-react", + "name": "@karakeep/shared-react", "version": "0.1.0", "private": true, "dependencies": { - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", "@tanstack/react-query": "^5.67.1", "@trpc/client": "11.0.0", "superjson": "^2.2.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0" + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0" }, "peerDependencies": { "react": "^18.3.1", @@ -32,9 +32,9 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared-react/trpc.ts b/packages/shared-react/trpc.ts index 99fdd8b5..1478684f 100644 --- a/packages/shared-react/trpc.ts +++ b/packages/shared-react/trpc.ts @@ -2,6 +2,6 @@ import { createTRPCReact } from "@trpc/react-query"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export const api = createTRPCReact<AppRouter>(); diff --git a/packages/shared-react/tsconfig.json b/packages/shared-react/tsconfig.json index 8c3411bf..3d6919d0 100644 --- a/packages/shared-react/tsconfig.json +++ b/packages/shared-react/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "baseUrl": ".", "plugins": [], diff --git a/packages/shared-react/utils/bookmarkUtils.ts b/packages/shared-react/utils/bookmarkUtils.ts index fc0fd97d..1f840f78 100644 --- a/packages/shared-react/utils/bookmarkUtils.ts +++ b/packages/shared-react/utils/bookmarkUtils.ts @@ -2,7 +2,7 @@ import { BookmarkTypes, ZBookmark, ZBookmarkedLink, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { getAssetUrl } from "./assetUtils"; diff --git a/packages/shared/package.json b/packages/shared/package.json index d99de69d..14815c86 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/shared", + "name": "@karakeep/shared", "version": "0.1.0", "private": true, "type": "module", @@ -16,9 +16,9 @@ "zod-to-json-schema": "^3.24.3" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "vitest": "^1.6.1" }, "scripts": { @@ -33,8 +33,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 71bf61e7..d97c8ef4 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/trpc/auth.ts b/packages/trpc/auth.ts index 1efbdde6..f5ce88e5 100644 --- a/packages/trpc/auth.ts +++ b/packages/trpc/auth.ts @@ -1,10 +1,10 @@ import { randomBytes } from "crypto"; import * as bcrypt from "bcryptjs"; -import { db } from "@hoarder/db"; -import { apiKeys } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; -import { authFailureLogger } from "@hoarder/shared/logger"; +import { db } from "@karakeep/db"; +import { apiKeys } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; +import { authFailureLogger } from "@karakeep/shared/logger"; // API Keys diff --git a/packages/trpc/index.ts b/packages/trpc/index.ts index 26d8ea96..e34e56eb 100644 --- a/packages/trpc/index.ts +++ b/packages/trpc/index.ts @@ -2,8 +2,8 @@ import { initTRPC, TRPCError } from "@trpc/server"; import superjson from "superjson"; import { ZodError } from "zod"; -import type { db } from "@hoarder/db"; -import serverConfig from "@hoarder/shared/config"; +import type { db } from "@karakeep/db"; +import serverConfig from "@karakeep/shared/config"; interface User { id: string; diff --git a/packages/trpc/lib/__tests__/search.test.ts b/packages/trpc/lib/__tests__/search.test.ts index 9f8aac88..9d9b39d7 100644 --- a/packages/trpc/lib/__tests__/search.test.ts +++ b/packages/trpc/lib/__tests__/search.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from "vitest"; -import { getInMemoryDB } from "@hoarder/db/drizzle"; +import { getInMemoryDB } from "@karakeep/db/drizzle"; import { bookmarkAssets, bookmarkLinks, @@ -13,9 +13,9 @@ import { rssFeedsTable, tagsOnBookmarks, users, -} from "@hoarder/db/schema"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; -import { Matcher } from "@hoarder/shared/types/search"; +} from "@karakeep/db/schema"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; +import { Matcher } from "@karakeep/shared/types/search"; import { AuthedContext } from "../.."; import { getBookmarkIdsFromMatcher } from "../search"; diff --git a/packages/trpc/lib/attachments.ts b/packages/trpc/lib/attachments.ts index 29c99172..15cbba74 100644 --- a/packages/trpc/lib/attachments.ts +++ b/packages/trpc/lib/attachments.ts @@ -1,7 +1,10 @@ import { z } from "zod"; -import { AssetTypes } from "@hoarder/db/schema"; -import { ZAssetType, zAssetTypesSchema } from "@hoarder/shared/types/bookmarks"; +import { AssetTypes } from "@karakeep/db/schema"; +import { + ZAssetType, + zAssetTypesSchema, +} from "@karakeep/shared/types/bookmarks"; export function mapDBAssetTypeToUserType(assetType: AssetTypes): ZAssetType { const map: Record<AssetTypes, z.infer<typeof zAssetTypesSchema>> = { diff --git a/packages/trpc/lib/search.ts b/packages/trpc/lib/search.ts index 83dfa674..ec582ef9 100644 --- a/packages/trpc/lib/search.ts +++ b/packages/trpc/lib/search.ts @@ -23,8 +23,8 @@ import { rssFeedImportsTable, rssFeedsTable, tagsOnBookmarks, -} from "@hoarder/db/schema"; -import { Matcher } from "@hoarder/shared/types/search"; +} from "@karakeep/db/schema"; +import { Matcher } from "@karakeep/shared/types/search"; import { AuthedContext } from ".."; diff --git a/packages/trpc/models/lists.ts b/packages/trpc/models/lists.ts index 7870bf90..5c87a8bd 100644 --- a/packages/trpc/models/lists.ts +++ b/packages/trpc/models/lists.ts @@ -3,14 +3,14 @@ import { and, count, eq } from "drizzle-orm"; import invariant from "tiny-invariant"; import { z } from "zod"; -import { SqliteError } from "@hoarder/db"; -import { bookmarkLists, bookmarksInLists } from "@hoarder/db/schema"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +import { SqliteError } from "@karakeep/db"; +import { bookmarkLists, bookmarksInLists } from "@karakeep/db/schema"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; import { ZBookmarkList, zEditBookmarkListSchemaWithValidation, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import { AuthedContext } from ".."; import { getBookmarkIdsFromMatcher } from "../lib/search"; diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 28826e7c..8cb74f0b 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/trpc", + "name": "@karakeep/trpc", "version": "0.1.0", "private": true, "type": "module", @@ -13,8 +13,8 @@ "test": "vitest" }, "dependencies": { - "@hoarder/db": "workspace:*", - "@hoarder/shared": "workspace:*", + "@karakeep/db": "workspace:*", + "@karakeep/shared": "workspace:*", "@trpc/server": "11.0.0", "bcryptjs": "^2.4.3", "drizzle-orm": "^0.38.3", @@ -23,9 +23,9 @@ "zod": "^3.22.4" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@types/bcryptjs": "^2.4.6", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" @@ -33,8 +33,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts index 337f050c..9b44f7c9 100644 --- a/packages/trpc/routers/admin.ts +++ b/packages/trpc/routers/admin.ts @@ -2,8 +2,8 @@ import { TRPCError } from "@trpc/server"; import { count, eq, sum } from "drizzle-orm"; import { z } from "zod"; -import { assets, bookmarkLinks, bookmarks, users } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; +import { assets, bookmarkLinks, bookmarks, users } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; import { AssetPreprocessingQueue, FeedQueue, @@ -15,12 +15,12 @@ import { triggerSearchReindex, VideoWorkerQueue, WebhookQueue, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; import { changeRoleSchema, resetPasswordSchema, zAdminCreateUserSchema, -} from "@hoarder/shared/types/admin"; +} from "@karakeep/shared/types/admin"; import { hashPassword } from "../auth"; import { adminProcedure, router } from "../index"; diff --git a/packages/trpc/routers/apiKeys.ts b/packages/trpc/routers/apiKeys.ts index c55dc095..eb52189b 100644 --- a/packages/trpc/routers/apiKeys.ts +++ b/packages/trpc/routers/apiKeys.ts @@ -2,8 +2,8 @@ import { TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { apiKeys } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; +import { apiKeys } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; import { authenticateApiKey, diff --git a/packages/trpc/routers/assets.test.ts b/packages/trpc/routers/assets.test.ts index d7db35be..822e48b1 100644 --- a/packages/trpc/routers/assets.test.ts +++ b/packages/trpc/routers/assets.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, test } from "vitest"; -import { assets, AssetTypes } from "@hoarder/db/schema"; -import { BookmarkTypes, ZAssetType } from "@hoarder/shared/types/bookmarks"; +import { assets, AssetTypes } from "@karakeep/db/schema"; +import { BookmarkTypes, ZAssetType } from "@karakeep/shared/types/bookmarks"; import type { CustomTestContext } from "../testUtils"; import { defaultBeforeEach } from "../testUtils"; diff --git a/packages/trpc/routers/assets.ts b/packages/trpc/routers/assets.ts index 45eac068..af508a4e 100644 --- a/packages/trpc/routers/assets.ts +++ b/packages/trpc/routers/assets.ts @@ -2,12 +2,12 @@ import { TRPCError } from "@trpc/server"; import { and, desc, eq, sql } from "drizzle-orm"; import { z } from "zod"; -import { assets, bookmarks } from "@hoarder/db/schema"; -import { deleteAsset } from "@hoarder/shared/assetdb"; +import { assets, bookmarks } from "@karakeep/db/schema"; +import { deleteAsset } from "@karakeep/shared/assetdb"; import { zAssetSchema, zAssetTypesSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { authedProcedure, Context, router } from "../index"; import { diff --git a/packages/trpc/routers/bookmarks.test.ts b/packages/trpc/routers/bookmarks.test.ts index c3469acc..f83ec5aa 100644 --- a/packages/trpc/routers/bookmarks.test.ts +++ b/packages/trpc/routers/bookmarks.test.ts @@ -1,7 +1,7 @@ import { assert, beforeEach, describe, expect, test } from "vitest"; -import { bookmarks } from "@hoarder/db/schema"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { bookmarks } from "@karakeep/db/schema"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import type { CustomTestContext } from "../testUtils"; import { defaultBeforeEach } from "../testUtils"; diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts index 5e6df4a5..fdb99257 100644 --- a/packages/trpc/routers/bookmarks.ts +++ b/packages/trpc/routers/bookmarks.ts @@ -18,9 +18,9 @@ import { z } from "zod"; import type { ZBookmark, ZBookmarkContent, -} from "@hoarder/shared/types/bookmarks"; -import type { ZBookmarkTags } from "@hoarder/shared/types/tags"; -import { db as DONT_USE_db } from "@hoarder/db"; +} from "@karakeep/shared/types/bookmarks"; +import type { ZBookmarkTags } from "@karakeep/shared/types/tags"; +import { db as DONT_USE_db } from "@karakeep/db"; import { assets, AssetTypes, @@ -33,14 +33,14 @@ import { customPrompts, rssFeedImportsTable, tagsOnBookmarks, -} from "@hoarder/db/schema"; +} from "@karakeep/db/schema"; import { deleteAsset, SUPPORTED_BOOKMARK_ASSET_TYPES, -} from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import { InferenceClientFactory } from "@hoarder/shared/inference"; -import { buildSummaryPrompt } from "@hoarder/shared/prompts"; +} from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import { InferenceClientFactory } from "@karakeep/shared/inference"; +import { buildSummaryPrompt } from "@karakeep/shared/prompts"; import { AssetPreprocessingQueue, LinkCrawlerQueue, @@ -48,9 +48,9 @@ import { triggerSearchDeletion, triggerSearchReindex, triggerWebhook, -} from "@hoarder/shared/queues"; -import { getSearchIdxClient } from "@hoarder/shared/search"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +} from "@karakeep/shared/queues"; +import { getSearchIdxClient } from "@karakeep/shared/search"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; import { BookmarkTypes, DEFAULT_NUM_BOOKMARKS_PER_PAGE, @@ -62,7 +62,7 @@ import { zSearchBookmarksCursor, zSearchBookmarksRequestSchema, zUpdateBookmarksRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import type { AuthedContext, Context } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/feeds.ts b/packages/trpc/routers/feeds.ts index e5520474..819ba8ef 100644 --- a/packages/trpc/routers/feeds.ts +++ b/packages/trpc/routers/feeds.ts @@ -2,13 +2,13 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { rssFeedsTable } from "@hoarder/db/schema"; -import { FeedQueue } from "@hoarder/shared/queues"; +import { rssFeedsTable } from "@karakeep/db/schema"; +import { FeedQueue } from "@karakeep/shared/queues"; import { zFeedSchema, zNewFeedSchema, zUpdateFeedSchema, -} from "@hoarder/shared/types/feeds"; +} from "@karakeep/shared/types/feeds"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/routers/highlights.ts b/packages/trpc/routers/highlights.ts index 86da560b..3436653e 100644 --- a/packages/trpc/routers/highlights.ts +++ b/packages/trpc/routers/highlights.ts @@ -2,15 +2,15 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, desc, eq, lt, lte, or } from "drizzle-orm"; import { z } from "zod"; -import { highlights } from "@hoarder/db/schema"; +import { highlights } from "@karakeep/db/schema"; import { DEFAULT_NUM_HIGHLIGHTS_PER_PAGE, zGetAllHighlightsResponseSchema, zHighlightSchema, zNewHighlightSchema, zUpdateHighlightSchema, -} from "@hoarder/shared/types/highlights"; -import { zCursorV2 } from "@hoarder/shared/types/pagination"; +} from "@karakeep/shared/types/highlights"; +import { zCursorV2 } from "@karakeep/shared/types/pagination"; import { authedProcedure, Context, router } from "../index"; import { ensureBookmarkOwnership } from "./bookmarks"; diff --git a/packages/trpc/routers/lists.ts b/packages/trpc/routers/lists.ts index f9e382f2..f988eb8b 100644 --- a/packages/trpc/routers/lists.ts +++ b/packages/trpc/routers/lists.ts @@ -5,7 +5,7 @@ import { zBookmarkListSchema, zEditBookmarkListSchemaWithValidation, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import type { AuthedContext } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/prompts.ts b/packages/trpc/routers/prompts.ts index 629d5829..d3942e69 100644 --- a/packages/trpc/routers/prompts.ts +++ b/packages/trpc/routers/prompts.ts @@ -2,12 +2,12 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { customPrompts } from "@hoarder/db/schema"; +import { customPrompts } from "@karakeep/db/schema"; import { zNewPromptSchema, zPromptSchema, zUpdatePromptSchema, -} from "@hoarder/shared/types/prompts"; +} from "@karakeep/shared/types/prompts"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/routers/tags.ts b/packages/trpc/routers/tags.ts index c080bad8..7378c66f 100644 --- a/packages/trpc/routers/tags.ts +++ b/packages/trpc/routers/tags.ts @@ -2,14 +2,14 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq, inArray, notExists } from "drizzle-orm"; import { z } from "zod"; -import type { ZAttachedByEnum } from "@hoarder/shared/types/tags"; -import { SqliteError } from "@hoarder/db"; -import { bookmarkTags, tagsOnBookmarks } from "@hoarder/db/schema"; -import { triggerSearchReindex } from "@hoarder/shared/queues"; +import type { ZAttachedByEnum } from "@karakeep/shared/types/tags"; +import { SqliteError } from "@karakeep/db"; +import { bookmarkTags, tagsOnBookmarks } from "@karakeep/db/schema"; +import { triggerSearchReindex } from "@karakeep/shared/queues"; import { zGetTagResponseSchema, zUpdateTagRequestSchema, -} from "@hoarder/shared/types/tags"; +} from "@karakeep/shared/types/tags"; import type { Context } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts index a78ec9b4..75a1db0c 100644 --- a/packages/trpc/routers/users.ts +++ b/packages/trpc/routers/users.ts @@ -3,21 +3,21 @@ import { and, count, eq } from "drizzle-orm"; import invariant from "tiny-invariant"; import { z } from "zod"; -import { SqliteError } from "@hoarder/db"; +import { SqliteError } from "@karakeep/db"; import { bookmarkLists, bookmarks, bookmarkTags, highlights, users, -} from "@hoarder/db/schema"; -import { deleteUserAssets } from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; +} from "@karakeep/db/schema"; +import { deleteUserAssets } from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; import { zSignUpSchema, zUserStatsResponseSchema, zWhoAmIResponseSchema, -} from "@hoarder/shared/types/users"; +} from "@karakeep/shared/types/users"; import { hashPassword, validatePassword } from "../auth"; import { diff --git a/packages/trpc/routers/webhooks.ts b/packages/trpc/routers/webhooks.ts index 173e4f5a..ab2a6908 100644 --- a/packages/trpc/routers/webhooks.ts +++ b/packages/trpc/routers/webhooks.ts @@ -2,12 +2,12 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { webhooksTable } from "@hoarder/db/schema"; +import { webhooksTable } from "@karakeep/db/schema"; import { zNewWebhookSchema, zUpdateWebhookSchema, zWebhookSchema, -} from "@hoarder/shared/types/webhooks"; +} from "@karakeep/shared/types/webhooks"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/testUtils.ts b/packages/trpc/testUtils.ts index 23dcdb33..b8b6ac8d 100644 --- a/packages/trpc/testUtils.ts +++ b/packages/trpc/testUtils.ts @@ -1,5 +1,5 @@ -import { getInMemoryDB } from "@hoarder/db/drizzle"; -import { users } from "@hoarder/db/schema"; +import { getInMemoryDB } from "@karakeep/db/drizzle"; +import { users } from "@karakeep/db/schema"; import { createCallerFactory } from "./index"; import { appRouter } from "./routers/_app"; diff --git a/packages/trpc/tsconfig.json b/packages/trpc/tsconfig.json index dbd0afdc..a795b96a 100644 --- a/packages/trpc/tsconfig.json +++ b/packages/trpc/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { |