chore: refactor package structure

.vscode/launch.json

@@ -8,7 +8,7 @@
             "request": "launch",
             "name": "server",
             "type": "node",
-            "program": "${workspaceFolder}/src/index.ts",
+            "program": "${workspaceFolder}/src/server.ts",
             "cwd": "${workspaceFolder}",
             "runtimeExecutable": "deno",
             "runtimeArgs": [

Dockerfile

@@ -8,14 +8,14 @@ RUN apt-get upgrade -y
 RUN apt-get install unzip
 
 FROM scaffold AS cache
-RUN deno cache src/index.ts
+RUN deno cache src/server.ts
 
 # Fallback and compilation has broken in some instances
-#ENTRYPOINT ["deno", "run", "--allow-net", "--allow-env", "--allow-read", "--allow-sys", "src/index.ts"]
+#ENTRYPOINT ["deno", "run", "--allow-net", "--allow-env", "--allow-read", "--allow-sys", "src/server.ts"]
 
 FROM cache AS build
-RUN deno check src/index.ts
-RUN deno compile --allow-net --allow-env --allow-read --allow-sys --output=/usr/on-the-edge src/index.ts 
+RUN deno check src/server.ts
+RUN deno compile --allow-net --allow-env --allow-read --allow-sys --output=/usr/on-the-edge src/server.ts 
 
 FROM build AS final
 RUN rm -r /usr/app

deno.json

@@ -18,9 +18,9 @@
     "proseWrap": "preserve"
   },
   "tasks": {
-    "check": "deno check src/index.ts",
+    "check": "deno check src/server.ts",
     "test": "deno test --allow-read --allow-env --allow-net",
-    "start": "deno run --allow-read --allow-env --allow-net --allow-sys ./src/index.ts",
+    "start": "deno run --allow-read --allow-env --allow-net --allow-sys ./src/server.ts",
     "check-deps": "deno run -A jsr:@check/deps"
   }
 }

src/config/index.ts

@@ -1,12 +1,12 @@
 import { AppContext, ErrorResponse } from '../common/types/core.ts';
-import { Repository } from './repository/index.ts';
+import { ConfigRepository } from './repository/index.ts';
 import { LocalSource } from './local/index.ts';
 import { collection } from '../common/mongo/index.ts';
