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) --- shared/core-utils/common/object.ts | 86 -------------------------------------- 1 file changed, 86 deletions(-) delete mode 100644 shared/core-utils/common/object.ts (limited to 'shared/core-utils/common/object.ts') diff --git a/shared/core-utils/common/object.ts b/shared/core-utils/common/object.ts deleted file mode 100644 index 1276bfcc7..000000000 --- a/shared/core-utils/common/object.ts +++ /dev/null @@ -1,86 +0,0 @@ -function pick (object: O, keys: K[]): Pick { - const result: any = {} - - for (const key of keys) { - if (Object.prototype.hasOwnProperty.call(object, key)) { - result[key] = object[key] - } - } - - return result -} - -function omit (object: O, keys: K[]): Exclude { - const result: any = {} - const keysSet = new Set(keys) as Set - - for (const [ key, value ] of Object.entries(object)) { - if (keysSet.has(key)) continue - - result[key] = value - } - - return result -} - -function objectKeysTyped (object: O): K[] { - return (Object.keys(object) as K[]) -} - -function getKeys (object: O, keys: K[]): K[] { - return (Object.keys(object) as K[]).filter(k => keys.includes(k)) -} - -function hasKey (obj: T, k: keyof any): k is keyof T { - return k in obj -} - -function sortObjectComparator (key: string, order: 'asc' | 'desc') { - return (a: any, b: any) => { - if (a[key] < b[key]) { - return order === 'asc' ? -1 : 1 - } - - if (a[key] > b[key]) { - return order === 'asc' ? 1 : -1 - } - - return 0 - } -} - -function shallowCopy (o: T): T { - return Object.assign(Object.create(Object.getPrototypeOf(o)), o) -} - -function simpleObjectsDeepEqual (a: any, b: any) { - if (a === b) return true - - if (typeof a !== 'object' || typeof b !== 'object' || a === null || b === null) { - return false - } - - const keysA = Object.keys(a) - const keysB = Object.keys(b) - - if (keysA.length !== keysB.length) return false - - for (const key of keysA) { - if (!keysB.includes(key)) return false - - if (!simpleObjectsDeepEqual(a[key], b[key])) return false - } - - return true -} - -export { - pick, - omit, - objectKeysTyped, - getKeys, - hasKey, - shallowCopy, - sortObjectComparator, - simpleObjectsDeepEqual -} -- cgit v1.2.3