From 9a68fc4ecc22ad70b7346825fffa3691d45497f7 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Fri, 22 Aug 2025 20:20:14 -0700 Subject: [PATCH] all file extension tests passing --- src/file-extension/spec/comments.in.ts | 4 ++-- src/file-extension/spec/comments.out.ts | 4 ++-- src/file-extension/spec/complex-paths.in.ts | 10 +++++----- src/file-extension/spec/complex-paths.out.ts | 10 +++++----- src/file-extension/spec/comprehensive.in.ts | 4 ++-- src/file-extension/spec/comprehensive.out.ts | 4 ++-- src/file-extension/spec/index-files.in.ts | 4 ++-- src/file-extension/spec/index-files.out.ts | 4 ++-- src/file-extension/spec/multiple-imports.in.ts | 4 ++-- src/file-extension/spec/multiple-imports.out.ts | 4 ++-- src/file-extension/spec/ts-extensions.in.ts | 4 ++-- src/file-extension/spec/ts-extensions.out.ts | 4 ++-- src/file-extension/spec/type-imports.in.ts | 7 ++++--- src/file-extension/spec/type-imports.out.ts | 7 ++++--- 14 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/file-extension/spec/comments.in.ts b/src/file-extension/spec/comments.in.ts index cd07c2e..cbf47ef 100644 --- a/src/file-extension/spec/comments.in.ts +++ b/src/file-extension/spec/comments.in.ts @@ -15,10 +15,10 @@ import { Helpers } from "./utils/helpers.ts"; export class CommentsTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private logger: Logger, - private config: Config, + private config: typeof Config, private helpers: Helpers, ) {} diff --git a/src/file-extension/spec/comments.out.ts b/src/file-extension/spec/comments.out.ts index 20bde29..dd0666f 100644 --- a/src/file-extension/spec/comments.out.ts +++ b/src/file-extension/spec/comments.out.ts @@ -15,7 +15,7 @@ import { Helpers } from "./utils/helpers.ts"; export class CommentsTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private logger: Logger, private config: typeof Config, @@ -25,6 +25,6 @@ export class CommentsTest { async testComments() { // This comment should be preserved this.logger.info("Testing comment preservation"); - return this.userService.email; + return await this.userService.findById("123"); } } diff --git a/src/file-extension/spec/complex-paths.in.ts b/src/file-extension/spec/complex-paths.in.ts index f8b2472..415fb39 100644 --- a/src/file-extension/spec/complex-paths.in.ts +++ b/src/file-extension/spec/complex-paths.in.ts @@ -18,11 +18,11 @@ import { YetAnother } from "./yet/another/very/deep/nested/path/file.ts"; export class ComplexPathsTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, @@ -32,9 +32,9 @@ export class ComplexPathsTest { private userService: UserService, private authConfig: AuthConfig, private loggerConfig: LoggerConfig, - private deepNested: DeepNested, - private anotherDeep: AnotherDeep, - private yetAnother: YetAnother, + private deepNested: typeof DeepNested, + private anotherDeep: typeof AnotherDeep, + private yetAnother: typeof YetAnother, ) {} async testComplexPaths() { diff --git a/src/file-extension/spec/complex-paths.out.ts b/src/file-extension/spec/complex-paths.out.ts index 7ace293..2476947 100644 --- a/src/file-extension/spec/complex-paths.out.ts +++ b/src/file-extension/spec/complex-paths.out.ts @@ -18,11 +18,11 @@ import { YetAnother } from "./yet/another/very/deep/nested/path/file.ts"; export class ComplexPathsTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, @@ -32,9 +32,9 @@ export class ComplexPathsTest { private userService: UserService, private authConfig: AuthConfig, private loggerConfig: LoggerConfig, - private deepNested: DeepNested, - private anotherDeep: AnotherDeep, - private yetAnother: YetAnother, + private deepNested: typeof DeepNested, + private anotherDeep: typeof AnotherDeep, + private yetAnother: typeof YetAnother, ) {} async testComplexPaths() { diff --git a/src/file-extension/spec/comprehensive.in.ts b/src/file-extension/spec/comprehensive.in.ts index 707eadf..b0971ce 100644 --- a/src/file-extension/spec/comprehensive.in.ts +++ b/src/file-extension/spec/comprehensive.in.ts @@ -30,11 +30,11 @@ import { LoggerConfig } from "./config/logger/logger-config.ts"; export class ComprehensiveTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, diff --git a/src/file-extension/spec/comprehensive.out.ts b/src/file-extension/spec/comprehensive.out.ts index be2fef4..cd8291f 100644 --- a/src/file-extension/spec/comprehensive.out.ts +++ b/src/file-extension/spec/comprehensive.out.ts @@ -30,11 +30,11 @@ import { LoggerConfig } from "./config/logger/logger-config.ts"; export class ComprehensiveTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, diff --git a/src/file-extension/spec/index-files.in.ts b/src/file-extension/spec/index-files.in.ts index 73f6382..1f78415 100644 --- a/src/file-extension/spec/index-files.in.ts +++ b/src/file-extension/spec/index-files.in.ts @@ -7,11 +7,11 @@ import { Types } from "./types/index.ts"; export class IndexFileTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, ) {} diff --git a/src/file-extension/spec/index-files.out.ts b/src/file-extension/spec/index-files.out.ts index 7a3ec4d..aa57b1f 100644 --- a/src/file-extension/spec/index-files.out.ts +++ b/src/file-extension/spec/index-files.out.ts @@ -7,11 +7,11 @@ import { Types } from "./types/index.ts"; export class IndexFileTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, ) {} diff --git a/src/file-extension/spec/multiple-imports.in.ts b/src/file-extension/spec/multiple-imports.in.ts index 3c4c7f8..804355e 100644 --- a/src/file-extension/spec/multiple-imports.in.ts +++ b/src/file-extension/spec/multiple-imports.in.ts @@ -12,11 +12,11 @@ import { Configs } from "./config/index.ts"; export class MultipleImportsTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, diff --git a/src/file-extension/spec/multiple-imports.out.ts b/src/file-extension/spec/multiple-imports.out.ts index 8b8cfb2..cd4db31 100644 --- a/src/file-extension/spec/multiple-imports.out.ts +++ b/src/file-extension/spec/multiple-imports.out.ts @@ -12,11 +12,11 @@ import { Configs } from "./config/index.ts"; export class MultipleImportsTest { constructor( - private user: User, + private user: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, private helpers: Helpers, private constants: Constants, diff --git a/src/file-extension/spec/ts-extensions.in.ts b/src/file-extension/spec/ts-extensions.in.ts index 82dc6eb..8b69692 100644 --- a/src/file-extension/spec/ts-extensions.in.ts +++ b/src/file-extension/spec/ts-extensions.in.ts @@ -7,11 +7,11 @@ import { Types } from "./types/user.ts"; export class TsExtensionTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, ) {} diff --git a/src/file-extension/spec/ts-extensions.out.ts b/src/file-extension/spec/ts-extensions.out.ts index 82dc6eb..8b69692 100644 --- a/src/file-extension/spec/ts-extensions.out.ts +++ b/src/file-extension/spec/ts-extensions.out.ts @@ -7,11 +7,11 @@ import { Types } from "./types/user.ts"; export class TsExtensionTest { constructor( - private userService: User, + private userService: InstanceType, private db: Database, private auth: AuthService, private logger: Logger, - private config: Config, + private config: typeof Config, private types: Types, ) {} diff --git a/src/file-extension/spec/type-imports.in.ts b/src/file-extension/spec/type-imports.in.ts index edd8498..c1398d6 100644 --- a/src/file-extension/spec/type-imports.in.ts +++ b/src/file-extension/spec/type-imports.in.ts @@ -1,19 +1,20 @@ +import { UserService } from "./models/user.js"; import type { User } from "./models/user.js"; import type { Database } from "../database/connection"; import type { AuthService } from "../../services/auth.ts"; import type { Logger } from "./utils/logger"; -import type { Config } from "./config/app.ts"; +import type { AppConfig as Config } from "./config/app.ts"; export class TypeImportTest { constructor( - private userService: User, + private userService: UserService, private db: Database, private auth: AuthService, private logger: Logger, private config: Config, ) {} - async testTypeImports(): Promise { + async testTypeImports(): Promise { this.logger.info("Testing type-only imports"); return await this.userService.findById("123"); } diff --git a/src/file-extension/spec/type-imports.out.ts b/src/file-extension/spec/type-imports.out.ts index ef70a9c..29f63a2 100644 --- a/src/file-extension/spec/type-imports.out.ts +++ b/src/file-extension/spec/type-imports.out.ts @@ -1,19 +1,20 @@ +import { UserService } from "./models/user.ts"; import type { User } from "./models/user.ts"; import type { Database } from "../database/connection.ts"; import type { AuthService } from "../../services/auth.ts"; import type { Logger } from "./utils/logger.ts"; -import type { Config } from "./config/app.ts"; +import type { AppConfig as Config } from "./config/app.ts"; export class TypeImportTest { constructor( - private userService: User, + private userService: UserService, private db: Database, private auth: AuthService, private logger: Logger, private config: Config, ) {} - async testTypeImports(): Promise { + async testTypeImports(): Promise { this.logger.info("Testing type-only imports"); return await this.userService.findById("123"); } -- 2.51.2