orval-labs · mironbalcerzak · Apr 27, 2024 · Nov 16, 2024 · Nov 17, 2024
diff --git a/packages/core/src/generators/component-definition.ts b/packages/core/src/generators/component-definition.ts
@@ -55,6 +55,7 @@ export const generateComponentDefinition = (
       if (modelName !== type) {
         acc.push({
           name: modelName,
+          factoryMethod: '',
           model,
           imports,
         });

diff --git a/packages/core/src/generators/imports.ts b/packages/core/src/generators/imports.ts
@@ -5,6 +5,7 @@ import {
   GeneratorMutator,
   GeneratorVerbOptions,
   GetterPropType,
+  OutputModelFactoryMethodsMode,
 } from '../types';
 import { camel, upath } from '../utils';
 
@@ -14,12 +15,16 @@ export const generateImports = ({
   isRootKey,
   specsName,
   specKey: currentSpecKey,
+  factoryMethodOutput,
+  factoryMethodPrefix
 }: {
   imports: GeneratorImport[];
   target: string;
   isRootKey: boolean;
   specsName: Record<string, string>;
   specKey: string;
+  factoryMethodOutput?: (typeof OutputModelFactoryMethodsMode)[keyof typeof OutputModelFactoryMethodsMode];
+  factoryMethodPrefix?: string;
 }) => {
   if (!imports.length) {
     return '';
@@ -47,9 +52,14 @@ export const generateImports = ({
         } } from \'./${upath.join(path, camel(name))}\';`;
       }
 
-      return `import ${!values ? 'type ' : ''}{ ${name}${
+      let mainImport = `import ${!values ? 'type ' : ''}{ ${name}${
         alias ? ` as ${alias}` : ''
-      } } from \'./${camel(name)}\';`;
+      }${factoryMethodOutput == OutputModelFactoryMethodsMode.SINGLE ? `${factoryMethodPrefix}${name}` : ''} } from \'./${camel(name)}\';`;
+      if (factoryMethodOutput == OutputModelFactoryMethodsMode.SPLIT) {
+        let factoryMethodImport = `import { ${factoryMethodPrefix}${name} } from \'./${camel(name)}.factory\';`;
+        mainImport += '\n' + factoryMethodImport;
+      }
+      return mainImport;
     })
     .join('\n');
 };

diff --git a/packages/core/src/generators/interface.ts b/packages/core/src/generators/interface.ts
@@ -1,6 +1,6 @@
 import { SchemaObject } from 'openapi3-ts/oas30';
 import { getScalar } from '../getters';
