chore(compiler): export models

hey-api · Apr 7, 2024 · 9f9c505 · 9f9c505
1 parent ed7a51b
commit 9f9c505
Show file tree

Hide file tree

Showing 12 changed files with 154 additions and 302 deletions.
diff --git a/packages/openapi-ts/src/compiler/types.ts b/packages/openapi-ts/src/compiler/types.ts
@@ -7,7 +7,7 @@ import { isType, ots } from './utils';
  * @param value - the unknown value.
  * @returns ts.Expression
  */
-export const toExpression = (value: unknown): ts.Expression | undefined => {
+export const toExpression = (value: unknown, unescape = false): ts.Expression | undefined => {
     if (Array.isArray(value)) {
         return createArrayType(value);
     } else if (typeof value === 'object' && value !== null) {
@@ -17,7 +17,7 @@ export const toExpression = (value: unknown): ts.Expression | undefined => {
     } else if (typeof value === 'boolean') {
         return ots.boolean(value);
     } else if (typeof value === 'string') {
-        return ots.string(value);
+        return ots.string(value, unescape);
     } else if (value === null) {
         return ts.factory.createNull();
     }

diff --git a/packages/openapi-ts/src/compiler/utils.ts b/packages/openapi-ts/src/compiler/utils.ts
@@ -1,5 +1,7 @@
 import ts from 'typescript';
 
+import { unescapeName } from '../utils/escape';
+
 export const CONFIG = {
     newLine: ts.NewLineKind.LineFeed,
     scriptKind: ts.ScriptKind.TS,
@@ -56,15 +58,15 @@ export const ots = {
         }
     },
     // Create a string literal. This handles strings that start with '`' or "'".
-    string: (value: string) => {
+    string: (value: string, unescape = false) => {
+        if (!unescape) {
+            value = unescapeName(value);
+        }
+        const text = encodeURIComponent(value);
         if (value.startsWith('`')) {
-            return ts.factory.createIdentifier(encodeURIComponent(value));
-        } else {
-            return ts.factory.createStringLiteral(
-                encodeURIComponent(value),
-                value.includes("'") ? false : CONFIG.useSingleQuotes
-            );
+            return ts.factory.createIdentifier(text);
         }
+        return ts.factory.createStringLiteral(text, value.includes("'") ? false : CONFIG.useSingleQuotes);
     },
 };
 

diff --git a/packages/openapi-ts/src/templates/exportModel.hbs b/packages/openapi-ts/src/templates/exportModel.hbs
diff --git a/packages/openapi-ts/src/templates/partials/exportComposition.hbs b/packages/openapi-ts/src/templates/partials/exportComposition.hbs
diff --git a/packages/openapi-ts/src/templates/partials/exportEnum.hbs b/packages/openapi-ts/src/templates/partials/exportEnum.hbs
diff --git a/packages/openapi-ts/src/templates/partials/exportInterface.hbs b/packages/openapi-ts/src/templates/partials/exportInterface.hbs
diff --git a/packages/openapi-ts/src/templates/partials/exportType.hbs b/packages/openapi-ts/src/templates/partials/exportType.hbs
diff --git a/packages/openapi-ts/src/utils/__tests__/handlebars.spec.ts b/packages/openapi-ts/src/utils/__tests__/handlebars.spec.ts
@@ -84,7 +84,6 @@ describe('registerHandlebarTemplates', () => {
                 version: '',
             }
         );
-        expect(templates.exports.model).toBeDefined();
         expect(templates.exports.service).toBeDefined();
         expect(templates.core.settings).toBeDefined();
         expect(templates.core.apiError).toBeDefined();

diff --git a/packages/openapi-ts/src/utils/handlebars.ts b/packages/openapi-ts/src/utils/handlebars.ts
@@ -47,12 +47,7 @@ import xhrGetResponseBody from '../templates/core/xhr/getResponseBody.hbs';
 import xhrGetResponseHeader from '../templates/core/xhr/getResponseHeader.hbs';
 import xhrRequest from '../templates/core/xhr/request.hbs';
 import xhrSendRequest from '../templates/core/xhr/sendRequest.hbs';
-import templateExportModel from '../templates/exportModel.hbs';
 import templateExportService from '../templates/exportService.hbs';
-import partialExportComposition from '../templates/partials/exportComposition.hbs';
-import partialExportEnum from '../templates/partials/exportEnum.hbs';
-import partialExportInterface from '../templates/partials/exportInterface.hbs';
-import partialExportType from '../templates/partials/exportType.hbs';
 import partialIsNullable from '../templates/partials/isNullable.hbs';
 import partialIsReadOnly from '../templates/partials/isReadOnly.hbs';
 import partialOperationParameters from '../templates/partials/operationParameters.hbs';
@@ -292,7 +287,6 @@ export interface Templates {
         types: Handlebars.TemplateDelegate;
     };
     exports: {
-        model: Handlebars.TemplateDelegate;
         service: Handlebars.TemplateDelegate;
     };
 }
@@ -319,16 +313,11 @@ export const registerHandlebarTemplates = (config: Config, client: Client): Temp
             types: Handlebars.template(templateCoreTypes),
         },
         exports: {
-            model: Handlebars.template(templateExportModel),
             service: Handlebars.template(templateExportService),
         },
     };
 
     // Partials for the generations of the models, services, etc.
-    Handlebars.registerPartial('exportComposition', Handlebars.template(partialExportComposition));
-    Handlebars.registerPartial('exportEnum', Handlebars.template(partialExportEnum));
-    Handlebars.registerPartial('exportInterface', Handlebars.template(partialExportInterface));
-    Handlebars.registerPartial('exportType', Handlebars.template(partialExportType));
     Handlebars.registerPartial('isNullable', Handlebars.template(partialIsNullable));
     Handlebars.registerPartial('isReadOnly', Handlebars.template(partialIsReadOnly));
     Handlebars.registerPartial('operationParameters', Handlebars.template(partialOperationParameters));

diff --git a/packages/openapi-ts/src/utils/write/__tests__/mocks.ts b/packages/openapi-ts/src/utils/write/__tests__/mocks.ts
@@ -16,7 +16,6 @@ export const mockTemplates: Templates = {
         types: vi.fn().mockReturnValue('types'),
     },
     exports: {
-        model: vi.fn().mockReturnValue('model'),
         service: vi.fn().mockReturnValue('service'),
     },
 };