From a019eda01b15d5642c6538aa6514667c12183ef1 Mon Sep 17 00:00:00 2001 From: KDM Date: Fri, 25 Jul 2025 14:23:11 -0700 Subject: [PATCH 1/2] Updated typescript interface generator usage to provide option for interface nomenclature support --- src/handler-factory.ts | 1 + src/readme-factory.ts | 4 ++-- src/router-factory-factory.ts | 2 +- src/types-factory.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/handler-factory.ts b/src/handler-factory.ts index 749bf0d..4eda22c 100644 --- a/src/handler-factory.ts +++ b/src/handler-factory.ts @@ -116,6 +116,7 @@ export class ExpressHandlerFactory extends BaseFactory { )} = (getService: (req: Request, res: Response) => ${buildInterfaceName( int, this.typesModule, + this.options, )}): ${this.expressTypesModule}.${buildRequestHandlerTypeName( method.name.value, )} => async (req, res, next) => {`; diff --git a/src/readme-factory.ts b/src/readme-factory.ts index f65232f..0b94c78 100644 --- a/src/readme-factory.ts +++ b/src/readme-factory.ts @@ -268,11 +268,11 @@ export const handler: RequestHandler = (err, req, res, next) => { } private buildServiceGetterName(int: Interface): string { - return `get${pascal(buildInterfaceName(int))}`; + return `get${pascal(buildInterfaceName(int, undefined, this.options))}`; } private buildServiceImplName(int: Interface): string { - return `My${pascal(buildInterfaceName(int))}`; + return `My${pascal(buildInterfaceName(int, undefined, this.options))}`; } } diff --git a/src/router-factory-factory.ts b/src/router-factory-factory.ts index dbacb04..2b9d0f1 100644 --- a/src/router-factory-factory.ts +++ b/src/router-factory-factory.ts @@ -34,7 +34,7 @@ export class ExpressRouterFactoryFactory extends BaseFactory { } private buildServiceGetterName(int: Interface): string { - return `get${pascal(buildInterfaceName(int))}`; + return `get${pascal(buildInterfaceName(int, undefined, this.options))}`; } private *buildHelpers(): Iterable { diff --git a/src/types-factory.ts b/src/types-factory.ts index 443c4d7..7b25ef1 100644 --- a/src/types-factory.ts +++ b/src/types-factory.ts @@ -57,7 +57,7 @@ export class ExpressTypesFactory extends BaseFactory { } private buildServiceGetterName(int: Interface): string { - return `get${pascal(buildInterfaceName(int))}`; + return `get${pascal(buildInterfaceName(int, undefined, this.options))}`; } private *buildErrorTypes(): Iterable { @@ -84,6 +84,7 @@ export class ExpressTypesFactory extends BaseFactory { yield `${serviceGetterName}: (req: Request, res: Response) => ${buildInterfaceName( int, this.typesModule, + this.options, )};`; } yield ''; From e29b612b6df2974a2f8607fa01d2c1da6b807e0e Mon Sep 17 00:00:00 2001 From: KDM Date: Tue, 12 Aug 2025 07:42:19 -0700 Subject: [PATCH 2/2] Bumped @basketry/typescript to 0.2.1 --- package-lock.json | 14 +++++++------- package.json | 2 +- src/snapshot/zod/v1/types.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6fb745a..802c965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.4.0", "license": "MIT", "dependencies": { - "@basketry/typescript": "^0.2.0", + "@basketry/typescript": "^0.2.1", "@basketry/typescript-dtos": "^0.2.0", "basketry": "^0.2.0", "case": "^1.6.3", @@ -600,9 +600,9 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "node_modules/@basketry/typescript": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@basketry/typescript/-/typescript-0.2.0.tgz", - "integrity": "sha512-CF24bt9NiLDccQKqA1iUDYfC+6FMC0IYrd56F2rnXVt9pTkaITk/Rj7IZL8NHHjTLcRw//4EJa/D4eISkbe3xg==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@basketry/typescript/-/typescript-0.2.1.tgz", + "integrity": "sha512-iUV023DIFos7reIy/IHEwgMrTdFamMovRyPk2n8X2Wvf35h6ORH4yTunhNOf+swOBWLnH6HhEMUEfyLUHwSRcQ==", "dependencies": { "basketry": "^0.2.0", "case": "^1.6.3" @@ -8999,9 +8999,9 @@ } }, "@basketry/typescript": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@basketry/typescript/-/typescript-0.2.0.tgz", - "integrity": "sha512-CF24bt9NiLDccQKqA1iUDYfC+6FMC0IYrd56F2rnXVt9pTkaITk/Rj7IZL8NHHjTLcRw//4EJa/D4eISkbe3xg==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@basketry/typescript/-/typescript-0.2.1.tgz", + "integrity": "sha512-iUV023DIFos7reIy/IHEwgMrTdFamMovRyPk2n8X2Wvf35h6ORH4yTunhNOf+swOBWLnH6HhEMUEfyLUHwSRcQ==", "requires": { "basketry": "^0.2.0", "case": "^1.6.3" diff --git a/package.json b/package.json index 349126c..aeb32bb 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "zod": "^3.24.1" }, "dependencies": { - "@basketry/typescript": "^0.2.0", + "@basketry/typescript": "^0.2.1", "@basketry/typescript-dtos": "^0.2.0", "basketry": "^0.2.0", "case": "^1.6.3", diff --git a/src/snapshot/zod/v1/types.ts b/src/snapshot/zod/v1/types.ts index 20d09ee..58c919e 100644 --- a/src/snapshot/zod/v1/types.ts +++ b/src/snapshot/zod/v1/types.ts @@ -1,5 +1,5 @@ /** - * This code was generated by @basketry/typescript@0.2.0 + * This code was generated by @basketry/typescript@0.2.1 * * Changes to this file may cause incorrect behavior and will be lost if * the code is regenerated.