refactor: remove .js ext from ALL local imports across the codebase (#…

…361) ideally, imports should reference the source file, not the build file. the triger for this change was a requirement for jest to work directly with typescript files rather than the build output. but not just that, this change should move the project to a more standard direction and also improve code editors to better understand the code structure since now they reference the source files.
OpenBeta · Nov 13, 2023 · db3b348 · db3b348
1 parent 0ef55b4
commit db3b348
Show file tree

Hide file tree

Showing 115 changed files with 416 additions and 400 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -4,25 +4,29 @@ on:
   push:
     branches:
     - develop
+    - test
   pull_request:
 
 jobs:
   build:
     runs-on: 'ubuntu-latest'
 
+
     steps:
+      - name: 'Checkout Project'
+        uses: 'actions/checkout@v4'
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
           node-version: '16.15'
+          cache: 'yarn'
 
-      - name: 'Checkout Project'
-        uses: 'actions/checkout@v3'
-        with:
-          fetch-depth: 1
+      - name: Install dependencies
+        run: yarn install --immutable
 
-      - name: Install Dependencies and lint code
-        run: yarn install && yarn lint
+      - name: Lint code
+        run: yarn lint
 
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.8.0
@@ -44,8 +48,8 @@ jobs:
         run: |
           docker container restart mongodb
 
-      - name: Build and run tests
-        run: yarn test
-        env:
-          NODE_OPTIONS: --experimental-vm-modules
+      - name: Run tests
+        run: yarn test --ci
 
