Generated classes now reflects their associated type

Signed-off-by: Jean-Baptiste Bianchi <jb.bianchi@neuroglia.io>

Author: JBBianchi

src/lib/builder.ts

@@ -19,7 +19,7 @@
  * Represents a fluent builder proxy
  */
 export type Builder<T> = {
-  build: () => T;
+  build: (validate?: boolean) => T;
 } & {
   [K in keyof T]-?: (arg: T[K]) => Builder<T>;
 };
@@ -29,21 +29,21 @@ export type Builder<T> = {
  * @param data The object to "build"
  * @returns
  */
-function defaultBuildingFn<T>(data: Partial<T>): () => T {
-  return () => data as T;
+function defaultBuildingFn<T>(data: Partial<T>): T {
+  return data as T;
 }
 
 /**
  * A factory for fluent builders that proxy properties assignations and can validate against schema on build()
  * @param {Function} buildingFn The function used to validate and produce the object on build()
  * @returns {Builder} A fluent builder
  */
-export function builder<T>(buildingFn?: (data: Partial<T>) => () => T): Builder<T> {
+export function builder<T>(buildingFn?: (data: Partial<T>) => T): Builder<T> {
   const data: Partial<T> = {};
   const proxy = new Proxy({} as Builder<T>, {
     get: (_, prop) => {
       if (prop === 'build') {
-        return (buildingFn || defaultBuildingFn)(data);
+        return (validate: boolean = true) => (validate ? (buildingFn || defaultBuildingFn)(data) : data);
       }
       return (value: unknown): Builder<T> => {
         (data as any)[prop.toString()] = value;

src/lib/generated/builders/authentication-policy-basic-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.AuthenticationPolicyBasic} data The underlying object
  * @returns {Specification.AuthenticationPolicyBasic} The validated underlying object
  */
-function buildingFn(data: Specification.AuthenticationPolicyBasic): () => Specification.AuthenticationPolicyBasic {
-  return () => {
-    const model = new Classes.AuthenticationPolicyBasic();
-    Object.assign(model, data);
+function buildingFn(data: Specification.AuthenticationPolicyBasic): Specification.AuthenticationPolicyBasic {
+  const model = new Classes.AuthenticationPolicyBasic();
+  Object.assign(model, data);
 
-    validate('AuthenticationPolicyBasic', model);
-    return model as Specification.AuthenticationPolicyBasic;
-  };
+  validate('AuthenticationPolicyBasic', model);
+  return model as Specification.AuthenticationPolicyBasic;
 }
 
 /**

src/lib/generated/builders/authentication-policy-bearer-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.AuthenticationPolicyBearer} data The underlying object
  * @returns {Specification.AuthenticationPolicyBearer} The validated underlying object
  */
-function buildingFn(data: Specification.AuthenticationPolicyBearer): () => Specification.AuthenticationPolicyBearer {
-  return () => {
-    const model = new Classes.AuthenticationPolicyBearer();
-    Object.assign(model, data);
+function buildingFn(data: Specification.AuthenticationPolicyBearer): Specification.AuthenticationPolicyBearer {
+  const model = new Classes.AuthenticationPolicyBearer();
+  Object.assign(model, data);
 
-    validate('AuthenticationPolicyBearer', model);
-    return model as Specification.AuthenticationPolicyBearer;
-  };
+  validate('AuthenticationPolicyBearer', model);
+  return model as Specification.AuthenticationPolicyBearer;
 }
 
 /**

src/lib/generated/builders/authentication-policy-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.AuthenticationPolicy} data The underlying object
  * @returns {Specification.AuthenticationPolicy} The validated underlying object
  */
-function buildingFn(data: Specification.AuthenticationPolicy): () => Specification.AuthenticationPolicy {
-  return () => {
-    const model = new Classes.AuthenticationPolicy();
-    Object.assign(model, data);
+function buildingFn(data: Specification.AuthenticationPolicy): Specification.AuthenticationPolicy {
+  const model = new Classes.AuthenticationPolicy();
+  Object.assign(model, data);
 
-    validate('AuthenticationPolicy', model);
-    return model as Specification.AuthenticationPolicy;
-  };
+  validate('AuthenticationPolicy', model);
+  return model as Specification.AuthenticationPolicy;
 }
 
 /**

src/lib/generated/builders/authentication-policy-oauth2-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.AuthenticationPolicyOauth2} data The underlying object
  * @returns {Specification.AuthenticationPolicyOauth2} The validated underlying object
  */
-function buildingFn(data: Specification.AuthenticationPolicyOauth2): () => Specification.AuthenticationPolicyOauth2 {
-  return () => {
-    const model = new Classes.AuthenticationPolicyOauth2();
-    Object.assign(model, data);
+function buildingFn(data: Specification.AuthenticationPolicyOauth2): Specification.AuthenticationPolicyOauth2 {
+  const model = new Classes.AuthenticationPolicyOauth2();
+  Object.assign(model, data);
 
-    validate('AuthenticationPolicyOauth2', model);
-    return model as Specification.AuthenticationPolicyOauth2;
-  };
+  validate('AuthenticationPolicyOauth2', model);
+  return model as Specification.AuthenticationPolicyOauth2;
 }
 
 /**

src/lib/generated/builders/authentication-policy-oauth2-client-builder.ts

@@ -26,14 +26,12 @@ import { Specification } from '../definitions';
  */
 function buildingFn(
   data: Specification.AuthenticationPolicyOauth2Client,
-): () => Specification.AuthenticationPolicyOauth2Client {
-  return () => {
-    const model = new Classes.AuthenticationPolicyOauth2Client();
-    Object.assign(model, data);
+): Specification.AuthenticationPolicyOauth2Client {
+  const model = new Classes.AuthenticationPolicyOauth2Client();
+  Object.assign(model, data);
 
-    validate('AuthenticationPolicyOauth2Client', model);
-    return model as Specification.AuthenticationPolicyOauth2Client;
-  };
+  validate('AuthenticationPolicyOauth2Client', model);
+  return model as Specification.AuthenticationPolicyOauth2Client;
 }
 
 /**

src/lib/generated/builders/call-async-api-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.CallAsyncAPI} data The underlying object
  * @returns {Specification.CallAsyncAPI} The validated underlying object
  */
-function buildingFn(data: Specification.CallAsyncAPI): () => Specification.CallAsyncAPI {
-  return () => {
-    const model = new Classes.CallAsyncAPI();
-    Object.assign(model, data);
+function buildingFn(data: Specification.CallAsyncAPI): Specification.CallAsyncAPI {
+  const model = new Classes.CallAsyncAPI();
+  Object.assign(model, data);
 
-    validate('CallAsyncAPI', model);
-    return model as Specification.CallAsyncAPI;
-  };
+  validate('CallAsyncAPI', model);
+  return model as Specification.CallAsyncAPI;
 }
 
 /**

src/lib/generated/builders/call-async-api-with-authentication-builder.ts

@@ -24,16 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.CallAsyncAPIWithAuthentication} data The underlying object
  * @returns {Specification.CallAsyncAPIWithAuthentication} The validated underlying object
  */
-function buildingFn(
-  data: Specification.CallAsyncAPIWithAuthentication,
-): () => Specification.CallAsyncAPIWithAuthentication {
-  return () => {
-    const model = new Classes.CallAsyncAPIWithAuthentication();
-    Object.assign(model, data);
+function buildingFn(data: Specification.CallAsyncAPIWithAuthentication): Specification.CallAsyncAPIWithAuthentication {
+  const model = new Classes.CallAsyncAPIWithAuthentication();
+  Object.assign(model, data);
 
-    validate('CallAsyncAPIWithAuthentication', model);
-    return model as Specification.CallAsyncAPIWithAuthentication;
-  };
+  validate('CallAsyncAPIWithAuthentication', model);
+  return model as Specification.CallAsyncAPIWithAuthentication;
 }
 
 /**

src/lib/generated/builders/call-async-api-with-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.CallAsyncAPIWith} data The underlying object
  * @returns {Specification.CallAsyncAPIWith} The validated underlying object
  */
-function buildingFn(data: Specification.CallAsyncAPIWith): () => Specification.CallAsyncAPIWith {
-  return () => {
-    const model = new Classes.CallAsyncAPIWith();
-    Object.assign(model, data);
+function buildingFn(data: Specification.CallAsyncAPIWith): Specification.CallAsyncAPIWith {
+  const model = new Classes.CallAsyncAPIWith();
+  Object.assign(model, data);
 
-    validate('CallAsyncAPIWith', model);
-    return model as Specification.CallAsyncAPIWith;
-  };
+  validate('CallAsyncAPIWith', model);
+  return model as Specification.CallAsyncAPIWith;
 }
 
 /**

src/lib/generated/builders/call-function-builder.ts

@@ -24,14 +24,12 @@ import { Specification } from '../definitions';
  * @param {Specification.CallFunction} data The underlying object
  * @returns {Specification.CallFunction} The validated underlying object
  */
-function buildingFn(data: Specification.CallFunction): () => Specification.CallFunction {
-  return () => {
-    const model = new Classes.CallFunction();
-    Object.assign(model, data);
+function buildingFn(data: Specification.CallFunction): Specification.CallFunction {
+  const model = new Classes.CallFunction();
+  Object.assign(model, data);
 
-    validate('CallFunction', model);
-    return model as Specification.CallFunction;
-  };
+  validate('CallFunction', model);
+  return model as Specification.CallFunction;
 }
 
 /**