feat(client): move typeX templates to typescript generation

packages/openapi-ts/rollup.config.ts

@@ -33,18 +33,14 @@ export function handlebarsPlugin(): Plugin {
                         equals: true,
                         escapeComment: true,
                         escapeDescription: true,
-                        escapeNewline: true,
-                        exactArray: true,
                         getDefaultPrintable: true,
                         hasDefault: true,
-                        ifNotNullNotUndefined: true,
                         ifOperationDataOptional: true,
                         ifdef: true,
-                        intersection: true,
                         modelIsRequired: true,
-                        modelUnionType: true,
                         nameOperationDataType: true,
                         notEquals: true,
+                        toType: true,
                         useDateType: true,
                     },
                     knownHelpersOnly: true,

packages/openapi-ts/src/openApi/v2/parser/getModelProperties.ts

@@ -1,4 +1,4 @@
-import { escapeName } from '../../../utils/escapeName';
+import { escapeName } from '../../../utils/escape';
 import type { Model } from '../../common/interfaces/client';
 import { getPattern } from '../../common/parser/getPattern';
 import { getType } from '../../common/parser/type';

packages/openapi-ts/src/openApi/v3/parser/getModelProperties.ts

@@ -1,4 +1,4 @@
-import { escapeName } from '../../../utils/escapeName';
+import { escapeName } from '../../../utils/escape';
 import type { Model } from '../../common/interfaces/client';
 import { getDefault } from '../../common/parser/getDefault';
 import { getPattern } from '../../common/parser/getPattern';

packages/openapi-ts/src/templates/partials/exportComposition.hbs

@@ -8,7 +8,7 @@
 {{/if}}
  */
 {{/ifdef}}
-export type {{{name}}} = {{>type parent=name}};
+export type {{{name}}} = {{toType this @root.$config}};
 
 {{#if enums}}
 {{#each enums}}

packages/openapi-ts/src/templates/partials/exportInterface.hbs

@@ -20,7 +20,7 @@ export type {{{name}}} = {
 	{{/if}}
 	 */
 	{{/ifdef}}
-	{{>isReadOnly}}{{{name}}}{{{modelIsRequired this}}}: {{>type parent=../name}};
+	{{>isReadOnly}}{{{name}}}{{{modelIsRequired this}}}: {{toType this @root.$config}};
 	{{/each}}
 }{{>isNullable}};
 

packages/openapi-ts/src/templates/partials/exportType.hbs

@@ -8,4 +8,4 @@
 {{/if}}
  */
 {{/ifdef}}
-export type {{{name}}} = {{>type}};
+export type {{{name}}} = {{toType this @root.$config}};

packages/openapi-ts/src/templates/partials/operationParameters.hbs

@@ -12,7 +12,7 @@ data: {{#if parameters}}{{{nameOperationDataType @root this}}} & {{/if}}TConfig<
 {{#if parameters}}
 
 {{#each parameters}}
-{{{name}}}{{{modelIsRequired this}}}: {{>type}}{{#hasDefault this}} = {{{getDefaultPrintable this}}}{{/hasDefault}},
+{{{name}}}{{{modelIsRequired this}}}: {{toType this @root.$config}}{{#hasDefault this}} = {{{getDefaultPrintable this}}}{{/hasDefault}},
 {{/each}}
 {{/if}}
 {{/if}}

packages/openapi-ts/src/templates/partials/operationResult.hbs

@@ -6,7 +6,7 @@
 {{~/notEquals~}}
 {{~/if~}}
 {{~#if results~}}
-{{#each results}}{{>type}}{{#unless @last}} | {{/unless}}{{/each}}
+{{#each results}}{{toType this @root.$config}}{{#unless @last}} | {{/unless}}{{/each}}
 {{~else~}}
 void
 {{~/if~}}

packages/openapi-ts/src/utils/__tests__/escapeName.spec.ts → packages/openapi-ts/src/utils/__tests__/escape.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { escapeName, unescapeName } from '../escapeName';
+import { escapeName, unescapeName } from '../escape';
 
 const toCheck: { unescaped: string; escaped: string }[] = [
     { escaped: "''", unescaped: '' },

packages/openapi-ts/src/utils/__tests__/handlebars.spec.ts

@@ -45,16 +45,11 @@ describe('registerHandlebarHelpers', () => {
         expect(helpers).toContain('equals');
         expect(helpers).toContain('escapeComment');
         expect(helpers).toContain('escapeDescription');
-        expect(helpers).toContain('escapeNewline');
-        expect(helpers).toContain('exactArray');
         expect(helpers).toContain('ifdef');
         expect(helpers).toContain('ifOperationDataOptional');
-        expect(helpers).toContain('intersection');
         expect(helpers).toContain('modelIsRequired');
-        expect(helpers).toContain('modelUnionType');
         expect(helpers).toContain('nameOperationDataType');
         expect(helpers).toContain('notEquals');
-        expect(helpers).toContain('useDateType');
     });
 });
 

packages/openapi-ts/src/utils/enum.ts

@@ -1,7 +1,7 @@
 import type { Enum } from '../openApi';
 import type { Client } from '../types/client';
 import type { Config } from '../types/config';
-import { unescapeName } from './escapeName';
+import { unescapeName } from './escape';
 import { unique } from './unique';
 
 /**

packages/openapi-ts/src/utils/escapeName.ts → packages/openapi-ts/src/utils/escape.ts

@@ -1,3 +1,5 @@
+import { EOL } from 'os';
+
 /**
  * Javascript identifier regexp pattern retrieved from
  * {@link} https://developer.mozilla.org/docs/Web/JavaScript/Reference/Lexical_grammar#identifiers
@@ -20,3 +22,12 @@ export const unescapeName = (value: string): string => {
     }
     return value;
 };
+
+export const escapeComment = (value: string) =>
+    value
+        .replace(/\*\//g, '*')
+        .replace(/\/\*/g, '*')
+        .replace(/\r?\n(.*)/g, (_, w) => `${EOL} * ${w.trim()}`);
+
+export const escapeDescription = (value: string) =>
+    value.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\${/g, '\\${');