Removing .js extensions, importing files w/ #src

package.json

@@ -12,6 +12,9 @@
     "build:staging": "esbuild src/index.ts --bundle --platform=node --outdir=dist/lambda --external:@aws-sdk && cd dist/lambda && zip -r lambda.zip index.js > /dev/null && aws --profile equalify lambda update-function-code --function-name equalify-api-staging --zip-file \"fileb://lambda.zip\" > /dev/null && rm -rf dist/lambda/lambda.zip",
     "build": "yarn build:staging && yarn build:prod"
   },
+  "imports": {
+    "#src/*": "./src/*.ts"
+  },
   "type": "module",
   "dependencies": {},
   "devDependencies": {

src/app.ts

@@ -1,5 +1,5 @@
 import Fastify from 'fastify';
-import { addProperties, addReports, addResults, addScans, deleteProperties, deleteReports, getProperties, getReports, getResults, getScans, getUpdates, graphql, help, updateProperties, updateReports } from './routes/index.js';
+import { addProperties, addReports, addResults, addScans, deleteProperties, deleteReports, getProperties, getReports, getResults, getScans, getUpdates, graphql, help, updateProperties, updateReports } from '#src/routes';
 import { CognitoJwtVerifier } from 'aws-jwt-verify';
 export const fastify = Fastify({ logger: true });
 const cognitoJwtVerifier = CognitoJwtVerifier.create({

src/cognito.ts

@@ -1,4 +1,4 @@
-import { postConfirmationConfirmSignUp, postConfirmationConfirmForgotPassword, customMessageSignUp, customMessageResendCode, customMessageForgotPassword, customMessageVerifyUserAttribute, customMessageUpdateUserAttribute } from 'cognito/index.js';
+import { postConfirmationConfirmSignUp, postConfirmationConfirmForgotPassword, customMessageSignUp, customMessageResendCode, customMessageForgotPassword, customMessageVerifyUserAttribute, customMessageUpdateUserAttribute } from '#src/cognito/index';
 
 export const cognito = async (event) => {
     if (event.triggerSource === 'PostConfirmation_ConfirmSignUp') {

src/cognito/customMessageForgotPassword.ts

@@ -1,4 +1,4 @@
-import { formatEmail } from "../utils";
+import { formatEmail } from '#src/utils';
 
 export const customMessageForgotPassword = async (event) => {
     event.response.emailSubject = `Please reset your password`;

src/cognito/customMessageResendCode.ts

@@ -1,4 +1,4 @@
-import { formatEmail } from "../utils";
+import { formatEmail } from '#src/utils';
 
 export const customMessageResendCode = async (event) => {
     event.response.emailSubject = `Equalify Verification Code`;

src/cognito/customMessageSignUp.ts

@@ -1,4 +1,4 @@
-import { formatEmail } from "../utils";
+import { formatEmail } from '#src/utils';
 
 export const customMessageSignUp = async (event) => {
     event.response.emailSubject = `Equalify Verification Code`;

src/cognito/customMessageUpdateUserAttribute.ts

@@ -1,4 +1,4 @@
-import { formatEmail } from "../utils";
+import { formatEmail } from '#src/utils';
 
 export const customMessageUpdateUserAttribute = async (event) => {
     event.response.emailSubject = `Please confirm your new email address`;

src/cognito/index.ts

@@ -1,7 +1,7 @@
-export * from './postConfirmationConfirmSignUp.js'
-export * from './postConfirmationConfirmForgotPassword.js'
-export * from './customMessageSignUp.js'
-export * from './customMessageVerifyUserAttribute.js'
-export * from './customMessageUpdateUserAttribute.js'
-export * from './customMessageResendCode.js'
-export * from './customMessageForgotPassword.js'
+export * from './postConfirmationConfirmSignUp'
+export * from './postConfirmationConfirmForgotPassword'
+export * from './customMessageSignUp'
+export * from './customMessageVerifyUserAttribute'
+export * from './customMessageUpdateUserAttribute'
+export * from './customMessageResendCode'
+export * from './customMessageForgotPassword'

src/cognito/postConfirmationConfirmSignUp.ts

@@ -1,4 +1,4 @@
-import { pgClient } from "../utils/index.js";
+import { pgClient } from '#src/utils';
 
 export const postConfirmationConfirmSignUp = async (event) => {
     const { sub, email, given_name, family_name } = event.request.userAttributes;

src/index.ts

@@ -1,7 +1,7 @@
-import awsLambdaFastify from "@fastify/aws-lambda";
-import { fastify } from "./app.js";
-import { cognito } from './cognito.js';
-import { scheduled } from './scheduled.js';
+import awsLambdaFastify from '@fastify/aws-lambda';
+import { fastify } from '#src/app';
+import { cognito } from '#src/cognito';
+import { scheduled } from '#src/scheduled';
 const proxy = awsLambdaFastify(fastify);
 
 export async function handler(event: any, context: any) {

src/routes/addProperties.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { formatId, pgClient, validateDiscovery, validateDiscoveryOptions, validateUrl } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { formatId, pgClient, validateDiscovery, validateDiscoveryOptions, validateUrl } from '#src/utils';
 
 export const addProperties = async ({ request, reply }) => {
     if (!request.body.propertyName) {

src/routes/addReports.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { formatId, pgClient } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { formatId, pgClient } from '#src/utils';
 
 export const addReports = async ({ request, reply }) => {
     if (!request.body.reportName) {

src/routes/addResults.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { formatId, pgClient } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { formatId, pgClient } from '#src/utils';
 
 export const addResults = async ({ request, reply }) => {
     await pgClient.connect();

src/routes/addScans.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { pgClient, validateUrl } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { pgClient, validateUrl } from '#src/utils';
 
 export const addScans = async ({ request, reply }) => {
     if (!(request.body.propertyIds || request.body.urlIds)) {

src/routes/deleteProperties.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { pgClient, validateUuid } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { pgClient, validateUuid } from '#src/utils';
 
 export const deleteProperties = async ({ request, reply }) => {
     if (!request.query.propertyId) {

src/routes/deleteReports.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { pgClient, validateUuid } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { pgClient, validateUuid } from '#src/utils';
 
 export const deleteReports = async ({ request, reply }) => {
     if (!request.query.reportId) {

src/routes/getProperties.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const getProperties = async ({ request, reply }) => {
     const response = (await graphqlQuery({

src/routes/getReports.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const getReports = async ({ request, reply }) => {
     const response = (await graphqlQuery({

src/routes/getResults.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const getResults = async ({ request, reply }) => {
     /*

src/routes/getScans.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const getScans = async ({ request, reply }) => {
     const response = (await graphqlQuery({

src/routes/getUpdates.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const getUpdates = async ({ request, reply }) => {
     const response = (await graphqlQuery({

src/routes/graphql.ts

@@ -1,4 +1,4 @@
-import { graphqlQuery } from '../utils/index.js';
+import { graphqlQuery } from '#src/utils';
 
 export const graphql = async ({ request, reply }) => {
     try {

src/routes/help.ts

@@ -1,5 +1,5 @@
 import { stripHtml } from 'string-strip-html';
-import { openai } from '../utils/index.js';
+import { openai } from '#src/utils';
 
 export const help = async ({ request, reply }) => {
     const { reportId, messageId, dequeURL, message: accessibilityIssueToFix, codeSnippet: originalCodeSnippet, sourceUrl, status } = request.body;

src/routes/index.ts

@@ -1,16 +1,16 @@
-export * from './addProperties.js'
-export * from './addReports.js'
-export * from './addResults.js'
-export * from './addScans.js'
-export * from './deleteProperties.js'
-export * from './deleteReports.js'
-export * from './getProperties.js'
-export * from './getReports.js'
-export * from './getResults.js'
-export * from './getScans.js'
-export * from './getUpdates.js'
-export * from './graphql.js'
-export * from './help.js'
-export * from './updateProperties.js'
-export * from './updateReports.js'
-export * from './webhookMonitorUpdate.js'
+export * from './addProperties'
+export * from './addReports'
+export * from './addResults'
+export * from './addScans'
+export * from './deleteProperties'
+export * from './deleteReports'
+export * from './getProperties'
+export * from './getReports'
+export * from './getResults'
+export * from './getScans'
+export * from './getUpdates'
+export * from './graphql'
+export * from './help'
+export * from './updateProperties'
+export * from './updateReports'
+export * from './webhookMonitorUpdate'

src/routes/updateProperties.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { pgClient, validateDiscovery, validateDiscoveryOptions, validateUrl, validateUuid } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { pgClient, validateDiscovery, validateDiscoveryOptions, validateUrl, validateUuid } from '#src/utils';
 
 export const updateProperties = async ({ request, reply }) => {
     if (!validateUuid(request.body.propertyId)) {

src/routes/updateReports.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from '../app.js';
-import { pgClient, validateUuid } from '../utils/index.js';
+import { jwtClaims } from '#src/app';
+import { pgClient, validateUuid } from '#src/utils';
 
 export const updateReports = async ({ request, reply }) => {
     if (!validateUuid(request.body.reportId)) {

src/scheduled.ts

@@ -1,4 +1,4 @@
-import { processScans, syncIpRanges } from './scheduled/index.js';
+import { processScans, syncIpRanges } from '#src/scheduled/index';
 
 export const scheduled = async (event) => {
     if (event.internalPath.endsWith('/processScans')) {

src/scheduled/processScans.ts

@@ -1,5 +1,5 @@
-import { jwtClaims } from 'app';
-import { pgClient } from 'utils';
+import { jwtClaims } from '#src/app';
+import { pgClient } from '#src/utils';
 
 export const processScans = async () => {
     // This route is called once every minute by Amazon EventBridge Scheduler

src/scheduled/syncIpRanges.ts

@@ -1,4 +1,4 @@
-import { EC2Client, DescribeSecurityGroupsCommand, RevokeSecurityGroupIngressCommand, AuthorizeSecurityGroupIngressCommand } from "@aws-sdk/client-ec2";
+import { EC2Client, DescribeSecurityGroupsCommand, RevokeSecurityGroupIngressCommand, AuthorizeSecurityGroupIngressCommand } from '@aws-sdk/client-ec2';
 const ec2Client = new EC2Client();
 
 export const syncIpRanges = async () => {

src/utils/graphqlQuery.ts

@@ -3,7 +3,7 @@ import { withPostGraphileContext, createPostGraphileSchema } from 'postgraphile'
 import PgSimplifyInflectorPlugin from '@graphile-contrib/pg-simplify-inflector';
 import ConnectionFilterPlugin from 'postgraphile-plugin-connection-filter';
 import pg from 'pg';
-import { jwtClaims } from '../app.js';
+import { jwtClaims } from '#src/app';
 const pool = new pg.Pool({ connectionString: process.env.DB_CONNECTION_URL });
 const cache = createPostGraphileSchema(pool, 'public', {
     appendPlugins: [PgSimplifyInflectorPlugin, ConnectionFilterPlugin],

src/utils/index.ts

@@ -1,8 +1,8 @@
-export * from './graphqlQuery.js'
-export * from './pgClient.js'
-export * from './openai.js'
-export * from './validateUuid.js'
-export * from './validateUrl.js'
-export * from './validateDiscovery.js'
-export * from './formatId.js'
-export * from './formatEmail.js'
+export * from './graphqlQuery'
+export * from './pgClient'
+export * from './openai'
+export * from './validateUuid'
+export * from './validateUrl'
+export * from './validateDiscovery'
+export * from './formatId'
+export * from './formatEmail'

src/utils/pgClient.ts

@@ -1,4 +1,4 @@
-import ServerlessClient from "serverless-postgres";
+import ServerlessClient from 'serverless-postgres';
 
 export const pgClient = new ServerlessClient({
     user: process.env.DB_USER,

tsconfig.json

@@ -4,6 +4,11 @@
     "target": "ES2022",
     "moduleResolution": "node",
     "outDir": "./dist",
-    "baseUrl": "./src"
+    "baseUrl": "./src",
+    "paths": {
+      "#src/*": [
+        "./*"
+      ]
+    }
   }
 }