From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: 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) --- packages/models/src/videos/studio/index.ts | 1 + .../studio/video-studio-create-edit.model.ts | 60 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 packages/models/src/videos/studio/index.ts create mode 100644 packages/models/src/videos/studio/video-studio-create-edit.model.ts (limited to 'packages/models/src/videos/studio') diff --git a/packages/models/src/videos/studio/index.ts b/packages/models/src/videos/studio/index.ts new file mode 100644 index 000000000..0d8ad3227 --- /dev/null +++ b/packages/models/src/videos/studio/index.ts @@ -0,0 +1 @@ +export * from './video-studio-create-edit.model.js' diff --git a/packages/models/src/videos/studio/video-studio-create-edit.model.ts b/packages/models/src/videos/studio/video-studio-create-edit.model.ts new file mode 100644 index 000000000..5e8296dc9 --- /dev/null +++ b/packages/models/src/videos/studio/video-studio-create-edit.model.ts @@ -0,0 +1,60 @@ +export interface VideoStudioCreateEdition { + tasks: VideoStudioTask[] +} + +export type VideoStudioTask = + VideoStudioTaskCut | + VideoStudioTaskIntro | + VideoStudioTaskOutro | + VideoStudioTaskWatermark + +export interface VideoStudioTaskCut { + name: 'cut' + + options: { + start?: number + end?: number + } +} + +export interface VideoStudioTaskIntro { + name: 'add-intro' + + options: { + file: Blob | string + } +} + +export interface VideoStudioTaskOutro { + name: 'add-outro' + + options: { + file: Blob | string + } +} + +export interface VideoStudioTaskWatermark { + name: 'add-watermark' + + options: { + file: Blob | string + } +} + +// --------------------------------------------------------------------------- + +export function isVideoStudioTaskIntro (v: VideoStudioTask): v is VideoStudioTaskIntro { + return v.name === 'add-intro' +} + +export function isVideoStudioTaskOutro (v: VideoStudioTask): v is VideoStudioTaskOutro { + return v.name === 'add-outro' +} + +export function isVideoStudioTaskWatermark (v: VideoStudioTask): v is VideoStudioTaskWatermark { + return v.name === 'add-watermark' +} + +export function hasVideoStudioTaskFile (v: VideoStudioTask): v is VideoStudioTaskIntro | VideoStudioTaskOutro | VideoStudioTaskWatermark { + return isVideoStudioTaskIntro(v) || isVideoStudioTaskOutro(v) || isVideoStudioTaskWatermark(v) +} -- cgit v1.2.3