From 2ed134e6f4a1e0d749f78f8285b5bcd7119327b7 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Sun, 5 May 2024 14:38:10 +0100 Subject: [PATCH] fix(cli): Remove limit from array length when listing bookmarks. Fixes #135 --- apps/cli/package.json | 2 +- apps/cli/src/commands/bookmarks.ts | 6 ++++-- packages/shared/types/bookmarks.ts | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/cli/package.json b/apps/cli/package.json index 4500e75a..bee5ef37 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@hoarderapp/cli", - "version": "0.13.2", + "version": "0.13.3", "description": "Command Line Interface (CLI) for Hoarder", "license": "GNU Affero General Public License version 3", "keywords": [ diff --git a/apps/cli/src/commands/bookmarks.ts b/apps/cli/src/commands/bookmarks.ts index 5c7a160e..a9029f44 100644 --- a/apps/cli/src/commands/bookmarks.ts +++ b/apps/cli/src/commands/bookmarks.ts @@ -4,6 +4,7 @@ import { Command } from "@commander-js/extra-typings"; import chalk from "chalk"; import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { MAX_NUM_BOOKMARKS_PER_PAGE } from "@hoarder/shared/types/bookmarks"; export const bookmarkCmd = new Command() .name("bookmarks") @@ -121,10 +122,11 @@ bookmarkCmd const request = { archived: opts.includeArchived ? undefined : false, listId: opts.listId, + limit: MAX_NUM_BOOKMARKS_PER_PAGE, }; - let results: ZBookmark[] = []; let resp = await api.bookmarks.getBookmarks.query(request); + let results: ZBookmark[] = resp.bookmarks; while (resp.nextCursor) { resp = await api.bookmarks.getBookmarks.query({ @@ -134,7 +136,7 @@ bookmarkCmd results = [...results, ...resp.bookmarks]; } - console.log(results.map(normalizeBookmark)); + console.dir(results.map(normalizeBookmark), { maxArrayLength: null }); }); bookmarkCmd diff --git a/packages/shared/types/bookmarks.ts b/packages/shared/types/bookmarks.ts index f58473b4..1511db48 100644 --- a/packages/shared/types/bookmarks.ts +++ b/packages/shared/types/bookmarks.ts @@ -89,6 +89,7 @@ export type ZNewBookmarkRequest = z.infer; // GET /v1/bookmarks export const DEFAULT_NUM_BOOKMARKS_PER_PAGE = 20; +export const MAX_NUM_BOOKMARKS_PER_PAGE = 100; export const zGetBookmarksRequestSchema = z.object({ ids: z.array(z.string()).optional(), @@ -96,7 +97,7 @@ export const zGetBookmarksRequestSchema = z.object({ favourited: z.boolean().optional(), tagId: z.string().optional(), listId: z.string().optional(), - limit: z.number().max(100).optional(), + limit: z.number().max(MAX_NUM_BOOKMARKS_PER_PAGE).optional(), cursor: z.date().nullish(), }); export type ZGetBookmarksRequest = z.infer;