Increase test coverage

SamuelMarks · SamuelMarks · commit 167e69468f72 · 2025-11-13T23:59:20.000-08:00
diff --git a/src/service/emit/admin/html/form-component-html.builder.ts b/src/service/emit/admin/html/form-component-html.builder.ts
@@ -64,16 +64,39 @@ export function generateFormComponentHtml(resource: Resource, parser: SwaggerPar
             const typeName = option.name; // e.g., 'cat' or 'dog'
             const subSchema = option.schema;
 
+            // ====================================================================
+            // THE FIX: Create a helper function to recursively merge properties from `allOf`.
+            // This ensures inherited properties (like `name` from `BasePet`) are included.
+            // ====================================================================
+            const getAllProperties = (schema: SwaggerDefinition): Record<string, SwaggerDefinition> => {
+                let allProperties: Record<string, SwaggerDefinition> = { ...schema.properties };
+                if (schema.allOf) {
+                    for (const sub of schema.allOf) {
+                        const resolvedSub = parser.resolve<SwaggerDefinition>(sub);
+                        if (resolvedSub) {
+                            const subProps = getAllProperties(resolvedSub); // Recurse
+                            // Merge base properties first, so subtype properties take precedence
+                            allProperties = { ...subProps, ...allProperties };
+                        }
+                    }
+                }
+                return allProperties;
+            };
+
+
             // Create a container that will be controlled by an Angular `@if` block.
             // This relies on the `isPetType(type: string)` method existing in the component class.
             const ifContainer = _.create('div');
 
             // Create the sub-form container with the `formGroupName` directive.
             const formGroupContainer = _.create('div').setAttribute('formGroupName', typeName);
 
+            // Use the helper to get all properties, including inherited ones.
+            const allSubSchemaProperties = getAllProperties(subSchema);
+
             // Generate controls for all properties of this specific subtype.
             // It is crucial to filter out the discriminator property itself to avoid rendering it twice.
-            Object.entries(subSchema.properties!)
+            Object.entries(allSubSchemaProperties)
                 .filter(([key, schema]) => key !== dPropName && !schema.readOnly)
                 .forEach(([key, schema]) => {
                     const control = buildFormControl({ name: key, schema: schema as SwaggerDefinition });
@@ -106,9 +129,9 @@ export function generateFormComponentHtml(resource: Resource, parser: SwaggerPar
         .setAttribute('[disabled]', 'form.invalid || form.pristine');
 
     // Dynamically change the save button's text based on whether we are creating or editing.
-    const saveButtonContent = `\n@if (isEditMode()) {
+    const saveButtonContent = `\n@if (isEditMode()) { 
   <span>Save Changes</span>
-} @else {
+} @else { 
   <span>Create ${resource.modelName}</span>
 }\n`;
     saveButton.setInnerHtml(saveButtonContent);
diff --git a/src/service/emit/admin/list-component.generator.ts b/src/service/emit/admin/list-component.generator.ts
@@ -307,9 +307,8 @@ this.subscriptions.push(sub);`;
         if (allProps.some(p => p.name === 'id')) {
             return 'id';
         }
-        if (allProps.length === 0) {
-            return 'id';
-        }
+        // `resource.formProperties` is guaranteed by the discovery phase
+        // to have at least one property (falling back to a default 'id').
         return allProps[0].name;
     }
 
diff --git a/src/service/emit/utility/auth-interceptor.generator.ts b/src/service/emit/utility/auth-interceptor.generator.ts
@@ -1,3 +1,4 @@
+// src/service/emit/utility/auth-interceptor.generator.ts
 import * as path from 'path';
 import { Project, Scope } from 'ts-morph';
 import { SwaggerParser } from '../../../core/parser.js';
@@ -93,6 +94,7 @@ export class AuthInterceptorGenerator {
         }
 
         let statementsBody = 'let authReq = req;';
+        let bearerLogicAdded = false;
 
         const uniqueSchemes = Array.from(new Set(securitySchemes.map(s => JSON.stringify(s)))).map(s => JSON.parse(s));
 
@@ -104,8 +106,9 @@ export class AuthInterceptorGenerator {
                     statementsBody += `\nif (this.apiKey) { authReq = authReq.clone({ setParams: { ...authReq.params.keys().reduce((acc, key) => ({ ...acc, [key]: authReq.params.getAll(key) }), {}), '${scheme.name}': this.apiKey } }); }`;
                 }
             } else if ((scheme.type === 'http' && scheme.scheme === 'bearer') || scheme.type === 'oauth2') {
-                if (!statementsBody.includes('this.bearerToken')) {
+                if (!bearerLogicAdded) {
                     statementsBody += `\nif (this.bearerToken) { const token = typeof this.bearerToken === 'function' ? this.bearerToken() : this.bearerToken; if (token) { authReq = authReq.clone({ setHeaders: { ...authReq.headers.keys().reduce((acc, key) => ({ ...acc, [key]: authReq.headers.getAll(key) }), {}), 'Authorization': \`Bearer \${token}\` } }); } }`;
+                    bearerLogicAdded = true;
                 }
             }
         }
diff --git a/src/service/emit/utility/index.generator.ts b/src/service/emit/utility/index.generator.ts
@@ -1,3 +1,4 @@
+// src/service/emit/utility/index.generator.ts
 import { Project, SourceFile } from "ts-morph";
 import * as path from "node:path";
 import { GeneratorConfig } from '../../../core/types.js';
@@ -103,11 +104,11 @@ export class ServiceIndexGenerator {
 
         for (const serviceFile of serviceFiles) {
             const serviceClass = serviceFile.getClasses()[0];
-            if (serviceClass && serviceClass.isExported()) {
-                const className = serviceClass.getName();
+            const className = serviceClass?.getName();
+            if (serviceClass && serviceClass.isExported() && className) {
                 const moduleSpecifier = `./${path.basename(serviceFile.getFilePath(), '.ts')}`;
                 sourceFile.addExportDeclaration({
-                    namedExports: [className!],
+                    namedExports: [className],
                     moduleSpecifier,
                 });
             }
diff --git a/src/service/emit/utility/provider.generator.ts b/src/service/emit/utility/provider.generator.ts
@@ -1,3 +1,4 @@
+// src/service/emit/utility/provider.generator.ts
 import { Project, SourceFile, InterfaceDeclaration } from 'ts-morph';
 import * as path from 'path';
 import { GeneratorConfig } from '../../../core/types.js';
@@ -25,7 +26,7 @@ export class ProviderGenerator {
      */
     constructor(private parser: SwaggerParser, private project: Project, private tokenNames: string[] = []) {
         this.config = parser.config;
-        this.clientName = this.config.clientName || 'default';
+        this.clientName = this.config.clientName ? this.config.clientName : 'default';
         this.capitalizedClientName = pascalCase(this.clientName);
         this.hasApiKey = this.tokenNames.includes('apiKey');
         this.hasBearer = this.tokenNames.includes('bearerToken');
diff --git a/tests/00-core/00-utils.spec.ts b/tests/00-core/00-utils.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import * as utils from '../../src/core/utils.js';
-import { GeneratorConfig } from '../../src/core/types.js';
+import { GeneratorConfig, SwaggerDefinition } from '../../src/core/types.js';
 import { MethodDeclaration } from 'ts-morph';
 
 describe('Core: utils.ts', () => {
@@ -42,10 +42,9 @@ describe('Core: utils.ts', () => {
     });
 
     describe('Type Resolution', () => {
-        it('should return "Record<string, any>" for object without properties', () => {
-            const schema = { type: 'object' };
-            const type = utils.getTypeScriptType(schema as any, config);
-            expect(type).toBe('Record<string, any>');
+        it('should return `Record<string, any>` for an object schema with no properties', () => {
+            const schema: SwaggerDefinition = { type: 'object' };
+            expect(utils.getTypeScriptType(schema, config, [])).toBe('Record<string, any>');
         });
 
         it('should return "any" for unknown schema types', () => {
diff --git a/tests/50-emit-admin/09-resource-discovery-coverage.spec.ts b/tests/50-emit-admin/09-resource-discovery-coverage.spec.ts
@@ -31,7 +31,6 @@ describe('Admin: resource-discovery (Coverage)', () => {
         expect(prop?.schema.properties).toHaveProperty('prop');
     });
 
-
     it('should not classify custom actions like "addItem" as a standard "create"', () => {
         const resources = runDiscovery(branchCoverageSpec);
         const resource = resources.find(r => r.name === 'widgets')!;
@@ -57,4 +56,53 @@ describe('Admin: resource-discovery (Coverage)', () => {
         expect(resource.formProperties.length).toBeGreaterThan(0);
         expect(resource.formProperties[0].name).toBe('name');
     });
+
+    it('should collect properties from swagger 2.0 formData parameters', () => {
+        const spec = {
+            swagger: '2.0',
+            paths: {
+                '/form-data': {
+                    post: {
+                        tags: ['FormData'],
+                        consumes: ['multipart/form-data'],
+                        parameters: [
+                            { name: 'file', in: 'formData', type: 'file' },
+                            { name: 'metadata', in: 'formData', type: 'string' }
+                        ]
+                    }
+                }
+            }
+        };
+        const resources = runDiscovery(spec);
+        const resource = resources.find(r => r.name === 'formData');
+        expect(resource).toBeDefined();
+        // formDataProperties are merged into the final list.
+        expect(resource!.formProperties.some(p => p.name === 'file')).toBe(true);
+        expect(resource!.formProperties.some(p => p.name === 'metadata')).toBe(true);
+    });
+
+    it('should handle unresolvable schemas gracefully', () => {
+        const spec = {
+            paths: {
+                '/bad-ref': {
+                    get: {
+                        tags: ['BadRef'],
+                        responses: { '200': { content: { 'application/json': { schema: { $ref: '#/non/existent' } } } } }
+                    }
+                }
+            }
+        };
+        const resources = runDiscovery(spec);
+        const resource = resources.find(r => r.name === 'badRef');
+        expect(resource).toBeDefined();
+        // The discovery should not crash and should produce a resource with fallback properties.
+        expect(resource!.formProperties).toEqual([{ name: 'id', schema: { type: 'string' } }]);
+    });
+
+    it('should correctly identify a resource with PATCH as editable', () => {
+        const resources = runDiscovery(branchCoverageSpec);
+        const resource = resources.find(r => r.name === 'patchResource');
+        expect(resource).toBeDefined();
+        expect(resource!.isEditable).toBe(true);
+    });
 });
diff --git a/tests/60-e2e/01-admin-full.e2e.spec.ts b/tests/60-e2e/01-admin-full.e2e.spec.ts
@@ -77,6 +77,11 @@ describe('E2E: Admin UI Generation', () => {
             expect(html).toContain("@if (isPetType('dog'))");
             expect(html).toContain('formGroupName="dog"');
             expect(html).toContain('formControlName="barkingLevel"');
+
+            expect(html).toContain("@if (isPetType('lizard'))");
+            expect(html).toContain('formGroupName="lizard"');
+            expect(html).toContain('formControlName="name"'); // from BasePet
+            expect(html).not.toContain('formControlName="unsupportedField"');
         });
     });
 });
diff --git a/tests/shared/specs.ts b/tests/shared/specs.ts
@@ -396,7 +396,7 @@ export const polymorphismSpec = {
         schemas: {
             Pet: {
                 type: 'object', required: ['petType'],
-                oneOf: [{ $ref: '#/components/schemas/Cat' }, { $ref: '#/components/schemas/Dog' }],
+                oneOf: [{ $ref: '#/components/schemas/Cat' }, { $ref: '#/components/schemas/Dog' }, { $ref: '#/components/schemas/Lizard' }],
                 discriminator: { propertyName: 'petType' },
                 properties: {
                     petType: { type: 'string' }
@@ -418,7 +418,16 @@ export const polymorphismSpec = {
                 required: ['petType'],
                 properties: { petType: { type: 'string', enum: ['dog'] }, barkingLevel: { type: 'integer' } }
             },
-            BasePet: { type: 'object', properties: { name: { type: 'string' } } }
+            BasePet: { type: 'object', properties: { name: { type: 'string' } } },
+            Lizard: {
+                type: 'object',
+                allOf: [{ $ref: '#/components/schemas/BasePet' }],
+                required: ['petType'],
+                properties: {
+                    petType: { type: 'string', enum: ['lizard'] },
+                    unsupportedField: { type: 'object' } // This will not generate a control
+                }
+            }
         }
     }
 };
@@ -502,7 +511,14 @@ export const finalCoverageSpec = {
                 operationId: 'getOAS2NoSchema',
                 responses: { '200': { description: 'Success' } }
             }
-        }
+        },
+        '/patch-resource/{id}': {
+            patch: {
+                tags: ['PatchResource'],
+                parameters: [{ name: 'id', in: 'path' }],
+                requestBody: { content: { 'application/json': { schema: { type: 'object' } } } }
+            }
+        },
     },
     components: {
         schemas: {

Original file line number	Diff line number	Diff line change
@@ -307,9 +307,8 @@ this.subscriptions.push(sub);`;
`307`	`307`	`if (allProps.some(p => p.name === 'id')) {`
`308`	`308`	`return 'id';`
`309`	`309`	`}`
`310`		`- if (allProps.length === 0) {`
`311`		`- return 'id';`
`312`		`- }`
	`310`	+ // `resource.formProperties` is guaranteed by the discovery phase
	`311`	`+ // to have at least one property (falling back to a default 'id').`
`313`	`312`	`return allProps[0].name;`
`314`	`313`	`}`
`315`	`314`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// src/service/emit/utility/auth-interceptor.generator.ts`
`1`	`2`	`import * as path from 'path';`
`2`	`3`	`import { Project, Scope } from 'ts-morph';`
`3`	`4`	`import { SwaggerParser } from '../../../core/parser.js';`
`@@ -93,6 +94,7 @@ export class AuthInterceptorGenerator {`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`let statementsBody = 'let authReq = req;';`
	`97`	`+ let bearerLogicAdded = false;`
`96`	`98`
`97`	`99`	`const uniqueSchemes = Array.from(new Set(securitySchemes.map(s => JSON.stringify(s)))).map(s => JSON.parse(s));`
`98`	`100`
`@@ -104,8 +106,9 @@ export class AuthInterceptorGenerator {`
`104`	`106`	statementsBody += `\nif (this.apiKey) { authReq = authReq.clone({ setParams: { ...authReq.params.keys().reduce((acc, key) => ({ ...acc, [key]: authReq.params.getAll(key) }), {}), '${scheme.name}': this.apiKey } }); }`;
`105`	`107`	`}`
`106`	`108`	`} else if ((scheme.type === 'http' && scheme.scheme === 'bearer') \|\| scheme.type === 'oauth2') {`
`107`		`- if (!statementsBody.includes('this.bearerToken')) {`
	`109`	`+ if (!bearerLogicAdded) {`
`108`	`110`	statementsBody += `\nif (this.bearerToken) { const token = typeof this.bearerToken === 'function' ? this.bearerToken() : this.bearerToken; if (token) { authReq = authReq.clone({ setHeaders: { ...authReq.headers.keys().reduce((acc, key) => ({ ...acc, [key]: authReq.headers.getAll(key) }), {}), 'Authorization': \`Bearer \${token}\` } }); } }`;
	`111`	`+ bearerLogicAdded = true;`
`109`	`112`	`}`
`110`	`113`	`}`
`111`	`114`	`}`