-import { ContextSpecs } from '../types';
+import { ContextSpecs, OutputModelFactoryMethodsMode } from '../types';
 import { jsDoc } from '../utils';
 
 /**
@@ -53,17 +53,27 @@ export const generateInterface = ({
   } else {
     model += `export type ${name} = ${scalar.value};\n`;
   }
-
   // Filter out imports that refer to the type defined in current file (OpenAPI recursive schema definitions)
   const externalModulesImportsOnly = scalar.imports.filter(
     (importName) => importName.name !== name,
   );
 
+  let factoryMethod: string = '';
+  if (context?.output.modelFactoryMethods) {
+    let factoryMethodPrefix = context?.output.override?.modelFactoryMethods?.factoryMethodPrefix!;
+    factoryMethod = `export function ${factoryMethodPrefix}${name}(): ${name} ${scalar.factoryMethodValue}\n`;
+    if (context?.output.override?.modelFactoryMethods?.outputMode == OutputModelFactoryMethodsMode.SINGLE) {
+      model += factoryMethod;
+      factoryMethod = '';
+    }
+  }
+
   return [
     ...scalar.schemas,
     {
       name,
       model,
+      factoryMethod,
       imports: externalModulesImportsOnly,
     },
   ];

diff --git a/packages/core/src/generators/parameter-definition.ts b/packages/core/src/generators/parameter-definition.ts
@@ -29,6 +29,7 @@ export const generateParameterDefinition = (
       if (!schema.schema || imports.length) {
         acc.push({
           name: modelName,
+          factoryMethod: '',
           imports: imports.length
             ? [
                 {
@@ -63,6 +64,7 @@ export const generateParameterDefinition = (
       if (modelName !== resolvedObject.value) {
         acc.push({
           name: modelName,
+          factoryMethod: '',
           model,
           imports: resolvedObject.imports,
         });

diff --git a/packages/core/src/generators/schema-definition.ts b/packages/core/src/generators/schema-definition.ts
@@ -127,6 +127,7 @@ export const generateSchemasDefinition = (
 
       acc.push(...resolvedValue.schemas, {
         name: schemaName,
+        factoryMethod: '',
         model: output,
         imports,
       });

diff --git a/packages/core/src/getters/array.ts b/packages/core/src/getters/array.ts
@@ -44,6 +44,7 @@ export const getArray = ({
     }
     return {
       type: 'array',
+      factoryMethodValue: `[]`,
       isEnum: false,
       isRef: false,
       value: `[${resolvedObjects.map((o) => o.value).join(', ')}]`,
@@ -71,6 +72,7 @@ export const getArray = ({
           ? `(${resolvedObject.value})[]`
           : `${resolvedObject.value}[]`
       }`,
+      factoryMethodValue: `[]`,
       imports: resolvedObject.imports,
       schemas: resolvedObject.schemas,
       isEnum: false,

diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts
@@ -177,6 +177,7 @@ export const combineSchemas = ({
 
     return {
       value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
+      factoryMethodValue: `{}`,
       imports: [
         {
           name: pascal(name),
@@ -192,6 +193,7 @@ export const combineSchemas = ({
             })),
           ],
           model: newEnum,
+          factoryMethod: '',
           name: name,
         },
       ],
@@ -219,6 +221,7 @@ export const combineSchemas = ({
 
   return {
     value: value + nullable,
+    factoryMethodValue: `{}`,
     imports: resolvedValue
       ? [...resolvedData.imports, ...resolvedValue.imports]
       : resolvedData.imports,

diff --git a/packages/core/src/getters/object.ts b/packages/core/src/getters/object.ts
@@ -31,6 +31,7 @@ export const getObject = ({
     const { name, specKey } = getRefInfo(item.$ref, context);
     return {
       value: name + nullable,
+      factoryMethodValue: `''`,
       imports: [{ name, specKey }],
       schemas: [],
       isEnum: false,
@@ -115,12 +116,16 @@ export const getObject = ({
           const isReadOnly = item.readOnly || (schema as SchemaObject).readOnly;
           if (!index) {
             acc.value += '{';
+            acc.factoryMethodValue += '{\n  return {';
           }
 
           const doc = jsDoc(schema as SchemaObject, true);
 
           acc.hasReadonlyProps ||= isReadOnly || false;
           acc.imports.push(...resolvedValue.imports);
+          if (!isReadOnly || isRequired) {
+            acc.factoryMethodValue += `\n    ${getKey(key)}: ${resolvedValue.factoryMethodValue},`;
+          }
           acc.value += `\n  ${doc ? `${doc}  ` : ''}${
             isReadOnly && !context.output.override.suppressReadonlyModifier
               ? 'readonly '
@@ -142,6 +147,7 @@ export const getObject = ({
               }
             } else {
               acc.value += '\n}';
+              acc.factoryMethodValue += '\n  };\n}';
             }
 
             acc.value += nullable;
@@ -153,6 +159,7 @@ export const getObject = ({
           imports: [],
           schemas: [],
           value: '',
+          factoryMethodValue: '',
           isEnum: false,
           type: 'object' as SchemaType,
           isRef: false,
@@ -168,6 +175,7 @@ export const getObject = ({
     if (isBoolean(item.additionalProperties)) {
       return {
         value: `{ [key: string]: unknown }` + nullable,
+        factoryMethodValue: `{}`,
         imports: [],
         schemas: [],
         isEnum: false,
@@ -183,6 +191,7 @@ export const getObject = ({
     });
     return {
       value: `{[key: string]: ${resolvedValue.value}}` + nullable,
+      factoryMethodValue: `{}`,
       imports: resolvedValue.imports ?? [],
       schemas: resolvedValue.schemas ?? [],
       isEnum: false,
@@ -196,6 +205,7 @@ export const getObject = ({
   if (itemWithConst.const) {
     return {
       value: `'${itemWithConst.const}'` + nullable,
+      factoryMethodValue: `null`,
       imports: [],
       schemas: [],
       isEnum: false,
@@ -209,6 +219,7 @@ export const getObject = ({
     value:
       (item.type === 'object' ? '{ [key: string]: unknown }' : 'unknown') +
       nullable,
+    factoryMethodValue: `${item.type === 'object' ? '{}' : 'null'}`,
     imports: [],
     schemas: [],
     isEnum: false,

diff --git a/packages/core/src/getters/props.ts b/packages/core/src/getters/props.ts
@@ -96,6 +96,7 @@ export const getProps = ({
         required: true,
         schema: {
           name: parameterTypeName,
+          factoryMethod: '',
           model: namedParametersTypeDefinition,
           imports: params.flatMap((property) => property.imports),
         },

diff --git a/packages/core/src/getters/query-params.ts b/packages/core/src/getters/query-params.ts
@@ -82,7 +82,7 @@ const getQueryParamsTypes = (
         imports: [{ name: enumName }],
         schemas: [
           ...resolvedValue.schemas,
-          { name: enumName, model: enumValue, imports: resolvedValue.imports },
+          { name: enumName, model: enumValue, factoryMethod: '', imports: resolvedValue.imports },
         ],
         originalSchema: resolvedValue.originalSchema,
       };
@@ -125,6 +125,7 @@ export const getQueryParams = ({
 
   const schema = {
     name,
+    factoryMethod: '',
     model: `export type ${name} = {\n${type}\n};\n`,
     imports,
   };

diff --git a/packages/core/src/getters/res-req-types.ts b/packages/core/src/getters/res-req-types.ts
@@ -72,6 +72,7 @@ export const getResReqTypes = (
           return [
             {
               value: name,
+              factoryMethodValue: name,
               imports: [{ name, specKey, schemaName }],
               schemas: [],
               type: 'unknown',
@@ -129,6 +130,7 @@ export const getResReqTypes = (
           {
             value: name,
             imports: [{ name, specKey, schemaName }, ...additionalImports],
+            factoryMethodValue: name,
             schemas: [],
             type: 'unknown',
             isEnum: false,
@@ -223,6 +225,7 @@ export const getResReqTypes = (
       return [
         {
           value: defaultType,
+          factoryMethodValue: `''`,
           imports: [],
           schemas: [],
           type: defaultType,

diff --git a/packages/core/src/getters/scalar.ts b/packages/core/src/getters/scalar.ts
@@ -58,6 +58,7 @@ export const getScalar = ({
 
       return {
         value: value + nullable,
+        factoryMethodValue: `0`,
         isEnum,
         type: 'number',
         schemas: [],
@@ -79,6 +80,7 @@ export const getScalar = ({
 
       return {
         value: value + nullable,
+        factoryMethodValue: `false`,
         type: 'boolean',
         isEnum: false,
         schemas: [],
@@ -133,6 +135,7 @@ export const getScalar = ({
 
       return {
         value: value + nullable,
+        factoryMethodValue: `''`,
         isEnum,
         type: 'string',
         imports: [],
@@ -147,6 +150,7 @@ export const getScalar = ({
     case 'null':
       return {
         value: 'null',
+        factoryMethodValue: `null`,
         isEnum: false,
         type: 'null',
         imports: [],
@@ -167,6 +171,7 @@ export const getScalar = ({
 
         return {
           value: value + nullable,
+          factoryMethodValue: enumItems[0],
           isEnum: true,
           type: 'string',
           imports: [],

diff --git a/packages/core/src/resolvers/object.ts b/packages/core/src/resolvers/object.ts
@@ -30,11 +30,13 @@ const resolveObjectOriginal = ({
   ) {
     return {
       value: propName,
+      factoryMethodValue: `{}`,
       imports: [{ name: propName }],
       schemas: [
         ...resolvedValue.schemas,
         {
           name: propName,
+          factoryMethod: `export function ${context.output.override.modelFactoryMethods?.factoryMethodPrefix}${propName}(): ${propName}${resolvedValue.factoryMethodValue}`,
           model: `${doc}export type ${propName} = ${resolvedValue.value};\n`,
           imports: resolvedValue.imports,
         },
@@ -54,13 +56,19 @@ const resolveObjectOriginal = ({
       resolvedValue.originalSchema?.['x-enumNames'],
       context.output.override.useNativeEnums,
     );
+    const factoryMethodValue = context?.output.override?.useTypeOverInterfaces
+      ? `${propName}[${resolvedValue.value.split(' | ')[0]}]`
+      : `${resolvedValue.value.split(' | ')[0]}`;
+
 
     return {
       value: propName,
+      factoryMethodValue,
       imports: [{ name: propName }],
       schemas: [
         ...resolvedValue.schemas,
         {
+          factoryMethod: '',
           name: propName,
           model: doc + enumValue,
           imports: resolvedValue.imports,

diff --git a/packages/core/src/resolvers/value.ts b/packages/core/src/resolvers/value.ts
@@ -44,6 +44,7 @@ export const resolveValue = ({
 
     return {
       value: resolvedImport.name,
+      factoryMethodValue: `${context.output.override.modelFactoryMethods?.factoryMethodPrefix}${resolvedImport.name}()`,
       imports: [
         {
           name: resolvedImport.name,