Merge pull request #11 from TzviPM/nulls

🐛 fix: Update tsconfig, fix null values

Author: TzviPM

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.2] - 2023-10-30
+
+### Fixed
+- Fix null values propagating through the code ([#11](https://github.com/TzviPM/laravel-deploy/pull/11)).
+- Use stricter settings in TS Config ([#11](https://github.com/TzviPM/laravel-deploy/pull/11)).
+
 ## [1.2.1] - 2023-10-30
 
 ### Fixed
@@ -52,8 +58,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 This was the initial release of `laravel-deploy`.
 
-[unreleased]: https://github.com/TzviPM/laravel-deploy/compare/v1.2.0...HEAD
-[1.1.0]: https://github.com/TzviPM/laravel-deploy/compare/v1.1.0...v1.2.0
+[unreleased]: https://github.com/TzviPM/laravel-deploy/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/TzviPM/laravel-deploy/compare/v1.2.1...v1.2.2
+[1.2.1]: https://github.com/TzviPM/laravel-deploy/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/TzviPM/laravel-deploy/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.4...v1.1.0
 [1.0.4]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.3...v1.0.4
 [1.0.3]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.2...v1.0.3

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "laravel-deploy",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A GitHub Action to create on-demand preview environments for Laravel apps.",
   "author": "Tzvi Melamed (TzviPM)",
   "private": true,
@@ -52,6 +52,7 @@
     "@types/jest": "^29.5.2",
     "@types/node": "^20.3.1",
     "@types/supertest": "^2.0.12",
+    "@types/uuid": "^9.0.6",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "@vercel/ncc": "^0.38.1",

package-lock.json

@@ -134,7 +134,7 @@ export class DeploymentService {
     }
     this.logger.log(`Checking for SSL Certificate on forge`);
     const certs = await site.listCerts();
-    let cert = certs.find((cert) => cert.domain === site.name);
+    let cert = certs.find((cert) => cert.domain === site!.name);
     if (cert != null) {
       this.logger.log('cert exists');
     } else {
@@ -299,7 +299,7 @@ function dbBranchName(
   branchMappings: Map<string, string>,
 ): string {
   if (branchMappings.has(branchName)) {
-    return branchMappings.get(branchName);
+    return branchMappings.get(branchName)!;
   }
   return kebabCase(branchName);
 }

package.json

@@ -28,6 +28,7 @@ export class PreviewConfigService {
         } catch (e: unknown) {
           const error = e as Error;
           this.logger.error(`Invalid \`servers\` input. ${error.message}`);
+          throw e;
         }
       });
   }

src/core/deployment/deployment.service.ts

@@ -24,6 +24,7 @@ export class Backup {
   ) {
     this.id = data.id;
     this.name = data.name;
+    this.state = data.state;
   }
 
   private async refetch() {

src/core/preview_config/preview_config.service.ts

@@ -12,8 +12,8 @@ export const credentialsSchema = z.object({
 export class Credentials {
   public id: string;
   public name: string;
-  public username: string;
-  public password: string;
+  public username?: string | null;
+  public password?: string | null;
 
   public get path() {
     return `${this.branch.path}/passwords/${this.id}`;

src/core/pscale/models/backup.ts

@@ -48,8 +48,8 @@ export abstract class ErrorHandler {
       delete error.request.socket;
       delete error.request.agent;
       delete error.request.res;
-      delete error.response.config;
-      delete error.response.request;
+      delete (error.response as any)?.config;
+      delete error.response?.request;
       this.sanitize(error);
     }
     if (error instanceof ZodError) {

src/core/pscale/models/credentials.ts

@@ -17,9 +17,10 @@ export class EnvActionsService implements ActionsService {
    */
   public getInput(name: string, options?: InputOptions): string {
     const envVariableName = this.constantCase(name);
-    return this.configService
-      .getOrThrow<string>(envVariableName, options?.required ? undefined : '')
-      .trim();
+    if (options?.required) {
+      return this.configService.getOrThrow<string>(envVariableName).trim();
+    }
+    return this.configService.getOrThrow<string>(envVariableName, '').trim();
   }
 
   /**

src/errors/handler.ts

@@ -1,12 +1,18 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { CommentsService } from './comments.service';
+import { LoggerCommentsService } from './logger_comments.service';
 
 describe('CommentsService', () => {
   let service: CommentsService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [CommentsService],
+      providers: [
+        {
+          provide: CommentsService,
+          useClass: LoggerCommentsService,
+        },
+      ],
     }).compile();
 
     service = module.get<CommentsService>(CommentsService);

src/github/actions/env_actions.service.ts

@@ -1,12 +1,18 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ContextService } from './context.service';
+import { EnvContextService } from './env_context_service';
 
 describe('ContextService', () => {
   let service: ContextService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [ContextService],
+      providers: [
+        {
+          provide: ContextService,
+          useClass: EnvContextService,
+        },
+      ],
     }).compile();
 
     service = module.get<ContextService>(ContextService);

src/github/comments/comments.service.spec.ts

@@ -38,12 +38,12 @@ export abstract class Logger extends ConsoleLogger implements LoggerService {
 
   protected parseArgs(...args: unknown[]) {
     if (args.length <= 1) {
-      return { messages: args, context: this.context };
+      return { messages: args, context: this.context ?? Logger.name };
     }
     const lastElement = args[args.length - 1];
     const isContext = typeof lastElement === 'string';
     if (!isContext) {
-      return { messages: args, context: this.context };
+      return { messages: args, context: this.context ?? Logger.name };
     }
     return {
       context: lastElement,

src/github/context/context.service.spec.ts

@@ -22,7 +22,9 @@ export class TSLogger extends Logger {
     const oldName = this.logger.settings.name;
     this.setContext(name);
     fn();
-    this.setContext(oldName);
+    if (oldName) {
+      this.setContext(oldName);
+    }
   }
 
   printLog(context: string, ...messages: unknown[]): void {

src/logging/logger.ts

@@ -17,8 +17,8 @@ async function bootstrap() {
   try {
     await CommandFactory.runApplication(app);
     await app.close();
-  } catch (e) {
-    await errorHandler.handle(e);
+  } catch (e: unknown) {
+    await errorHandler.handle(e as Error);
   }
 }
 bootstrap();

src/logging/tslog.logger.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
-import * as request from 'supertest';
+import request from 'supertest';
 import { AppModule } from './../src/app.module';
 
 describe('AppController (e2e)', () => {

src/main.ts

@@ -13,10 +13,11 @@
     "baseUrl": "./",
     "incremental": true,
     "skipLibCheck": true,
-    "strictNullChecks": false,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "strict": true
   }
 }