- Fixed export for isolatedModules

Author: ferdikoomen

src/templates/index.hbs

@@ -11,23 +11,29 @@ export { OpenAPI } from './core/OpenAPI';
 {{#if models}}
 
 {{#each models}}
-export { {{{this}}} } from './models/{{{this}}}';
+{{#if enum}}
+export { {{{name}}} } from './models/{{{name}}}';
+{{else if enums}}
+export { {{{name}}} } from './models/{{{name}}}';
+{{else}}
+export type { {{{name}}} } from './models/{{{name}}}';
+{{/if}}
 {{/each}}
 {{/if}}
 {{/if}}
 {{#if exportSchemas}}
 {{#if models}}
 
 {{#each models}}
-export { ${{{this}}} } from './schemas/${{{this}}}';
+export { ${{{name}}} } from './schemas/${{{name}}}';
 {{/each}}
 {{/if}}
 {{/if}}
 {{#if exportServices}}
 {{#if services}}
 
 {{#each services}}
-export { {{{this}}} } from './services/{{{this}}}';
+export { {{{name}}} } from './services/{{{name}}}';
 {{/each}}
 {{/if}}
 {{/if}}

src/utils/getModelNames.spec.ts

@@ -3,8 +3,7 @@ import { getModelNames } from './getModelNames';
 
 describe('getModelNames', () => {
     it('should return sorted list', () => {
-        const models: Model[] = [];
-        models.push({
+        const john: Model = {
             export: 'interface',
             name: 'John',
             type: 'John',
@@ -21,8 +20,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
-        models.push({
+        };
+        const jane: Model = {
             export: 'interface',
             name: 'Jane',
             type: 'Jane',
@@ -39,8 +38,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
-        models.push({
+        };
+        const doe: Model = {
             export: 'interface',
             name: 'Doe',
             type: 'Doe',
@@ -57,7 +56,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
+        };
+        const models: Model[] = [john, jane, doe];
 
         expect(getModelNames([])).toEqual([]);
         expect(getModelNames(models)).toEqual(['Doe', 'Jane', 'John']);

src/utils/getServiceNames.spec.ts

@@ -3,22 +3,23 @@ import { getServiceNames } from './getServiceNames';
 
 describe('getServiceNames', () => {
     it('should return sorted list', () => {
-        const services: Service[] = [];
-        services.push({
+        const john: Service = {
             name: 'John',
             operations: [],
             imports: [],
-        });
-        services.push({
+        };
+        const jane: Service = {
             name: 'Jane',
             operations: [],
             imports: [],
-        });
-        services.push({
+        };
+        const doe: Service = {
             name: 'Doe',
             operations: [],
             imports: [],
-        });
+        };
+
+        const services: Service[] = [john, jane, doe];
 
         expect(getServiceNames([])).toEqual([]);
         expect(getServiceNames(services)).toEqual(['Doe', 'Jane', 'John']);

src/utils/sortModelsByName.spec.ts

@@ -0,0 +1,65 @@
+import { Model } from '../client/interfaces/Model';
+import { sortModelsByName } from './sortModelsByName';
+
+describe('sortModelsByName', () => {
+    it('should return sorted list', () => {
+        const john: Model = {
+            export: 'interface',
+            name: 'John',
+            type: 'John',
+            base: 'John',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const jane: Model = {
+            export: 'interface',
+            name: 'Jane',
+            type: 'Jane',
+            base: 'Jane',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const doe: Model = {
+            export: 'interface',
+            name: 'Doe',
+            type: 'Doe',
+            base: 'Doe',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const models: Model[] = [john, jane, doe];
+
+        expect(sortModelsByName([])).toEqual([]);
+        expect(sortModelsByName(models)).toEqual([doe, jane, john]);
+    });
+});

src/utils/sortModelsByName.ts

@@ -0,0 +1,9 @@
+import { Model } from '../client/interfaces/Model';
+
+export function sortModelsByName(models: Model[]): Model[] {
+    return models.sort((a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        return nameA.localeCompare(nameB, 'en');
+    });
+}

src/utils/sortServicesByName.spec.ts

@@ -0,0 +1,27 @@
+import { Service } from '../client/interfaces/Service';
+import { sortServicesByName } from './sortServicesByName';
+
+describe('sortServicesByName', () => {
+    it('should return sorted list', () => {
+        const john: Service = {
+            name: 'John',
+            operations: [],
+            imports: [],
+        };
+        const jane: Service = {
+            name: 'Jane',
+            operations: [],
+            imports: [],
+        };
+        const doe: Service = {
+            name: 'Doe',
+            operations: [],
+            imports: [],
+        };
+
+        const services: Service[] = [john, jane, doe];
+
+        expect(sortServicesByName([])).toEqual([]);
+        expect(sortServicesByName(services)).toEqual([doe, jane, john]);
+    });
+});

src/utils/sortServicesByName.ts

@@ -0,0 +1,9 @@
+import { Service } from '../client/interfaces/Service';
+
+export function sortServicesByName(services: Service[]): Service[] {
+    return services.sort((a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        return nameA.localeCompare(nameB, 'en');
+    });
+}

src/utils/writeClientIndex.ts

@@ -2,9 +2,9 @@ import * as path from 'path';
 
 import { Client } from '../client/interfaces/Client';
 import { writeFile } from './fileSystem';
-import { getModelNames } from './getModelNames';
-import { getServiceNames } from './getServiceNames';
 import { Templates } from './registerHandlebarTemplates';
+import { sortModelsByName } from './sortModelsByName';
+import { sortServicesByName } from './sortServicesByName';
 
 /**
  * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
@@ -36,8 +36,8 @@ export async function writeClientIndex(
             exportSchemas,
             server: client.server,
             version: client.version,
-            models: getModelNames(client.models),
-            services: getServiceNames(client.services),
+            models: sortModelsByName(client.models),
+            services: sortServicesByName(client.services),
         })
     );
 }