ignore additionalProperties when are declared as function

antmendoza · antmendoza · commit bbc3bbb10bf4 · 2021-07-10T08:29:07.000+02:00
Signed-off-by: Antonio Mendoza Pérez &lt;antmendoza@gmail.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lib/definitions/callbackstate.ts b/src/lib/definitions/callbackstate.ts
@@ -110,7 +110,7 @@ export class Callbackstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Callbackstate} without deleted properties.
    */
-  normalize(): Callbackstate {
+  normalize = (): Callbackstate => {
     const clone = new Callbackstate(this);
 
     normalizeUsedForCompensationProperty(clone);
@@ -121,5 +121,5 @@ export class Callbackstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/databasedswitch.ts b/src/lib/definitions/databasedswitch.ts
@@ -84,13 +84,13 @@ export class Databasedswitch {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Databasedswitch} without deleted properties.
    */
-  normalize(): Databasedswitch {
+  normalize = (): Databasedswitch => {
     const clone = new Databasedswitch(this);
 
     normalizeUsedForCompensationProperty(clone);
     normalizeOnErrorsProperty(clone);
     normalizeDataConditionsProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/defaultdef.ts b/src/lib/definitions/defaultdef.ts
@@ -39,13 +39,13 @@ export class Defaultdef /* Default definition. Can be either a transition or end
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Defaultdef} without deleted properties.
    */
-  normalize(): Defaultdef {
+  normalize = (): Defaultdef => {
     const clone = new Defaultdef(this);
 
     normalizeEndProperty(clone);
     normalizeTransitionProperty(clone);
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/delaystate.ts b/src/lib/definitions/delaystate.ts
@@ -93,7 +93,7 @@ export class Delaystate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Delaystate} without deleted properties.
    */
-  normalize(): Delaystate {
+  normalize = (): Delaystate => {
     const clone = new Delaystate(this);
 
     normalizeUsedForCompensationProperty(clone);
@@ -102,5 +102,5 @@ export class Delaystate {
     normalizeTransitionProperty(clone);
     setEndValueIfNoTransition(clone);
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/end.ts b/src/lib/definitions/end.ts
@@ -45,12 +45,12 @@ export class End {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.End} without deleted properties.
    */
-  normalize(): End {
+  normalize = (): End => {
     const clone = new End(this);
 
     normalizeCompensateProperty(clone);
     normalizeTerminateProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/enddatacondition.ts b/src/lib/definitions/enddatacondition.ts
@@ -44,11 +44,11 @@ export class Enddatacondition {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Enddatacondition} without deleted properties.
    */
-  normalize(): Enddatacondition {
+  normalize = (): Enddatacondition => {
     const clone = new Enddatacondition(this);
 
     normalizeEndProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/enddeventcondition.ts b/src/lib/definitions/enddeventcondition.ts
@@ -56,11 +56,11 @@ export class Enddeventcondition {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Enddeventcondition} without deleted properties.
    */
-  normalize(): Enddeventcondition {
+  normalize = (): Enddeventcondition => {
     const clone = new Enddeventcondition(this);
 
     normalizeEndProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/error.ts b/src/lib/definitions/error.ts
@@ -51,7 +51,7 @@ export class Error {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Error} without deleted properties.
    */
-  normalize(): Error {
+  normalize = (): Error => {
     const clone = new Error(this);
 
     normalizeEndProperty(clone);
@@ -60,5 +60,5 @@ export class Error {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/eventbasedswitch.ts b/src/lib/definitions/eventbasedswitch.ts
@@ -91,13 +91,13 @@ export class Eventbasedswitch {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Eventbasedswitch} without deleted properties.
    */
-  normalize(): Eventbasedswitch {
+  normalize = (): Eventbasedswitch => {
     const clone = new Eventbasedswitch(this);
 
     normalizeUsedForCompensationProperty(clone);
     normalizeOnErrorsProperty(clone);
     normalizeEventConditionsProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/eventdef.ts b/src/lib/definitions/eventdef.ts
@@ -58,11 +58,11 @@ export class Eventdef {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Eventdef} without deleted properties.
    */
-  normalize(): Eventdef {
+  normalize = (): Eventdef => {
     const clone = new Eventdef(this);
 
     normalizeKindProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/eventstate.ts b/src/lib/definitions/eventstate.ts
@@ -89,7 +89,7 @@ export class Eventstate /* This state is used to wait for events from event sour
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Eventstate} without deleted properties.
    */
-  normalize(): Eventstate {
+  normalize = (): Eventstate => {
     const clone = new Eventstate(this);
 
     normalizeExclusiveProperty(clone);
@@ -100,5 +100,5 @@ export class Eventstate /* This state is used to wait for events from event sour
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/exectimeout.ts b/src/lib/definitions/exectimeout.ts
@@ -39,11 +39,11 @@ export class Exectimeout {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Exectimeout} without deleted properties.
    */
-  normalize(): Exectimeout {
+  normalize = (): Exectimeout => {
     const clone = new Exectimeout(this);
 
     normalizeInterruptProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/foreachstate.ts b/src/lib/definitions/foreachstate.ts
@@ -113,7 +113,7 @@ export class Foreachstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Foreachstate} without deleted properties.
    */
-  normalize(): Foreachstate {
+  normalize = (): Foreachstate => {
     const clone = new Foreachstate(this);
 
     normalizeUsedForCompensationProperty(clone);
@@ -123,5 +123,5 @@ export class Foreachstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/function.ts b/src/lib/definitions/function.ts
@@ -40,11 +40,12 @@ export class Function {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Function} without deleted properties.
    */
-  normalize(): Function {
+
+  normalize = (): Function => {
     const clone = new Function(this);
 
     normalizeTypeRestProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/injectstate.ts b/src/lib/definitions/injectstate.ts
@@ -84,7 +84,7 @@ export class Injectstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Injectstate} without deleted properties.
    */
-  normalize(): Injectstate {
+  normalize = (): Injectstate => {
     const clone = new Injectstate(this);
 
     normalizeUsedForCompensationProperty(clone);
@@ -94,5 +94,5 @@ export class Injectstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/onevents.ts b/src/lib/definitions/onevents.ts
@@ -48,11 +48,11 @@ export class Onevents {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Onevents} without deleted properties.
    */
-  normalize(): Onevents {
+  normalize = (): Onevents => {
     const clone = new Onevents(this);
 
     normalizeActionModeParallelProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/operationstate.ts b/src/lib/definitions/operationstate.ts
@@ -102,7 +102,7 @@ export class Operationstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Operationstate} without deleted properties.
    */
-  normalize(): Operationstate {
+  normalize = (): Operationstate => {
     const clone = new Operationstate(this);
 
     normalizeActionModeSequentialProperty(clone);
@@ -113,5 +113,5 @@ export class Operationstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/parallelstate.ts b/src/lib/definitions/parallelstate.ts
@@ -106,7 +106,7 @@ export class Parallelstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Parallelstate} without deleted properties.
    */
-  normalize(): Parallelstate {
+  normalize = (): Parallelstate => {
     const clone = new Parallelstate(this);
 
     normalizeCompletionTypeProperty(clone);
@@ -118,5 +118,5 @@ export class Parallelstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/repeat.ts b/src/lib/definitions/repeat.ts
@@ -51,12 +51,12 @@ export class Repeat {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Repeat} without deleted properties.
    */
-  normalize(): Repeat {
+  normalize = (): Repeat => {
     const clone = new Repeat(this);
 
     normalizeContinueOnErrorProperty(clone);
     normalizeCheckBeforeProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/subflowstate.ts b/src/lib/definitions/subflowstate.ts
@@ -105,7 +105,7 @@ export class Subflowstate {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Subflowstate} without deleted properties.
    */
-  normalize(): Subflowstate {
+  normalize = (): Subflowstate => {
     const clone = new Subflowstate(this);
 
     normalizeUsedForCompensationProperty(clone);
@@ -120,5 +120,5 @@ export class Subflowstate {
     setEndValueIfNoTransition(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/transition.ts b/src/lib/definitions/transition.ts
@@ -44,11 +44,11 @@ export class Transition {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Transition} without deleted properties.
    */
-  normalize(): Transition {
+  normalize = (): Transition => {
     const clone = new Transition(this);
 
     normalizeCompensateProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/transitiondatacondition.ts b/src/lib/definitions/transitiondatacondition.ts
@@ -44,11 +44,11 @@ export class Transitiondatacondition {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Transitiondatacondition} without deleted properties.
    */
-  normalize(): Transitiondatacondition {
+  normalize = (): Transitiondatacondition => {
     const clone = new Transitiondatacondition(this);
 
     normalizeTransitionProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/transitioneventcondition.ts b/src/lib/definitions/transitioneventcondition.ts
@@ -55,11 +55,11 @@ export class Transitioneventcondition {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Transitioneventcondition} without deleted properties.
    */
-  normalize(): Transitioneventcondition {
+  normalize = (): Transitioneventcondition => {
     const clone = new Transitioneventcondition(this);
 
     normalizeTransitionProperty(clone);
 
     return clone;
-  }
+  };
 }
diff --git a/src/lib/definitions/workflow.ts b/src/lib/definitions/workflow.ts
@@ -98,7 +98,7 @@ export class Workflow {
    * Normalize the value of each property by recursively deleting properties whose value is equal to its default value. Does not modify the object state.
    * @returns {Specification.Workflow} without deleted properties.
    */
-  normalize(): Workflow {
+  normalize = (): Workflow => {
     const clone = new Workflow(this);
     normalizeKeepActiveProperty(clone);
 
@@ -111,7 +111,7 @@ export class Workflow {
 
     normalizeExecTimeout(clone);
     return clone;
-  }
+  };
 
   /**
    * Parses the provided string as Workflow
@@ -144,6 +144,6 @@ export class Workflow {
    */
   static toYaml(workflow: Workflow): string {
     validate('Workflow', workflow);
-    return yaml.dump(workflow.normalize());
+    return yaml.dump(JSON.parse(JSON.stringify(workflow.normalize())));
   }
 }
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -11,7 +11,7 @@ export const validate = (typeName: string, data: any): boolean => {
   const validateFn: ValidateFunction | undefined = validators.get(typeName);
   // TODO: ignore validation if no validator or throw ?
   if (!validateFn) return data;
-  if (!validateFn(data)) {
+  if (!validateFn(JSON.parse(JSON.stringify(data)))) {
     console.warn(validateFn.errors);
     const firstError: DefinedError = (validateFn.errors as DefinedError[])[0];
     throw new Error(
diff --git a/tests/lib/utils.spec.ts b/tests/lib/utils.spec.ts
