feat(esm): moving annotations api to esm

packages/tsconfig/graphql-esm.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "target": "ES2024",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "allowImportingTsExtensions": true,
+    "rewriteRelativeImportExtensions": true,
+    "lib": [
+      "es2019",
+      "es2020.bigint",
+      "es2020.string",
+      "es2020.symbol.wellknown"
+    ],
+    "removeComments": true,
+    "esModuleInterop": true,
+    "noEmitOnError": false,
+    "sourceMap": true,
+    "inlineSources": true,
+    "sourceRoot": "/",
+    "declaration": true,
+    "noEmitHelpers": true,
+    "importHelpers": true
+  }
+}

servers/annotations-api/jest.config.ts

@@ -0,0 +1,26 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest/presets/default-esm', // or other ESM presets
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|integration).ts'],
+  testPathIgnorePatterns: ['/dist/'],
+  setupFiles: ['./jest.setup.ts'],
+  displayName: 'annotations-api',
+  setupFilesAfterEnv: ['jest-extended/all'],
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1"
+  },
+  transform: {
+    ['^.+.tsx?$']: [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.json',
+        isolatedModules: true,
+        useESM: true,
+      },
+    ],
+  }
+};
+
+export default config;

servers/annotations-api/package.json

@@ -4,6 +4,7 @@
   "description": "",
   "license": "ISC",
   "author": "",
