Merge pull request #15 from DouglasNeuroInformatics/dev

Dev

Author: joshunrau

.prettierignore

@@ -0,0 +1,2 @@
+build/
+dist/

eslint.config.js

@@ -9,6 +9,7 @@ export default config(
       es2021: true,
       node: true
     },
+    exclude: ['build/**/*', 'dist/**/*'],
     typescript: {
       enabled: true,
       project: path.resolve(import.meta.dirname, 'tsconfig.json')

package.json

@@ -74,6 +74,8 @@
     "@nestjs/passport": "^11.0.5",
     "@nestjs/swagger": "^11.0.6",
     "@nestjs/throttler": "^6.4.0",
+    "@prisma/engines": "^6.5.0",
+    "@prisma/get-platform": "^6.5.0",
     "@swc-node/register": "^1.10.10",
     "@swc/core": "^1.11.10",
     "@swc/helpers": "^0.5.15",

pnpm-lock.yaml

@@ -73,7 +73,7 @@ export class AppContainer {
       filterObject(
         {
           ...process.env,
-          // this is required so that NODE_ENV can be statically replaced in the bundle
+          // this is required so that these can be statically replaced in the bundle
           NODE_ENV: process.env.NODE_ENV
         },
         (value) => value !== ''

src/app/app.container.ts

@@ -3,12 +3,12 @@ import { describe, expect, it, vi } from 'vitest';
 
 import { createExec, process } from '../../testing/helpers/cli.js';
 
-const { bundle } = vi.hoisted(() => ({
-  bundle: vi.fn()
+const { buildProd } = vi.hoisted(() => ({
+  buildProd: vi.fn()
 }));
 
-vi.mock('../../utils/build.utils.js', () => ({
-  bundle
+vi.mock('../../meta/build.js', () => ({
+  buildProd
 }));
 
 const exec = createExec({
@@ -47,9 +47,9 @@ describe('libnest-build', () => {
     const callback = action.mock.lastCall![0];
     vi.spyOn(process.env as any, 'LIBNEST_CONFIG_FILEPATH', 'get').mockReturnValueOnce('/path/to/config.js');
     const mapErr = vi.fn();
-    bundle.mockReturnValueOnce({ mapErr });
+    buildProd.mockReturnValueOnce({ mapErr });
     (callback as any)();
-    expect(bundle).toHaveBeenCalledOnce();
+    expect(buildProd).toHaveBeenCalledOnce();
     const programError = vi.spyOn(Command.prototype, 'error').mockImplementationOnce(() => null!);
     const errorHandler = mapErr.mock.lastCall![0];
     errorHandler(new Error('An error occurred'));

src/cli/__tests__/libnest-build.test.ts

@@ -7,7 +7,7 @@ const { runDev } = vi.hoisted(() => ({
   runDev: vi.fn()
 }));
 
-vi.mock('../../utils/meta.utils.js', () => ({
+vi.mock('../../meta/dev.js', () => ({
   runDev
 }));
 

src/cli/__tests__/libnest-dev.test.ts

@@ -4,12 +4,12 @@ import { describe, expect, it, vi } from 'vitest';
 
 import { createExec, process } from '../../testing/helpers/cli.js';
 
-const { resolveAbsoluteImportPathFromCwd } = vi.hoisted(() => ({
-  resolveAbsoluteImportPathFromCwd: vi.fn()
+const { resolveAbsoluteImportPath } = vi.hoisted(() => ({
+  resolveAbsoluteImportPath: vi.fn()
 }));
 
-vi.mock('../../utils/meta.utils.js', () => ({
-  resolveAbsoluteImportPathFromCwd
+vi.mock('../../meta/resolve.js', () => ({
+  resolveAbsoluteImportPath
 }));
 
 const exec = createExec({
@@ -28,16 +28,17 @@ describe('libnest', () => {
     );
   });
   it('should throw an InvalidArgumentError if the config path cannot be resolved', async () => {
+    process.cwd.mockReturnValueOnce('/app');
     const parseAsync = vi.spyOn(Command.prototype, 'parseAsync');
-    resolveAbsoluteImportPathFromCwd.mockReturnValueOnce(err('Failed'));
+    resolveAbsoluteImportPath.mockReturnValueOnce(err('Failed'));
     const result = await exec(['-c', 'libnest.config.ts']);
     expect(parseAsync).toHaveBeenCalledExactlyOnceWith(['node', '../libnest.js', '-c', 'libnest.config.ts']);
-    expect(resolveAbsoluteImportPathFromCwd).toHaveBeenLastCalledWith('libnest.config.ts');
+    expect(resolveAbsoluteImportPath).toHaveBeenLastCalledWith('libnest.config.ts', '/app');
     expect(result).toMatchObject({ code: 'commander.invalidArgument', exitCode: 1 });
   });
   it('should pass the resolved config file to the subcommand', async () => {
     const hook = vi.spyOn(Command.prototype, 'hook');
-    resolveAbsoluteImportPathFromCwd.mockReturnValueOnce(ok('/root/path/to/file.js'));
+    resolveAbsoluteImportPath.mockReturnValueOnce(ok('/root/path/to/file.js'));
     await exec(['-c', 'libnest.config.ts']);
     expect(hook).toHaveBeenCalledExactlyOnceWith('preSubcommand', expect.any(Function));
     const callback = hook.mock.lastCall![1];

src/cli/__tests__/libnest.test.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --enable-source-maps
 
 import { register } from 'node:module';
 

src/cli/bin/libnest-build

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --watch
+#!/usr/bin/env node --enable-source-maps --watch
 
 import { register } from 'node:module';