-import { Status } from 'jsr:@oak/[email protected]/status';
+import { Status } from 'oak';
 
 export const config = async ({ state, response }: AppContext) => {
   const localSource = new LocalSource(collection('config', state.local));
-  const repository = new Repository(
+  const repository = new ConfigRepository(
     state.features,
     localSource,
   );

src/config/local/index.ts

@@ -1 +1,2 @@
-export * from './source.ts';
+export * from './config-local-source.ts';
+export * from './types.ts';

src/config/repository/config-repository.ts

@@ -0,0 +1,30 @@
+import { Features } from '../../common/types/core.ts';
+import { ClientConfiguration } from '../transformer/types.ts';
+import { LocalSource } from '../local/index.ts';
+import { transform } from '../transformer/index.ts';
+import { logger } from '../../common/core/index.ts';
+
+export class ConfigRepository {
+  constructor(
+    private growth: Features,
+    private local: LocalSource,
+  ) {}
+
+  getConfiguration = async (): Promise<ClientConfiguration | undefined> => {
+    const config = await this.local.getConfig();
+
+    if (config) {
+      try {
+        const result = transform({ document: config, features: this.growth });
+        return result;
+      } catch (e) {
+        logger.error(
+          `config.repository.index:getConfiguration: Error while transforming document`,
+          e,
+        );
+      }
+    }
+
+    return undefined;
+  };
+}

src/config/repository/index.ts

@@ -1,30 +1 @@
-import { Features } from '../../common/types/core.ts';
-import { ClientConfiguration } from '../transformer/types.ts';
-import { LocalSource } from '../local/index.ts';
-import { transform } from '../transformer/index.ts';
-import { logger } from '../../common/core/index.ts';
-
-export class Repository {
-  constructor(
-    private growth: Features,
-    private local: LocalSource,
-  ) {}
-
-  getConfiguration = async (): Promise<ClientConfiguration | undefined> => {
-    const config = await this.local.getConfig();
-
-    if (config) {
-      try {
-        const result = transform({ document: config, features: this.growth });
-        return result;
-      } catch (e) {
-        logger.error(
-          `config.repository.index:getConfiguration: Error while transforming document`,
-          e,
-        );
-      }
-    }
-
-    return undefined;
-  };
-}
+export * from './config-repository.ts';

src/config/transformer/config-transformer.ts

@@ -0,0 +1,46 @@
+import { WithId } from 'npm/mongodb';
+import {
+  getPlatformSource,
+  isAnalyticsEnabled,
+} from '../../common/experiment/index.ts';
+import { Transform } from '../../common/transformer/types.ts';
+import { Features } from '../../common/types/core.ts';
+import { ConfigDocument } from '../local/types.ts';
+import { ClientConfiguration } from './types.ts';
+import { PlatformSource } from '../../common/experiment/types.ts';
+import { idOf } from '../../common/mongo/index.ts';
+
+const toImageUrl = (image: string, source?: PlatformSource): string => {
+  if (source) {
+    return `${source.media}${image}`;
+  }
+  return image;
+};
+
+export const transform: Transform<
+  {
+    document: WithId<ConfigDocument>;
+    features: Features;
+  },
+  ClientConfiguration
+> = ({ document, features }) => {
+  const platformSource = getPlatformSource(features);
+  const { image, _id, genres, navigation } = document;
+  return {
+    id: idOf(_id),
+    settings: {
+      analyticsEnabled: isAnalyticsEnabled(features),
+      platformSource: platformSource?.api,
+    },
+    genres: genres,
+    image: {
+      banner: toImageUrl(image.banner, platformSource),
+      poster: toImageUrl(image.poster, platformSource),
+      loading: toImageUrl(image.loading, platformSource),
+      error: toImageUrl(image.error, platformSource),
+      info: toImageUrl(image.info, platformSource),
+      default: toImageUrl(image.default, platformSource),
+    },
+    navigation: navigation,
+  };
+};

src/config/transformer/index.ts

@@ -1,46 +1,2 @@
-import { WithId } from 'npm/mongodb';
-import {
-  getPlatformSource,
-  isAnalyticsEnabled,
-} from '../../common/experiment/index.ts';
-import { Transform } from '../../common/transformer/types.ts';
-import { Features } from '../../common/types/core.ts';
-import { ConfigDocument } from '../local/types.ts';
-import { ClientConfiguration } from './types.ts';
-import { PlatformSource } from '../../common/experiment/types.ts';
-import { idOf } from '../../common/mongo/index.ts';
-
-const toImageUrl = (image: string, source?: PlatformSource): string => {
-  if (source) {
-    return `${source.media}${image}`;
-  }
-  return image;
-};
-
-export const transform: Transform<
-  {
-    document: WithId<ConfigDocument>;
-    features: Features;
-  },
-  ClientConfiguration
-> = ({ document, features }) => {
-  const platformSource = getPlatformSource(features);
-  const { image, _id, genres, navigation } = document;
-  return {
-    id: idOf(_id),
-    settings: {
-      analyticsEnabled: isAnalyticsEnabled(features),
-      platformSource: platformSource?.api,
-    },
-    genres: genres,
-    image: {
-      banner: toImageUrl(image.banner, platformSource),
-      poster: toImageUrl(image.poster, platformSource),
-      loading: toImageUrl(image.loading, platformSource),
-      error: toImageUrl(image.error, platformSource),
-      info: toImageUrl(image.info, platformSource),
-      default: toImageUrl(image.default, platformSource),
-    },
-    navigation: navigation,
-  };
-};
+export * from './config-transformer.ts';
+export * from './types.ts';

src/news/controller.ts

@@ -0,0 +1,31 @@
+import type { AppContext } from '../common/types/core.ts';
+import { isNewsApiv2Enabled } from '../common/experiment/index.ts';
+import LocalSource from './local/news.local.source.ts';
+import { STATUS_CODE } from 'std/http';
+import { collection } from '../common/mongo/index.ts';
+import { NewsRepository } from './repository/index.ts';
+
+export const newsWorker = async ({ response, state }: AppContext) => {
+  const { local } = state;
+  const repository = new NewsRepository(
+    new LocalSource(collection('news', local)),
+  );
+
+  await repository.sync();
+  response.status = STATUS_CODE.NoContent;
+};
+
+export const news = async ({ response, state }: AppContext) => {
+  const { local, features } = state;
+  const repository = new NewsRepository(
+    new LocalSource(collection('news', local)),
+  );
+
+  if (isNewsApiv2Enabled(features)) {
+    response.type = 'application/json';
+    response.body = await repository.getLatest();
+  } else {
+    response.type = 'application/xml';
+    response.body = await repository.getLatestLegacy();
+  }
+};

src/news/index.ts

@@ -1,31 +1 @@
-import type { AppContext } from '../common/types/core.ts';
-import { isNewsApiv2Enabled } from '../common/experiment/index.ts';
-import NewsRepository, {} from './repository/index.ts';
-import LocalSource from './local/source.ts';
-import { STATUS_CODE } from 'std/http';
-import { collection } from '../common/mongo/index.ts';
-
-export const newsWorker = async ({ response, state }: AppContext) => {
-  const { local } = state;
-  const repository = new NewsRepository(
-    new LocalSource(collection('news', local)),
-  );
-
-  await repository.sync();
-  response.status = STATUS_CODE.NoContent;
-};
-
-export const news = async ({ response, state }: AppContext) => {
-  const { local, features } = state;
-  const repository = new NewsRepository(
-    new LocalSource(collection('news', local)),
-  );
-
-  if (isNewsApiv2Enabled(features)) {
-    response.type = 'application/json';
-    response.body = await repository.getLatest();
-  } else {
-    response.type = 'application/xml';
-    response.body = await repository.getLatestLegacy();
-  }
-};
+export * from './controller.ts';

src/news/local/index.ts

@@ -1,2 +1,3 @@
-export * from './transformer.ts';
+export * from './news.local.transformer.ts';
+export * from './news.local.source.ts';
 export * from './types.ts';

src/news/local/source.ts → src/news/local/news.local.source.ts

@@ -2,7 +2,7 @@ import { Collection, Filter, FindOptions, ObjectId, WithId } from 'npm/mongodb';
 import { logger } from '../../common/core/logger.ts';
 import { IPaging } from '../../common/types/paging.ts';
 import { IResponse } from '../../common/types/response.ts';
-import { toDocument, toEntity } from '../mapper.ts';
+import { toDocument, toEntity } from '../mapper/index.ts';
 import { News } from '../types.ts';
 import { NewsDocument, NewsId } from './types.ts';
 import { between } from 'optic';

src/news/mapper/index.ts

@@ -0,0 +1 @@
+export * from './news.mapper.ts';

src/news/mapper.ts → src/news/mapper/news.mapper.ts

@@ -1,7 +1,7 @@
-import { News, NewsEntity } from './types.ts';
-import { NewsDocument } from './local/types.ts';
+import { News, NewsEntity } from '../types.ts';
+import { NewsDocument } from '../local/types.ts';
 import { OptionalId, WithId } from 'npm/mongodb';
-import { idOf } from '../common/mongo/index.ts';
+import { idOf } from '../../common/mongo/index.ts';
 
 export const toEntity = (data: WithId<NewsDocument>): NewsEntity => {
   return {