+  "type": "module",
   "main": "dist/main.js",
   "files": [
     "dist",

servers/annotations-api/src/database/client.ts

@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import config from '../config';
+import config from '../config/index.ts';
 import { DynamoDBClient, DynamoDBClientConfig } from '@aws-sdk/client-dynamodb';
 
 let readDb: Knex;

servers/annotations-api/src/dataservices/dataloaders.spec.ts

@@ -1,6 +1,6 @@
-import { NotesDataService } from '../dataservices/notes';
-import { dynamoClient } from '../database/client';
-import { createNotesLoader, orderAndMapNotes } from './dataloaders';
+import { NotesDataService } from '../dataservices/notes.ts';
+import { dynamoClient } from '../database/client.ts';
+import { createNotesLoader, orderAndMapNotes } from './dataloaders.ts';
 
 describe('dataloaders', () => {
   const mockNotesResponse = [

servers/annotations-api/src/dataservices/dataloaders.ts

@@ -1,6 +1,6 @@
 import DataLoader from 'dataloader';
-import { HighlightNote } from '../types';
-import { NotesDataService } from './notes';
+import { HighlightNote } from '../types.ts';
+import { NotesDataService } from './notes.ts';
 
 /**
  * Function for initializing dataloader. This function should be

servers/annotations-api/src/dataservices/highlights.ts

@@ -1,13 +1,13 @@
 import { Knex } from 'knex';
-import { IContext } from '../server/apollo/context';
-import { HighlightEntity } from '../types';
+import { IContext } from '../server/apollo/context.ts';
+import { HighlightEntity } from '../types.ts';
 import { NotFoundError, UserInputError } from '@pocket-tools/apollo-utils';
 import { v4 as uuid } from 'uuid';
-import config from '../config';
-import { groupByCount, sumByKey } from '../utils/dataAggregation';
-import { UsersMeta } from './usersMeta';
-import { SavedItem } from './savedItem';
-import { failCallback } from '../server/routes/helper';
+import config from '../config/index.ts';
+import { groupByCount, sumByKey } from '../utils/dataAggregation.ts';
+import { UsersMeta } from './usersMeta.ts';
+import { SavedItem } from './savedItem.ts';
+import { failCallback } from '../server/routes/helper.ts';
 import { setTimeout } from 'timers/promises';
 import { serverLogger } from '@pocket-tools/ts-logger';
 import {
@@ -16,7 +16,7 @@ import {
   Highlight,
   BatchWriteHighlightsResult,
   BatchWriteHighlightsInput,
-} from '../__generated__/resolvers-types';
+} from '../__generated__/resolvers-types.ts';
 
 export class HighlightsDataService {
   public readonly userId: string;

servers/annotations-api/src/dataservices/notes.spec.ts

@@ -1,7 +1,7 @@
-import { NotesDataService } from './notes';
+import { NotesDataService } from './notes.ts';
 import { BatchGetCommandOutput } from '@aws-sdk/lib-dynamodb';
-import config from '../config';
-import { dynamoClient } from '../database/client';
+import config from '../config/index.ts';
+import { dynamoClient } from '../database/client.ts';
 
 describe('Notes data service', () => {
   let dynamoSendStub;

servers/annotations-api/src/dataservices/notes.ts

@@ -18,9 +18,9 @@ import {
   QueryCommandInput,
   QueryCommandOutput,
 } from '@aws-sdk/lib-dynamodb';
-import config from '../config';
-import { HighlightNote, HighlightNoteEntity } from '../types';
-import { backoff } from './utils';
+import config from '../config/index.ts';
+import { HighlightNote, HighlightNoteEntity } from '../types.ts';
+import { backoff } from './utils.ts';
 import { NotFoundError } from '@pocket-tools/apollo-utils';
 
 export class NotesDataService {

servers/annotations-api/src/dataservices/parserApi.ts

@@ -1,5 +1,5 @@
 import { URLSearchParams } from 'url';
-import config from '../config';
+import config from '../config/index.ts';
 import { RESTDataSource } from '@apollo/datasource-rest';
 import md5 from 'md5';
 import { backOff } from 'exponential-backoff';

servers/annotations-api/src/dataservices/savedItem.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
-import { IContext } from '../server/apollo/context';
-import { mysqlTimeString } from './utils';
-import config from '../config';
+import { IContext } from '../server/apollo/context.ts';
+import { mysqlTimeString } from './utils.ts';
+import config from '../config/index.ts';
 
 export class SavedItem {
   private readonly userId: string;

servers/annotations-api/src/dataservices/usersMeta.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
-import { mysqlTimeString } from './utils';
-import config from '../config';
-import { IContext } from '../server/apollo/context';
+import { mysqlTimeString } from './utils.ts';
+import config from '../config/index.ts';
+import { IContext } from '../server/apollo/context.ts';
 
 export class UsersMeta {
   public static propertiesMap = {

servers/annotations-api/src/main.ts

@@ -1,4 +1,4 @@
-import config from './config';
+import config from './config/index.ts';
 import { initSentry } from '@pocket-tools/sentry';
 
 // Init sentry MUST come before any other imports for auto instrumentation to kick in (request isolation)
@@ -13,7 +13,7 @@ initSentry({
 });
 
 import { nodeSDKBuilder } from '@pocket-tools/tracing';
-import { unleash } from './unleash';
+import { unleash } from './unleash.ts';
 nodeSDKBuilder({ ...config.tracing, unleash: unleash() }).then(() => {
   startServer(config.app.port).then(async () => {
     // init BatchDeleteHandler, SQS queue is not
@@ -24,6 +24,6 @@ nodeSDKBuilder({ ...config.tracing, unleash: unleash() }).then(() => {
   });
 });
 import { serverLogger } from '@pocket-tools/ts-logger';
-import { startServer } from './server';
-import { BatchDeleteHandler } from './server/aws/batchDeleteHandler';
+import { startServer } from './server/index.ts';
+import { BatchDeleteHandler } from './server/aws/batchDeleteHandler.ts';
 import { EventEmitter } from 'events';

servers/annotations-api/src/models/HighlightsModel.ts

@@ -1,6 +1,6 @@
 import { ForbiddenError } from '@pocket-tools/apollo-utils';
-import { HighlightsDataService } from '../dataservices/highlights';
-import { NotesDataService } from '../dataservices/notes';
+import { HighlightsDataService } from '../dataservices/highlights.ts';
+import { NotesDataService } from '../dataservices/notes.ts';
 import {
   BatchWriteHighlightsInput,
   BatchWriteHighlightsResult,
@@ -10,8 +10,8 @@ import {
   UpdateHighlightInput,
   SavedItemAnnotations,
   CreateHighlightByUrlInput,
-} from '../__generated__/resolvers-types';
-import { ParserAPI } from '../dataservices/parserApi';
+} from '../__generated__/resolvers-types.ts';
+import { ParserAPI } from '../dataservices/parserApi.ts';
 
 export class HighlightsModel {
   constructor(

servers/annotations-api/src/server/apollo/buildSchema.ts

@@ -1,7 +1,7 @@
 import { printSubgraphSchema } from '@apollo/subgraph';
 import path from 'path';
 import fs from 'fs';
-import { schema } from './schema';
+import { schema } from './schema.ts';
 
 // Add in constraint directives, for pushing to apollo graph os
 const sdl = printSubgraphSchema(schema);

servers/annotations-api/src/server/apollo/context.ts

@@ -1,19 +1,23 @@
 import { Knex } from 'knex';
-import { HighlightNote } from '../../types';
+import { HighlightNote } from '../../types.ts';
 import DataLoader from 'dataloader';
 import {
   AuthenticationError,
   PocketContext,
   PocketContextManager,
 } from '@pocket-tools/apollo-utils';
 import express from 'express';
-import { dynamoClient, readClient, writeClient } from '../../database/client';
+import {
+  dynamoClient,
+  readClient,
+  writeClient,
+} from '../../database/client.ts';
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { createNotesLoader } from '../../dataservices/dataloaders';
-import { NotesDataService } from '../../dataservices/notes';
-import { HighlightsModel } from '../../models/HighlightsModel';
-import { ParserAPI } from '../../dataservices/parserApi';
-import { HighlightsDataService } from '../../dataservices/highlights';
+import { createNotesLoader } from '../../dataservices/dataloaders.ts';
+import { NotesDataService } from '../../dataservices/notes.ts';
+import { HighlightsModel } from '../../models/HighlightsModel.ts';
+import { ParserAPI } from '../../dataservices/parserApi.ts';
+import { HighlightsDataService } from '../../dataservices/highlights.ts';
 
 export interface IContext extends PocketContext {
   userId: string;

servers/annotations-api/src/server/apollo/index.ts

@@ -1,2 +1,2 @@
-export * from './schema';
-export * as typeDefs from './typeDefs';
+export * from './schema.ts';
+export * as typeDefs from './typeDefs.ts';

servers/annotations-api/src/server/apollo/resolvers.ts

@@ -10,8 +10,8 @@ import {
   BatchWriteHighlightsInput,
   Resolvers,
   CreateHighlightByUrlInput,
-} from '../../__generated__/resolvers-types';
-import { IContext } from './context';
+} from '../../__generated__/resolvers-types.ts';
+import { IContext } from './context.ts';
 
 export const resolvers: Resolvers = {
   ...PocketDefaultScalars,

servers/annotations-api/src/server/apollo/schema.ts

@@ -1,8 +1,8 @@
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { constraintDirectiveTypeDefs } from 'graphql-constraint-directive/apollo4';
 import { gql } from 'graphql-tag';
-import typeDefs from './typeDefs';
-import { resolvers } from './resolvers';
+import typeDefs from './typeDefs.ts';
+import { resolvers } from './resolvers.ts';
 
 // Add @constraint directive to the schema
 export const schema = buildSubgraphSchema({

servers/annotations-api/src/server/aws/batchDeleteHandler.spec.ts

@@ -1,10 +1,10 @@
 import { EventEmitter } from 'events';
-import { BatchDeleteHandler, BatchDeleteMessage } from './batchDeleteHandler';
+import { BatchDeleteHandler, BatchDeleteMessage } from './batchDeleteHandler.ts';
 import { DeleteMessageCommand, SQSClient } from '@aws-sdk/client-sqs';
-import { HighlightsDataService } from '../../dataservices/highlights';
+import { HighlightsDataService } from '../../dataservices/highlights.ts';
 import * as Sentry from '@sentry/node';
 import { SeverityLevel } from '@sentry/types';
-import config from '../../config';
+import config from '../../config/index.ts';
 import { serverLogger } from '@pocket-tools/ts-logger';
 import * as otel from '@opentelemetry/api';
 

servers/annotations-api/src/server/aws/batchDeleteHandler.ts

@@ -9,15 +9,15 @@ import {
   QueueAttributeName,
 } from '@aws-sdk/client-sqs';
 import * as Sentry from '@sentry/node';
-import config from '../../config';
+import config from '../../config/index.ts';
 import { nanoid } from 'nanoid';
-import { readClient, writeClient } from '../../database/client';
-import { HighlightsDataService } from '../../dataservices/highlights';
+import { readClient, writeClient } from '../../database/client.ts';
+import { HighlightsDataService } from '../../dataservices/highlights.ts';
 import { setTimeout } from 'timers/promises';
-import { failCallback } from '../routes/helper';
+import { failCallback } from '../routes/helper.ts';
 import { serverLogger } from '@pocket-tools/ts-logger';
 import { SeverityLevel } from '@sentry/types';
-import { sqs } from './sqs';
+import { sqs } from './sqs.ts';
 import * as otel from '@opentelemetry/api';
 
 export type BatchDeleteMessage = {

servers/annotations-api/src/server/aws/sqs.ts

@@ -1,5 +1,5 @@
 import { SQS } from '@aws-sdk/client-sqs';
-import config from '../../config';
+import config from '../../config/index.ts';
 
 export const sqs = new SQS({
   region: config.aws.region,

servers/annotations-api/src/server/index.ts

@@ -9,12 +9,12 @@ import {
   defaultPlugins,
   sentryPocketMiddleware,
 } from '@pocket-tools/apollo-utils';
-import { createApollo4QueryValidationPlugin } from 'graphql-constraint-directive/apollo4';
+import { createApollo4QueryValidationPlugin } from 'graphql-constraint-directive/apollo4.js';
 
-import { schema } from './apollo';
-import config from '../config';
-import { getContext, IContext } from './apollo/context';
-import queueDeleteRouter from './routes/queueDelete';
+import { schema } from './apollo/index.ts';
+import config from '../config/index.ts';
+import { getContext, IContext } from './apollo/context.ts';
+import queueDeleteRouter from './routes/queueDelete.ts';
 import { setMorgan, serverLogger } from '@pocket-tools/ts-logger';
 
 export async function startServer(port: number): Promise<{

servers/annotations-api/src/server/routes/queueDelete.integration.ts

@@ -1,8 +1,8 @@
-import { readClient, writeClient } from '../../database/client';
+import { readClient, writeClient } from '../../database/client.ts';
 import { SQS } from '@aws-sdk/client-sqs';
-import { enqueueAnnotationIds, SqsMessage } from './queueDelete';
-import { HighlightsDataService } from '../../dataservices/highlights';
-import config from '../../config';
+import { enqueueAnnotationIds, SqsMessage } from './queueDelete.ts';
+import { HighlightsDataService } from '../../dataservices/highlights.ts';
+import config from '../../config/index.ts';
 import * as Sentry from '@sentry/node';
 import { Knex } from 'knex';
 

servers/annotations-api/src/server/routes/queueDelete.ts

@@ -1,18 +1,18 @@
 import { Request, Response, Router } from 'express';
 import { checkSchema, Schema } from 'express-validator';
-import { dynamoClient, readClient, writeClient } from '../../database/client';
-import config from '../../config';
-import { sqs } from '../aws/sqs';
+import { dynamoClient, readClient, writeClient } from '../../database/client.ts';
+import config from '../../config/index.ts';
+import { sqs } from '../aws/sqs.ts';
 import {
   SendMessageBatchCommand,
   SendMessageBatchRequestEntry,
 } from '@aws-sdk/client-sqs';
 import { nanoid } from 'nanoid';
 import * as Sentry from '@sentry/node';
-import { validate } from './validator';
-import { HighlightsDataService } from '../../dataservices/highlights';
-import { NotesDataService } from '../../dataservices/notes';
-import { failCallback, successCallback } from './helper';
+import { validate } from './validator.ts';
+import { HighlightsDataService } from '../../dataservices/highlights.ts';
+import { NotesDataService } from '../../dataservices/notes.ts';
+import { failCallback, successCallback } from './helper.ts';
 import { serverLogger } from '@pocket-tools/ts-logger';
 
 export type SqsMessage = {