11635936998

Committed 01 Nov 2024 08:31PM UTC coverage: 53.379% (+2.0%) from 51.385%

Build # 11635936998

Build Type

push

github

Committed by

bcomnes

Commit Message

WIP TS Refactor, checking in sooner than later

Bump @fastify/cookie from 10.0.1 to 11.0.1

Bumps [@fastify/cookie](https://github.com/fastify/fastify-cookie) from 10.0.1 to 11.0.1.
- [Release notes](https://github.com/fastify/fastify-cookie/releases)
- [Commits](https://github.com/fastify/fastify-cookie/compare/v10.0.1...v11.0.1)

---
updated-dependencies:
- dependency-name: "@fastify/cookie"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

2024.10.17

More refactors

Even more refactors

Type out the yt-dlp plugin

Type prom plugin

User route type fixes

More refectors

More refactors

Switch to custompatch

More types

More types

Remove copy pasted comment

More refactors

Run Details

213 of 466 branches covered (45.71%)

Branch coverage included in aggregate %.

1696 of 2002 new or added lines in 120 files covered. (84.72%)

8 existing lines in 8 files now uncovered.

8807 of 16432 relevant lines covered (53.6%)

0.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

61.01

/packages/web/routes/api/bookmarks/get-bookmarks.js

/**
 * @import { FastifyPluginAsyncJsonSchemaToTs } from '@bret/type-provider-json-schema-to-ts'
 * @import { SchemaBookmarkRead } from './schemas/schema-bookmark-read.js'
 * @import { GetBookmarksQueryParams } from './get-bookmarks-query.js'
 */

import { getBookmarks } from './get-bookmarks-query.js'
import { addMillisecond } from './addMillisecond.js'

/**
 * @type {FastifyPluginAsyncJsonSchemaToTs<{
 *   references: [ SchemaBookmarkRead ],
 *   deserialize: [{ pattern: { type: 'string'; format: 'date-time'; }; output: Date; }]
*  }>}
*/
export async function getBookmarksHandler (fastify) {
  fastify.get(
    '/',
    {
      preHandler: fastify.auth([fastify.verifyJWT]),
      schema: {
        tags: ['bookmarks'],

        querystring: {
          type: 'object',
          properties: {
            before: {
              type: 'string',
              format: 'date-time',
            },
            after: {
              type: 'string',
              format: 'date-time',
            },
            per_page: {
              type: 'integer',
              minimum: 1,
              maximum: 200,
              default: 20,
            },
            url: {
              type: 'string',
              format: 'uri',
            },
            tag: {
              type: 'string', minLength: 1, maxLength: 255,
            },
            sensitive: {
              type: 'boolean',
              default: false,
            },
            starred: {
              type: 'boolean',
              default: false,
            },
            toread: {
              type: 'boolean',
              default: false,
            },
          },
          dependencies: {
            before: { allOf: [{ not: { required: ['after', 'url'] } }] },
            after: { allOf: [{ not: { required: ['before', 'url'] } }] },
          },
        },

        response: {
          200: {
            type: 'object',
            unevaluatedProperties: false,
            properties: {
              data: {
                type: 'array',
                items: {
                  $ref: 'schema:breadcrum:bookmark:read',
                }
              },
              pagination: {
                type: 'object',
                properties: {
                  before: { type: ['string', 'null'], format: 'date-time' },
                  after: { type: ['string', 'null'], format: 'date-time' },
                  top: { type: 'boolean' },
                  bottom: { type: 'boolean' },
                },
              },
            },
          },
        },
      },

    },
    // Get Bookmarks
    async function getBookmarksHandler (request, reply) {
      const userId = request.user.id
      const {
        before,
        after,
        per_page: perPage,
        url,
        tag,
        sensitive,
        starred,
        toread,
      } = request.query

      /** @type {GetBookmarksQueryParams} */
      const bookmarkParams = {
        ownerId: userId,
        sensitive,
        starred,
        toread,
        perPage: perPage + 1,
      }

      if (tag) bookmarkParams.tag = tag
      if (before) bookmarkParams.before = before
      if (after) bookmarkParams.after = after
      if (url) bookmarkParams.url = url

      const rows = await getBookmarks({ fastify, ...bookmarkParams })

      const top = Boolean(
        (!before && !after) ||
        (after && rows.length <= perPage)
      )
      const bottom = Boolean(
        (before && rows.length <= perPage) ||
        (!before && !after && rows.length <= perPage)
      )

      if (rows.length > perPage) {
        if (after) {
          rows.shift()
        } else {
          rows.pop()
        }
      }

      const nextPage = bottom ? null : rows.at(-1)?.created_at ?? null
      const prevPage = top ? null : addMillisecond(rows[0]?.created_at)

      const response = {
        data: rows,
        pagination: {
          before: nextPage,
          after: prevPage,
          top,
          bottom,
        },
      }

      reply.status(200)

      return response
    }
  )
}

1	/**	1✔
2	* @import { FastifyPluginAsyncJsonSchemaToTs } from '@bret/type-provider-json-schema-to-ts'	1✔
3	* @import { SchemaBookmarkRead } from './schemas/schema-bookmark-read.js'	1✔
4	* @import { GetBookmarksQueryParams } from './get-bookmarks-query.js'	1✔
5	*/	1✔
6		1✔
7	import { getBookmarks } from './get-bookmarks-query.js'	1✔
8	import { addMillisecond } from './addMillisecond.js'	1✔
9		1✔
10	/**	1✔
11	* @type {FastifyPluginAsyncJsonSchemaToTs<{	1✔
12	* references: [ SchemaBookmarkRead ],	1✔
13	* deserialize: [{ pattern: { type: 'string'; format: 'date-time'; }; output: Date; }]	1✔
14	* }>}	1✔
15	*/	1✔
16	export async function getBookmarksHandler (fastify) {	1✔
17	fastify.get(	2✔
18	'/',	2✔
19	{	2✔
20	preHandler: fastify.auth([fastify.verifyJWT]),	2✔
21	schema: {	2✔
22	tags: ['bookmarks'],	2✔
23		2✔
24	querystring: {	2✔
25	type: 'object',	2✔
26	properties: {	2✔
27	before: {	2✔
28	type: 'string',	2✔
29	format: 'date-time',	2✔
30	},	2✔
31	after: {	2✔
32	type: 'string',	2✔
33	format: 'date-time',	2✔
34	},	2✔
35	per_page: {	2✔
36	type: 'integer',	2✔
37	minimum: 1,	2✔
38	maximum: 200,	2✔
39	default: 20,	2✔
40	},	2✔
41	url: {	2✔
42	type: 'string',	2✔
43	format: 'uri',	2✔
44	},	2✔
45	tag: {	2✔
46	type: 'string', minLength: 1, maxLength: 255,	2✔
47	},	2✔
48	sensitive: {	2✔
49	type: 'boolean',	2✔
50	default: false,	2✔
51	},	2✔
52	starred: {	2✔
53	type: 'boolean',	2✔
54	default: false,	2✔
55	},	2✔
56	toread: {	2✔
57	type: 'boolean',	2✔
58	default: false,	2✔
59	},	2✔
60	},	2✔
61	dependencies: {	2✔
62	before: { allOf: [{ not: { required: ['after', 'url'] } }] },	2✔
63	after: { allOf: [{ not: { required: ['before', 'url'] } }] },	2✔
64	},	2✔
65	},	2✔
66		2✔
67	response: {	2✔
68	200: {	2✔
69	type: 'object',	2✔
70	unevaluatedProperties: false,	2✔
71	properties: {	2✔
72	data: {	2✔
73	type: 'array',	2✔
74	items: {	2✔
75	$ref: 'schema:breadcrum:bookmark:read',	2✔
76	}	2✔
77	},	2✔
78	pagination: {	2✔
79	type: 'object',	2✔
80	properties: {	2✔
81	before: { type: ['string', 'null'], format: 'date-time' },	2✔
82	after: { type: ['string', 'null'], format: 'date-time' },	2✔
83	top: { type: 'boolean' },	2✔
84	bottom: { type: 'boolean' },	2✔
85	},	2✔
86	},	2✔
87	},	2✔
88	},	2✔
89	},	2✔
90	},	2✔
91		2✔
92	},	2✔
93	// Get Bookmarks	2✔
94	async function getBookmarksHandler (request, reply) {	2✔
95	const userId = request.user.id	×
96	const {	×
97	before,	×
98	after,	×
99	per_page: perPage,	×
100	url,	×
101	tag,	×
102	sensitive,	×
103	starred,	×
104	toread,	×
105	} = request.query	×
106		×
NEW 107	/** @type {GetBookmarksQueryParams} */	×
NEW 108	const bookmarkParams = {	×
109	ownerId: userId,	×
110	sensitive,	×
111	starred,	×
112	toread,	×
113	perPage: perPage + 1,	×
NEW 114	}	×
115		×
NEW 116	if (tag) bookmarkParams.tag = tag	×
NEW 117	if (before) bookmarkParams.before = before	×
NEW 118	if (after) bookmarkParams.after = after	×
NEW 119	if (url) bookmarkParams.url = url	×
NEW 120		×
NEW 121	const rows = await getBookmarks({ fastify, ...bookmarkParams })	×
122		×
123	const top = Boolean(	×
124	(!before && !after) \|\|	×
NEW 125	(after && rows.length <= perPage)	×
126	)	×
127	const bottom = Boolean(	×
NEW 128	(before && rows.length <= perPage) \|\|	×
NEW 129	(!before && !after && rows.length <= perPage)	×
130	)	×
131		×
NEW 132	if (rows.length > perPage) {	×
133	if (after) {	×
NEW 134	rows.shift()	×
135	} else {	×
NEW 136	rows.pop()	×
137	}	×
138	}	×
139		×
NEW 140	const nextPage = bottom ? null : rows.at(-1)?.created_at ?? null	×
NEW 141	const prevPage = top ? null : addMillisecond(rows[0]?.created_at)	×
142		×
143	const response = {	×
NEW 144	data: rows,	×
145	pagination: {	×
146	before: nextPage,	×
147	after: prevPage,	×
148	top,	×
149	bottom,	×
150	},	×
151	}	×
152		×
NEW 153	reply.status(200)	×
NEW 154		×
155	return response	×
156	}	×
157	)	2✔
158	}	2✔

hifiwi-fi / breadcrum.net / 11635936998

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous