Fix tsconfig with imports

Pan-Canadian-Genome-Library · Nov 28, 2024 · 1c8d677 · 1c8d677
1 parent 70cfdfb
commit 1c8d677
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 27 deletions.
diff --git a/apps/api/src/db/schemas/actions.ts b/apps/api/src/db/schemas/actions.ts
@@ -20,8 +20,8 @@
 import { relations } from 'drizzle-orm';
 import { bigint, pgEnum, pgTable, timestamp, varchar } from 'drizzle-orm/pg-core';
 
-import { applications } from './applications.js';
-import { revisionRequests } from './revisionRequests.js';
+import { applications } from './applications.ts';
+import { revisionRequests } from './revisionRequests.ts';
 
 export const actionTypesEnum = pgEnum('action_types', [
 	'CREATE',

diff --git a/apps/api/src/db/schemas/agreements.ts b/apps/api/src/db/schemas/agreements.ts
@@ -19,7 +19,7 @@
 
 import { relations } from 'drizzle-orm';
 import { bigint, pgEnum, pgTable, text, timestamp, varchar } from 'drizzle-orm/pg-core';
-import { applicationContents } from './applicationContents.js';
+import { applicationContents } from './applicationContents.ts';
 
 export const agreementEnum = pgEnum('agreement_types', [
 	'dac_agreement_software_updates',

diff --git a/apps/api/src/db/schemas/applicationContents.ts b/apps/api/src/db/schemas/applicationContents.ts
@@ -19,11 +19,11 @@
 
 import { relations } from 'drizzle-orm';
 import { bigint, boolean, pgTable, text, timestamp, varchar } from 'drizzle-orm/pg-core';
-import { agreements } from './agreements.js';
-import { applications } from './applications.js';
-import { collaborators } from './collaborators.js';
-import { files } from './files.js';
-import { revisionRequests } from './revisionRequests.js';
+import { agreements } from './agreements.ts';
+import { applications } from './applications.ts';
+import { collaborators } from './collaborators.ts';
+import { files } from './files.ts';
+import { revisionRequests } from './revisionRequests.ts';
 
 export const applicationContents = pgTable('application_contents', {
 	id: bigint({ mode: 'number' }).primaryKey().generatedAlwaysAsIdentity(),

diff --git a/apps/api/src/db/schemas/applications.ts b/apps/api/src/db/schemas/applications.ts
@@ -19,7 +19,7 @@
 
 import { relations } from 'drizzle-orm';
 import { bigint, pgEnum, pgTable, timestamp, varchar } from 'drizzle-orm/pg-core';
-import { applicationContents } from './applicationContents.js';
+import { applicationContents } from './applicationContents.ts';
 
 export const applicationStatesEnum = pgEnum('application_states', [
 	'DRAFT',

diff --git a/apps/api/src/db/schemas/collaborators.ts b/apps/api/src/db/schemas/collaborators.ts
@@ -19,7 +19,7 @@
 
 import { relations } from 'drizzle-orm';
 import { bigint, pgTable, text, varchar } from 'drizzle-orm/pg-core';
-import { applicationContents } from './applicationContents.js';
+import { applicationContents } from './applicationContents.ts';
 
 export const collaborators = pgTable('collaborators', {
 	id: bigint({ mode: 'number' }).primaryKey().generatedAlwaysAsIdentity(),

diff --git a/apps/api/src/db/schemas/files.ts b/apps/api/src/db/schemas/files.ts
@@ -20,7 +20,7 @@
 import { relations } from 'drizzle-orm';
 import { bigint, customType, pgEnum, pgTable, timestamp, varchar } from 'drizzle-orm/pg-core';
 
-import { applications } from './applications.js';
+import { applications } from './applications.ts';
 
 export const fileTypesEnum = pgEnum('file_types', ['SIGNED_APPLICATION', 'ETHICS_LETTER']);
 

diff --git a/apps/api/src/db/schemas/revisionRequests.ts b/apps/api/src/db/schemas/revisionRequests.ts
@@ -19,8 +19,8 @@
 
 import { relations } from 'drizzle-orm';
 import { bigint, boolean, pgTable, text, timestamp } from 'drizzle-orm/pg-core';
-import { actions } from './actions.js';
-import { applicationContents } from './applicationContents.js';
+import { actions } from './actions.ts';
+import { applicationContents } from './applicationContents.ts';
 
 export const revisionRequests = pgTable('revision_requests', {
 	id: bigint({ mode: 'number' }).primaryKey().generatedAlwaysAsIdentity(),

diff --git a/apps/api/src/server.ts b/apps/api/src/server.ts
@@ -20,7 +20,7 @@
 import cors from 'cors';
 import express, { Request, Response } from 'express';
 // TODO: Fix Types package so we can import from main instead of specific file
-import { demoApplication } from 'pcgl-daco/packages/data-model/src/main.mts';
+import { demoApplication } from '@pcgl-daco/data-model/src/demoData.ts';
 
 export const port = process.env.PORT || 3000;
 

diff --git a/apps/api/src/service/application-service.ts b/apps/api/src/service/application-service.ts
@@ -17,8 +17,8 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import { ApplicationStates } from '@pcgl-daco/data-model/src/types.ts';
 import { and, eq, sql } from 'drizzle-orm';
-import { ApplicationStates } from 'pcgl-daco/packages/data-model/src/types.ts';
 import { type PostgresDb } from '../db/index.ts';
 import { applicationContents } from '../db/schemas/applicationContents.ts';
 import { applications } from '../db/schemas/applications.ts';

diff --git a/apps/api/src/tests/db/index.ts b/apps/api/src/tests/db/index.ts
@@ -23,15 +23,15 @@ import { after, before, describe, it } from 'node:test';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 import { eq } from 'drizzle-orm';
 
-import { connectToDb, type PostgresDb } from '../../db/index.js';
-import { actions } from '../../db/schemas/actions.js';
-import { agreements } from '../../db/schemas/agreements.js';
-import { applicationContents } from '../../db/schemas/applicationContents.js';
-import { collaborators } from '../../db/schemas/collaborators.js';
-import { files } from '../../db/schemas/files.js';
-import { revisionRequests } from '../../db/schemas/revisionRequests.js';
-
-import { initTestMigration, PG_DATABASE, PG_PASSWORD, PG_USER } from '../testUtils.js';
+import { connectToDb, type PostgresDb } from '../../db/index.ts';
+import { actions } from '../../db/schemas/actions.ts';
+import { agreements } from '../../db/schemas/agreements.ts';
+import { applicationContents } from '../../db/schemas/applicationContents.ts';
+import { collaborators } from '../../db/schemas/collaborators.ts';
+import { files } from '../../db/schemas/files.ts';
+import { revisionRequests } from '../../db/schemas/revisionRequests.ts';
+
+import { initTestMigration, PG_DATABASE, PG_PASSWORD, PG_USER } from '../testUtils.ts';
 
 describe('Postgres Database', () => {
 	let db: PostgresDb;

diff --git a/apps/api/src/tests/services/application.ts b/apps/api/src/tests/services/application.ts
@@ -23,7 +23,7 @@ import { after, before, describe, it } from 'node:test';
 import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@testcontainers/postgresql';
 import { eq } from 'drizzle-orm';
 
-import { ApplicationStates } from 'pcgl-daco/packages/data-model/src/types.ts';
+import { ApplicationStates } from '@pcgl-daco/data-model/src/types.ts';
 import { connectToDb, type PostgresDb } from '../../db/index.ts';
 import { applications } from '../../db/schemas/applications.ts';
 import service from '../../service/application-service.ts';

diff --git a/apps/api/src/tests/testUtils.ts b/apps/api/src/tests/testUtils.ts
@@ -17,10 +17,10 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import { ApplicationStates } from '@pcgl-daco/data-model/src/types.ts';
 import { eq } from 'drizzle-orm';
 import { migrate } from 'drizzle-orm/node-postgres/migrator';
 import { dirname } from 'path';
-import { ApplicationStates } from 'pcgl-daco/packages/data-model/src/types.ts';
 import { fileURLToPath } from 'url';
 
 import { type PostgresDb } from '../db/index.ts';

diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
@@ -4,7 +4,9 @@
 		"lib": ["ESNext"],
 		"target": "ESNext",
 		"module": "NodeNext",
-		"moduleResolution": "NodeNext"
+		"moduleResolution": "NodeNext",
+		"allowImportingTsExtensions": true,
+		"noEmit": true
 	},
 	"include": ["src", "./drizzle.config.ts"]
 }