From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
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)
---
 server/models/shared/sql.ts | 68 ---------------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 server/models/shared/sql.ts

(limited to 'server/models/shared/sql.ts')

diff --git a/server/models/shared/sql.ts b/server/models/shared/sql.ts
deleted file mode 100644
index 5aaeb49f0..000000000
--- a/server/models/shared/sql.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { literal, Model, ModelStatic } from 'sequelize'
-import { forceNumber } from '@shared/core-utils'
-import { AttributesOnly } from '@shared/typescript-utils'
-
-function buildLocalAccountIdsIn () {
-  return literal(
-    '(SELECT "account"."id" FROM "account" INNER JOIN "actor" ON "actor"."id" = "account"."actorId" AND "actor"."serverId" IS NULL)'
-  )
-}
-
-function buildLocalActorIdsIn () {
-  return literal(
-    '(SELECT "actor"."id" FROM "actor" WHERE "actor"."serverId" IS NULL)'
-  )
-}
-
-function buildBlockedAccountSQL (blockerIds: number[]) {
-  const blockerIdsString = blockerIds.join(', ')
-
-  return 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' +
-    ' UNION ' +
-    'SELECT "account"."id" AS "id" FROM account INNER JOIN "actor" ON account."actorId" = actor.id ' +
-    'INNER JOIN "serverBlocklist" ON "actor"."serverId" = "serverBlocklist"."targetServerId" ' +
-    'WHERE "serverBlocklist"."accountId" IN (' + blockerIdsString + ')'
-}
-
-function buildServerIdsFollowedBy (actorId: any) {
-  const actorIdNumber = forceNumber(actorId)
-
-  return '(' +
-    'SELECT "actor"."serverId" FROM "actorFollow" ' +
-    'INNER JOIN "actor" ON actor.id = "actorFollow"."targetActorId" ' +
-    'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
-    ')'
-}
-
-function buildSQLAttributes<M extends Model> (options: {
-  model: ModelStatic<M>
-  tableName: string
-
-  excludeAttributes?: Exclude<keyof AttributesOnly<M>, symbol>[]
-  aliasPrefix?: string
-}) {
-  const { model, tableName, aliasPrefix, excludeAttributes } = options
-
-  const attributes = Object.keys(model.getAttributes()) as Exclude<keyof AttributesOnly<M>, symbol>[]
-
-  return attributes
-    .filter(a => {
-      if (!excludeAttributes) return true
-      if (excludeAttributes.includes(a)) return false
-
-      return true
-    })
-    .map(a => {
-      return `"${tableName}"."${a}" AS "${aliasPrefix || ''}${a}"`
-    })
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  buildSQLAttributes,
-  buildBlockedAccountSQL,
-  buildServerIdsFollowedBy,
-  buildLocalAccountIdsIn,
-  buildLocalActorIdsIn
-}
-- 
cgit v1.2.3