[OLD dont merge] server esm test

packages/server/app.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 /* eslint-disable  no-restricted-imports */
 /* istanbul ignore file */
-import './bootstrap'
+import './bootstrap.js'
 import http from 'http'
 import express, { Express } from 'express'
 

packages/server/bin/www

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 'use strict'
 
-const { logger } = require('../dist/logging/logging')
-const { init, startHttp } = require('../dist/app')
+import { logger } from '../dist/logging/logging.js'
+import { init, startHttp } from '../dist/app.js'
 
 init()
   .then(({ app, graphqlServer, server, readinessCheck }) =>

packages/server/bootstrap.js

@@ -1,31 +1,20 @@
-/* istanbul ignore file */
-/**
- * Bootstrap module that should be imported at the very top of each entry point module
- */
-
-// Conditionally change appRoot and packageRoot according to whether we're running from /dist/ or not (ts-node)
-const path = require('path')
-const isTsNode = !!process[Symbol.for('ts-node.register.instance')]
-const appRoot = __dirname
-const packageRoot = isTsNode ? appRoot : path.resolve(__dirname, '../')
-
-// Initializing module aliases for absolute import paths
-const moduleAlias = require('module-alias')
-moduleAlias.addAliases({
-  '@': appRoot,
-  '#': packageRoot
-})
-
-// Initializing env vars
-const dotenv = require('dotenv')
-const {
+import dotenv from 'dotenv'
+import {
   isTestEnv,
   isApolloMonitoringEnabled,
   getApolloServerVersion,
   getServerVersion
-} = require('./modules/shared/helpers/envHelper')
-const { logger } = require('@/logging/logging')
+} from '@/modules/shared/helpers/envHelper'
+import { logger } from '@/logging/logging'
+import { initOpenTelemetry } from '@/otel'
+import { patchKnex } from '@/modules/core/patches/knex'
+import { appRoot, packageRoot } from '#/root.js'
 
+/**
+ * Bootstrap module that should be imported at the very top of each entry point module
+ */
+
+// Initializing env vars
 if (isApolloMonitoringEnabled() && !getApolloServerVersion()) {
   process.env.APOLLO_SERVER_USER_VERSION = getServerVersion()
 }
@@ -46,13 +35,7 @@ if (isTestEnv()) {
 dotenv.config({ path: `${packageRoot}/.env` })
 
 // knex is a singleton controlled by module so can't wait til app init
-const { initOpenTelemetry } = require('./otel')
 initOpenTelemetry()
-
-const { patchKnex } = require('./modules/core/patches/knex')
 patchKnex()
 
-module.exports = {
-  appRoot,
-  packageRoot
-}
+export { appRoot, packageRoot }

packages/server/eslint.config.mjs

@@ -13,16 +13,16 @@ const configs = [
   ...baseConfigs,
   {
     languageOptions: {
-      sourceType: 'commonjs',
+      sourceType: 'module',
       globals: {
         ...globals.node
       }
     }
   },
   {
-    files: ['**/*.mjs'],
+    files: ['**/*.cjs'],
     languageOptions: {
-      sourceType: 'module'
+      sourceType: 'commonjs'
     }
   },
   ...tseslint.configs.recommendedTypeChecked.map((c) => ({

packages/server/esmLoader.js

@@ -0,0 +1,90 @@
+import path from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { register } from 'node:module'
+import { appRoot, packageRoot } from './root.js'
+
+/**
+ * Must be invoked through --import when running the node app to set up path aliases
+ * and extensionless imports
+ */
+
+/**
+ * PATH ALIAS DEFINITIONS
+ */
+const aliases = {
+  '@/': appRoot + '/',
+  '#/': packageRoot + '/'
+}
+
+const packageAliases = {
+  lodash: 'lodash-es'
+}
+
+/**
+ * EXTENSIONS TO EVALUATE FOR EXTENSIONLESS IMPORTS
+ */
+const extensions = ['.js', '.mjs', '.cjs', '.json']
+
+// Register the module hooks
+register('./esmLoader.js', {
+  parentURL: import.meta.url
+})
+
+// Custom path resolver
+function resolveAlias(specifier) {
+  for (const [alias, target] of Object.entries(aliases)) {
+    if (specifier.startsWith(alias)) {
+      const relativePath = specifier.replace(alias, target)
+      return pathToFileURL(path.resolve(relativePath)).href
+    }
+  }
+  for (const [alias, target] of Object.entries(packageAliases)) {
+    if (specifier === alias) {
+      return target
+    }
+  }
+  return null // No alias found, fall back to default resolution
+}
+
+export async function resolve(specifier, context, nextResolve) {
+  // Resolve alias
+  const aliasResolved = resolveAlias(specifier)
+  specifier = aliasResolved || specifier
+
+  // Try to resolve as is
+  let throwableError = undefined
+  try {
+    return await nextResolve(specifier)
+  } catch (e) {
+    throwableError = e
+  }
+
+  const isDirImport = throwableError.code === 'ERR_UNSUPPORTED_DIR_IMPORT'
+
+  // Didn't work, try with extensions
+  for (const ext of extensions) {
+    try {
+      return await nextResolve(specifier + ext)
+    } catch (e) {
+      if (!throwableError) {
+        throwableError = e
+      }
+    }
+  }
+
+  // If it was a dir import also, try that with extensions
+  specifier = isDirImport ? path.join(specifier, 'index') : specifier
+  for (const ext of extensions) {
+    try {
+      return await nextResolve(specifier + ext)
+    } catch (e) {
+      if (!throwableError) {
+        throwableError = e
+      }
+    }
+  }
+
+  throw throwableError
+}
+
+export { packageRoot, appRoot }

packages/server/healthchecks/health.ts

@@ -1,6 +1,6 @@
 import { ensureErrorOrWrapAsCause } from '@/modules/shared/errors/ensureError'
 import { join, merge } from 'lodash'
-import { MultiError } from 'verror'
+import VError from 'verror'
 import {
   FreeConnectionsCalculators,
   MultiDBCheck,
@@ -30,7 +30,7 @@ export const handleLivenessFactory =
           ', '
         )} is not available.`,
         {
-          cause: new MultiError(
+          cause: new VError.MultiError(
             Object.entries(allPostgresResults).map((kv) =>
               ensureErrorOrWrapAsCause(
                 //HACK: kv[1] is not typed correctly as the filter does not narrow the type

packages/server/knexfile.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-imports */
 /* istanbul ignore file */
-import { packageRoot } from './bootstrap'
+import { packageRoot } from './bootstrap.js'
 import fs from 'fs'
 import path from 'path'
 import {

packages/server/modules/accessrequests/graph/resolvers/index.ts

@@ -241,4 +241,4 @@ const resolvers: Resolvers = {
   }
 }
 
-export = resolvers
+export default resolvers

packages/server/modules/accessrequests/index.ts

@@ -26,4 +26,4 @@ const ServerAccessRequestsModule: SpeckleModule = {
   }
 }
 
-export = ServerAccessRequestsModule
+export default ServerAccessRequestsModule

packages/server/modules/activitystream/graph/resolvers/activity.ts

@@ -65,7 +65,7 @@ const userTimelineQueryCore = async (
   return { items, cursor, totalCount }
 }
 
-export = {
+export default {
   LimitedUser: {
     async activity(parent, args) {
       return await userActivityQueryCore(parent, args)

packages/server/modules/activitystream/index.ts

@@ -149,6 +149,6 @@ const activityModule: SpeckleModule = {
   }
 }
 
-export = {
+export default {
   ...activityModule
 }

packages/server/modules/auth/graph/resolvers/apps.ts

@@ -24,7 +24,7 @@ const revokeExistingAppCredentialsForUser = revokeExistingAppCredentialsForUserF
   db
 })
 
-export = {
+export default {
   Query: {
     async app(_parent, args) {
       const app = await getApp({ id: args.id })

packages/server/modules/auth/graph/resolvers/auth.ts

@@ -1,7 +1,7 @@
 import { getAuthStrategies } from '@/modules/auth'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
 
-export = {
+export default {
   ServerInfo: {
     authStrategies() {
       return getAuthStrategies()

packages/server/modules/auth/strategies.ts

@@ -78,4 +78,4 @@ const setupStrategiesFactory =
     return authStrategies
   }
 
-export = setupStrategiesFactory
+export default setupStrategiesFactory

packages/server/modules/auth/strategies/azureAd.ts

@@ -222,4 +222,4 @@ const azureAdStrategyBuilderFactory =
     }
   }
 
-export = azureAdStrategyBuilderFactory
+export default azureAdStrategyBuilderFactory

packages/server/modules/auth/strategies/github.ts

@@ -195,4 +195,4 @@ const githubStrategyBuilderFactory =
     return strategy
   }
 
-export = githubStrategyBuilderFactory
+export default githubStrategyBuilderFactory

packages/server/modules/auth/strategies/google.ts

@@ -178,4 +178,4 @@ const googleStrategyBuilderFactory =
     return strategy
   }
 
-export = googleStrategyBuilderFactory
+export default googleStrategyBuilderFactory

packages/server/modules/auth/strategies/local.ts

@@ -169,4 +169,4 @@ const localStrategyBuilderFactory =
     return strategy
   }
 
-export = localStrategyBuilderFactory
+export default localStrategyBuilderFactory

packages/server/modules/auth/strategies/oidc.ts

@@ -201,4 +201,4 @@ const oidcStrategyBuilderFactory =
     }
   }
 
-export = oidcStrategyBuilderFactory
+export default oidcStrategyBuilderFactory

packages/server/modules/automate/graph/resolvers/automate.ts

@@ -138,7 +138,7 @@ const createAppToken = createAppTokenFactory({
   storeUserServerAppToken: storeUserServerAppTokenFactory({ db })
 })
 
-export = (FF_AUTOMATE_MODULE_ENABLED
+export default (FF_AUTOMATE_MODULE_ENABLED
   ? {
       /**
        * If automate module is enabled

packages/server/modules/automate/index.ts

@@ -386,4 +386,4 @@ const automateModule: SpeckleModule = {
   }
 }
 
-export = automateModule
+export default automateModule

packages/server/modules/blobstorage/graph/resolvers/index.ts

@@ -65,7 +65,7 @@ const streamBlobResolvers = {
   }
 }
 
-export = {
+export default {
   ServerInfo: {
     //deprecated
     blobSizeLimitBytes() {

packages/server/modules/cli/commands/activities.ts

@@ -10,4 +10,4 @@ const command: CommandModule = {
   handler: noop
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/activities/send.ts

@@ -31,4 +31,4 @@ const command: CommandModule = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/bull.ts

@@ -10,4 +10,4 @@ const command: CommandModule = {
   handler: noop
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/bull/monitor.ts

@@ -56,4 +56,4 @@ const command: CommandModule<unknown, { testQueueId: string }> = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/bull/test-consume.ts

@@ -27,4 +27,4 @@ const command: CommandModule = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/bull/test-push.ts

@@ -40,4 +40,4 @@ const command: CommandModule = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db.ts

@@ -10,4 +10,4 @@ const command: CommandModule = {
   handler: noop
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate.ts

@@ -17,4 +17,4 @@ const command: CommandModule = {
   handler: noop
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate/create.ts

@@ -49,4 +49,4 @@ const command: CommandModule<unknown, { name: string; module: string }> = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate/down.ts

@@ -34,4 +34,4 @@ const command: CommandModule<unknown, { times: number } & CommonDbArgs> = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate/latest.ts

@@ -19,4 +19,4 @@ const command: CommandModule<unknown, CommonDbArgs> = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate/rollback.ts

@@ -23,4 +23,4 @@ const command: CommandModule<unknown, CommonDbArgs> = {
   }
 }
 
-export = command
+export default command

packages/server/modules/cli/commands/db/migrate/up.ts

@@ -20,4 +20,4 @@ const command: CommandModule<unknown, CommonDbArgs> = {
   }
 }
 
-export = command
+export default command