+      - name: Build files/check types
+        run: yarn build-release  --noEmit
diff --git a/jest.config.cjs b/jest.config.cjs
@@ -1,7 +1,11 @@
 module.exports = {
-  preset: 'ts-jest',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   testEnvironment: 'node',
+  testPathIgnorePatterns: ['/node_modules/', './build/'],
   testMatch: [
-    '<rootDir>/build/**/__tests__/*.js'
+    '<rootDir>/**/__tests__/*.ts'
   ]
 }
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
   "scripts": {
     "lint": "yarn ts-standard",
     "fix": "yarn ts-standard --fix",
-    "test": "yarn build && cross-env NODE_OPTIONS=\"--experimental-vm-modules\" jest --runInBand",
+    "test": "jest --runInBand",
     "build": "tsc -p tsconfig.json",
     "build-release": "tsc  -p tsconfig.release.json",
     "clean": "tsc -b --clean && rm -rf build/*",

diff --git a/src/GradeUtils.ts b/src/GradeUtils.ts
@@ -1,6 +1,6 @@
 import { getScale, GradeScales, GradeScalesTypes } from '@openbeta/sandbag'
 import isoCountries from 'i18n-iso-countries'
-import { DisciplineType, ClimbGradeContextType } from './db/ClimbTypes.js'
+import { DisciplineType, ClimbGradeContextType } from './db/ClimbTypes'
 
 /**
  * Grade systems have minor variations between countries. gradeContext is a

diff --git a/src/__tests__/areas.ts b/src/__tests__/areas.ts
@@ -1,12 +1,12 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
-import { AreaType } from '../db/AreaTypes.js'
-import { OrgType, OrganizationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes.js'
-import { queryAPI, setUpServer } from '../utils/testUtils.js'
-import { muuidToString } from '../utils/helpers.js'
+import MutableAreaDataSource from '../model/MutableAreaDataSource'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
+import { AreaType } from '../db/AreaTypes'
+import { OrgType, OrganizationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes'
+import { queryAPI, setUpServer } from '../utils/testUtils'
+import { muuidToString } from '../utils/helpers'
 
 jest.setTimeout(60000)
 

diff --git a/src/__tests__/gradeUtils.ts b/src/__tests__/gradeUtils.ts
@@ -1,5 +1,13 @@
-import { DisciplineType } from '../db/ClimbTypes.js'
-import { sanitizeDisciplines, createGradeObject, gradeContextToGradeScales } from '../GradeUtils.js'
+import { DisciplineType } from '../db/ClimbTypes'
+import { sanitizeDisciplines, createGradeObject, gradeContextToGradeScales } from '../GradeUtils'
+
+beforeAll(() => {
+  console.warn = jest.fn()
+})
+
+afterAll(() => {
+  jest.mocked(console.warn).mockReset()
+})
 
 describe('Test grade utilities', () => {
   it('sanitizes bad discipline object', () => {

diff --git a/src/__tests__/history.ts b/src/__tests__/history.ts
@@ -1,13 +1,13 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
-import MutableClimbDataSource from '../model/MutableClimbDataSource.js'
-import { AreaType } from '../db/AreaTypes.js'
-import { OrgType, OrganizationType } from '../db/OrganizationTypes.js'
-import { muuidToString } from '../utils/helpers.js'
-import { queryAPI, setUpServer } from '../utils/testUtils.js'
+import MutableAreaDataSource from '../model/MutableAreaDataSource'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
+import MutableClimbDataSource from '../model/MutableClimbDataSource'
+import { AreaType } from '../db/AreaTypes'
+import { OrgType, OrganizationType } from '../db/OrganizationTypes'
+import { muuidToString } from '../utils/helpers'
+import { queryAPI, setUpServer } from '../utils/testUtils'
 
 jest.setTimeout(60000)
 

diff --git a/src/__tests__/organizations.ts b/src/__tests__/organizations.ts
@@ -1,13 +1,13 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
-import { AreaType } from '../db/AreaTypes.js'
-import { OrgType, OrganizationType, OperationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes.js'
-import { changelogDataSource } from '../model/ChangeLogDataSource.js'
-import { queryAPI, setUpServer } from '../utils/testUtils.js'
-import { muuidToString } from '../utils/helpers.js'
+import MutableAreaDataSource from '../model/MutableAreaDataSource'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
+import { AreaType } from '../db/AreaTypes'
+import { OrgType, OrganizationType, OperationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes'
+import { changelogDataSource } from '../model/ChangeLogDataSource'
+import { queryAPI, setUpServer } from '../utils/testUtils'
+import { muuidToString } from '../utils/helpers'
 import { validate as validateMuuid } from 'uuid'
 
 jest.setTimeout(60000)

diff --git a/src/__tests__/ticks.ts b/src/__tests__/ticks.ts
@@ -1,12 +1,12 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import { queryAPI, setUpServer } from '../utils/testUtils.js'
-import { muuidToString } from '../utils/helpers.js'
-import { TickInput } from '../db/TickTypes.js'
-import TickDataSource from '../model/TickDataSource.js'
-import UserDataSource from '../model/UserDataSource.js'
-import { UpdateProfileGQLInput } from '../db/UserTypes.js'
+import { queryAPI, setUpServer } from '../utils/testUtils'
+import { muuidToString } from '../utils/helpers'
+import { TickInput } from '../db/TickTypes'
+import TickDataSource from '../model/TickDataSource'
+import UserDataSource from '../model/UserDataSource'
+import { UpdateProfileGQLInput } from '../db/UserTypes'
 
 jest.setTimeout(60000)
 

diff --git a/src/auth/index.ts b/src/auth/index.ts
@@ -1,3 +1,3 @@
-import permissions from './permissions.js'
-import { createContext } from './middleware.js'
+import permissions from './permissions'
+import { createContext } from './middleware'
 export { permissions, createContext }
diff --git a/src/auth/middleware.ts b/src/auth/middleware.ts
@@ -1,7 +1,7 @@
 import muid from 'uuid-mongodb'
-import { AuthUserType } from '../types.js'
-import { verifyJWT } from './util.js'
-import { logger } from '../logger.js'
+import { AuthUserType } from '../types'
+import { verifyJWT } from './util'
+import { logger } from '../logger'
 
 /**
  * Create a middleware context for Apollo server

diff --git a/src/auth/permissions.ts b/src/auth/permissions.ts
@@ -1,5 +1,5 @@
 import { shield, allow, and, or } from 'graphql-shield'
-import { isEditor, isUserAdmin, isOwner, isValidEmail, isMediaOwner } from './rules.js'
+import { isEditor, isUserAdmin, isOwner, isValidEmail, isMediaOwner } from './rules'
 
 const permissions = shield({
   Query: {

diff --git a/src/auth/rules.ts b/src/auth/rules.ts
@@ -1,7 +1,7 @@
 import { rule, inputRule } from 'graphql-shield'
 
-import MediaDataSource from '../model/MutableMediaDataSource.js'
-import { MediaObjectGQLInput } from '../db/MediaObjectTypes.js'
+import MediaDataSource from '../model/MutableMediaDataSource'
+import { MediaObjectGQLInput } from '../db/MediaObjectTypes'
 
 export const isEditor = rule()(async (parent, args, ctx, info) => {
   return _hasUserUuid(ctx) && ctx.user.roles.includes('editor')

diff --git a/src/auth/util.ts b/src/auth/util.ts
@@ -1,7 +1,7 @@
 import jwksClient from 'jwks-rsa'
 import jwt from 'jsonwebtoken'
 
-import { checkVar } from '../db/index.js'
+import { checkVar } from '../db/index'
 
 const auth0Domain = checkVar('AUTH0_DOMAIN')
 const auth0Kid = checkVar('AUTH0_KID')

diff --git a/src/db/AreaSchema.ts b/src/db/AreaSchema.ts
@@ -1,10 +1,10 @@
 import mongoose from 'mongoose'
 import muuid from 'uuid-mongodb'
 
-import { AreaType, IAreaContent, IAreaMetadata, AggregateType, CountByGroupType, CountByDisciplineType, CountByGradeBandType, DisciplineStatsType, OperationType } from './AreaTypes.js'
-import { PointSchema } from './ClimbSchema.js'
-import { ChangeRecordMetadataType } from './ChangeLogType.js'
-import { GradeContexts } from '../GradeUtils.js'
+import { AreaType, IAreaContent, IAreaMetadata, AggregateType, CountByGroupType, CountByDisciplineType, CountByGradeBandType, DisciplineStatsType, OperationType } from './AreaTypes'
+import { PointSchema } from './ClimbSchema'
+import { ChangeRecordMetadataType } from './ChangeLogType'
+import { GradeContexts } from '../GradeUtils'
 
 const { Schema, connection } = mongoose
 

diff --git a/src/db/AreaTypes.ts b/src/db/AreaTypes.ts
@@ -2,11 +2,11 @@ import mongoose from 'mongoose'
 import { MUUID } from 'uuid-mongodb'
 
 import { BBox, Point } from '@turf/helpers'
-import { ClimbType } from './ClimbTypes.js'
-import { ChangeRecordMetadataType } from './ChangeLogType.js'
-import { GradeContexts } from '../GradeUtils.js'
-import { ExperimentalAuthorType } from './UserTypes.js'
-import { AuthorMetadata } from '../types.js'
+import { ClimbType } from './ClimbTypes'
+import { ChangeRecordMetadataType } from './ChangeLogType'
+import { GradeContexts } from '../GradeUtils'
+import { ExperimentalAuthorType } from './UserTypes'
+import { AuthorMetadata } from '../types'
 
 /**
  * Areas are a grouping mechanism in the OpenBeta data model that allow

diff --git a/src/db/ChangeLogSchema.ts b/src/db/ChangeLogSchema.ts
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose'
 
-import { ChangeLogType, SupportedCollectionTypes } from './ChangeLogType.js'
-import { OperationType } from './AreaTypes.js'
+import { ChangeLogType, SupportedCollectionTypes } from './ChangeLogType'
+import { OperationType } from './AreaTypes'
 
 const { Schema, connection } = mongoose
 

diff --git a/src/db/ChangeLogType.ts b/src/db/ChangeLogType.ts
@@ -1,9 +1,9 @@
 import mongose from 'mongoose'
 import { MUUID } from 'uuid-mongodb'
 
-import { OperationType as AreaOpType, AreaType } from './AreaTypes.js'
-import { ClimbEditOperationType, ClimbType } from './ClimbTypes.js'
-import { OperationType as OrganizationOpType, OrganizationType } from './OrganizationTypes.js'
+import { OperationType as AreaOpType, AreaType } from './AreaTypes'
+import { ClimbEditOperationType, ClimbType } from './ClimbTypes'
+import { OperationType as OrganizationOpType, OrganizationType } from './OrganizationTypes'
 
 export type DBOperation = 'insert' | 'update' | 'delete'
 export enum DocumentKind {

diff --git a/src/db/ClimbHistorySchema.ts b/src/db/ClimbHistorySchema.ts
@@ -1,9 +1,9 @@
 import mongoose from 'mongoose'
 import muuid from 'uuid-mongodb'
-import { ClimbSchema } from './ClimbSchema.js'
-import { AreaSchema } from './AreaSchema.js'
-import ClimbHistoryType, { AreaHistoryType } from './ClimbHistoryType.js'
-import ChangeEventType from './ChangeEventType.js'
+import { ClimbSchema } from './ClimbSchema'
+import { AreaSchema } from './AreaSchema'
+import ClimbHistoryType, { AreaHistoryType } from './ClimbHistoryType'
+import ChangeEventType from './ChangeEventType'
 import { ClimbType } from './ClimbTypes'
 import { AreaType } from './AreaTypes'
 

diff --git a/src/db/ClimbSchema.ts b/src/db/ClimbSchema.ts
@@ -3,9 +3,9 @@ import muuid from 'uuid-mongodb'
 import { Point } from '@turf/helpers'
 import { GradeScalesTypes } from '@openbeta/sandbag'
 
-import { ClimbType, IClimbMetadata, IClimbContent, SafetyType, ClimbEditOperationType } from './ClimbTypes.js'
-import { GradeContexts } from '../GradeUtils.js'
-import { ChangeRecordMetadataType } from './ChangeLogType.js'
+import { ClimbType, IClimbMetadata, IClimbContent, SafetyType, ClimbEditOperationType } from './ClimbTypes'
+import { GradeContexts } from '../GradeUtils'
+import { ChangeRecordMetadataType } from './ChangeLogType'
 
 const { Schema } = mongoose
 

diff --git a/src/db/ClimbTypes.ts b/src/db/ClimbTypes.ts
@@ -3,8 +3,8 @@ import { Point } from '@turf/helpers'
 import { GradeScalesTypes } from '@openbeta/sandbag'
 
 import { ChangeRecordMetadataType } from './ChangeLogType'
-import { GradeContexts } from '../GradeUtils.js'
-import { AreaType } from './AreaTypes.js'
+import { GradeContexts } from '../GradeUtils'
+import { AreaType } from './AreaTypes'
 
 // For search climb by id queries
 // Additional fields allow client to build breadcrumbs

diff --git a/src/db/MediaObjectSchema.ts b/src/db/MediaObjectSchema.ts
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose'
 
-import { MediaObject, EntityTag } from './MediaObjectTypes.js'
-import { PointSchema } from './ClimbSchema.js'
+import { MediaObject, EntityTag } from './MediaObjectTypes'
+import { PointSchema } from './ClimbSchema'
 
 const { Schema } = mongoose
 

diff --git a/src/db/OrganizationSchema.ts b/src/db/OrganizationSchema.ts
@@ -1,8 +1,8 @@
 import mongoose from 'mongoose'
 import muuid from 'uuid-mongodb'
 
-import { OrganizationType, OrgType, IOrganizationContent, OperationType } from './OrganizationTypes.js'
-import { ChangeRecordMetadataType } from './ChangeLogType.js'
+import { OrganizationType, OrgType, IOrganizationContent, OperationType } from './OrganizationTypes'
+import { ChangeRecordMetadataType } from './ChangeLogType'
 
 const { Schema, connection } = mongoose
 

diff --git a/src/db/OrganizationTypes.ts b/src/db/OrganizationTypes.ts
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose'
 import { MUUID } from 'uuid-mongodb'
 
-import { ChangeRecordMetadataType } from './ChangeLogType.js'
+import { ChangeRecordMetadataType } from './ChangeLogType'
 
 /**
  * Organizations are OpenBeta accounts that are owned by organizations

diff --git a/src/db/PostSchema.ts b/src/db/PostSchema.ts
@@ -1,8 +1,8 @@
 import mongoose from 'mongoose'
 import mongooseLeanVirtuals from 'mongoose-lean-virtuals'
 import muuid from 'uuid-mongodb'
-import { PostType } from './PostTypes.js'
-import { XMediaSchema } from './XMediaSchema.js'
+import { PostType } from './PostTypes'
+import { XMediaSchema } from './XMediaSchema'
 
 const { Schema } = mongoose
 

diff --git a/src/db/TagSchema.ts b/src/db/TagSchema.ts
@@ -2,7 +2,7 @@ import mongoose from 'mongoose'
 import mongooseLeanVirtuals from 'mongoose-lean-virtuals'
 import muuid from 'uuid-mongodb'
 
-import { TagType, RefModelType } from './TagTypes.js'
+import { TagType, RefModelType } from './TagTypes'
 
 const { Schema } = mongoose
 

diff --git a/src/db/UserSchema.ts b/src/db/UserSchema.ts
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose'
 import muuid from 'uuid-mongodb'
 
-import { ExperimentalUserType, User, UsernameInfo } from './UserTypes.js'
+import { ExperimentalUserType, User, UsernameInfo } from './UserTypes'
 
 const { Schema } = mongoose
 

diff --git a/src/db/UserTypes.ts b/src/db/UserTypes.ts
@@ -1,5 +1,5 @@
 import { MUUID } from 'uuid-mongodb'
-import { UserMedia } from './MediaObjectTypes.js'
+import { UserMedia } from './MediaObjectTypes'
 export interface ExperimentalUserType {
   _id: MUUID
   displayName: string

diff --git a/src/db/XMediaSchema.ts b/src/db/XMediaSchema.ts
@@ -2,7 +2,7 @@ import mongoose from 'mongoose'
 import mongooseLeanVirtuals from 'mongoose-lean-virtuals'
 import muuid from 'uuid-mongodb'
 
-import { XMediaType } from './XMediaTypes.js'
+import { XMediaType } from './XMediaTypes'
 
 const { Schema } = mongoose