diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/helpers/query.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/helpers/query.ts')
-rw-r--r-- | server/helpers/query.ts | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/server/helpers/query.ts b/server/helpers/query.ts deleted file mode 100644 index c0f78368f..000000000 --- a/server/helpers/query.ts +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | import { pick } from '@shared/core-utils' | ||
2 | import { | ||
3 | VideoChannelsSearchQueryAfterSanitize, | ||
4 | VideoPlaylistsSearchQueryAfterSanitize, | ||
5 | VideosCommonQueryAfterSanitize, | ||
6 | VideosSearchQueryAfterSanitize | ||
7 | } from '@shared/models' | ||
8 | |||
9 | function pickCommonVideoQuery (query: VideosCommonQueryAfterSanitize) { | ||
10 | return pick(query, [ | ||
11 | 'start', | ||
12 | 'count', | ||
13 | 'sort', | ||
14 | 'nsfw', | ||
15 | 'isLive', | ||
16 | 'categoryOneOf', | ||
17 | 'licenceOneOf', | ||
18 | 'languageOneOf', | ||
19 | 'privacyOneOf', | ||
20 | 'tagsOneOf', | ||
21 | 'tagsAllOf', | ||
22 | 'isLocal', | ||
23 | 'include', | ||
24 | 'skipCount', | ||
25 | 'hasHLSFiles', | ||
26 | 'hasWebtorrentFiles', // TODO: Remove in v7 | ||
27 | 'hasWebVideoFiles', | ||
28 | 'search', | ||
29 | 'excludeAlreadyWatched' | ||
30 | ]) | ||
31 | } | ||
32 | |||
33 | function pickSearchVideoQuery (query: VideosSearchQueryAfterSanitize) { | ||
34 | return { | ||
35 | ...pickCommonVideoQuery(query), | ||
36 | |||
37 | ...pick(query, [ | ||
38 | 'searchTarget', | ||
39 | 'host', | ||
40 | 'startDate', | ||
41 | 'endDate', | ||
42 | 'originallyPublishedStartDate', | ||
43 | 'originallyPublishedEndDate', | ||
44 | 'durationMin', | ||
45 | 'durationMax', | ||
46 | 'uuids', | ||
47 | 'excludeAlreadyWatched' | ||
48 | ]) | ||
49 | } | ||
50 | } | ||
51 | |||
52 | function pickSearchChannelQuery (query: VideoChannelsSearchQueryAfterSanitize) { | ||
53 | return pick(query, [ | ||
54 | 'searchTarget', | ||
55 | 'search', | ||
56 | 'start', | ||
57 | 'count', | ||
58 | 'sort', | ||
59 | 'host', | ||
60 | 'handles' | ||
61 | ]) | ||
62 | } | ||
63 | |||
64 | function pickSearchPlaylistQuery (query: VideoPlaylistsSearchQueryAfterSanitize) { | ||
65 | return pick(query, [ | ||
66 | 'searchTarget', | ||
67 | 'search', | ||
68 | 'start', | ||
69 | 'count', | ||
70 | 'sort', | ||
71 | 'host', | ||
72 | 'uuids' | ||
73 | ]) | ||
74 | } | ||
75 | |||
76 | export { | ||
77 | pickCommonVideoQuery, | ||
78 | pickSearchVideoQuery, | ||
79 | pickSearchPlaylistQuery, | ||
80 | pickSearchChannelQuery | ||
81 | } | ||