wip

jonaslagoni · Apr 18, 2024 · c6a8d72 · c6a8d72
1 parent 968a55f
commit c6a8d72
Show file tree

Hide file tree

Showing 32 changed files with 1,566 additions and 734 deletions.
diff --git a/docs/migrations/version-3-to-4.md b/docs/migrations/version-3-to-4.md
@@ -2,6 +2,13 @@
 
 This document contain all the breaking changes and migrations guidelines for adapting your code to the new version.
 
+## Rewrite of how types are determined
+
+In v3 and below, there was a edge case where a type could not be determined IF it was a cyclic model that was NOT split out into separate models. This change affects all generators to various degrees.
+
+For example 
+
+
 ## Deprecation of `processor.interpreter`
 
 Since the early days we had the option to set `processorOptions.interpreter` options to change how JSON Schema is interpreted to Meta models. However, these options are more accurately part of the `processorOptions.jsonSchema` options. 

diff --git a/src/generators/cplusplus/CplusplusGenerator.ts b/src/generators/cplusplus/CplusplusGenerator.ts
@@ -6,9 +6,15 @@ import {
   defaultGeneratorOptions
 } from '../AbstractGenerator';
 import {
+  ConstrainedAnyModel,
+  ConstrainedBooleanModel,
   ConstrainedEnumModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
   ConstrainedMetaModel,
   ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
   InputMetaModel,
   MetaModel,
   RenderOutput
@@ -52,6 +58,21 @@ export type CplusplusPropertyKeyConstraint =
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CplusplusRenderCompleteModelOptions {}
+
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedEnumModel
+];
+
 export class CplusplusGenerator extends AbstractGenerator<
   CplusplusOptions,
   CplusplusRenderCompleteModelOptions
@@ -126,7 +147,8 @@ export class CplusplusGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
 

diff --git a/src/generators/csharp/CSharpGenerator.ts b/src/generators/csharp/CSharpGenerator.ts
@@ -6,9 +6,16 @@ import {
   defaultGeneratorOptions
 } from '../AbstractGenerator';
 import {
+  ConstrainedAnyModel,
+  ConstrainedBooleanModel,
   ConstrainedEnumModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
   ConstrainedMetaModel,
   ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedUnionModel,
   InputMetaModel,
   MetaModel,
   RenderOutput
@@ -61,6 +68,21 @@ export interface CSharpRenderCompleteModelOptions {
   namespace: string;
 }
 
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedEnumModel,
+  ConstrainedUnionModel
+];
+
 /**
  * Generator for CSharp
  */
@@ -144,7 +166,8 @@ export class CSharpGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function,
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
 

diff --git a/src/generators/dart/DartGenerator.ts b/src/generators/dart/DartGenerator.ts
@@ -11,7 +11,15 @@ import {
   MetaModel,
   ConstrainedObjectModel,
   ConstrainedEnumModel,
-  InputMetaModel
+  InputMetaModel,
+  ConstrainedAnyModel,
+  ConstrainedBooleanModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedTupleModel,
+  ConstrainedUnionModel
 } from '../../models';
 import {
   ConstantConstraint,
@@ -52,6 +60,22 @@ export interface DartRenderCompleteModelOptions {
   packageName: string;
 }
 
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedTupleModel,
+  ConstrainedEnumModel,
+  ConstrainedUnionModel
+];
+
 export class DartGenerator extends AbstractGenerator<
   DartOptions,
   DartRenderCompleteModelOptions
@@ -123,7 +147,8 @@ export class DartGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
   /**

diff --git a/src/generators/go/GoGenerator.ts b/src/generators/go/GoGenerator.ts
@@ -11,7 +11,14 @@ import {
   ConstrainedObjectModel,
   ConstrainedEnumModel,
   ConstrainedMetaModel,
-  MetaModel
+  MetaModel,
+  ConstrainedAnyModel,
+  ConstrainedBooleanModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedTupleModel
 } from '../../models';
 import {
   ConstantConstraint,
@@ -48,6 +55,21 @@ export interface GoRenderCompleteModelOptions {
   packageName: string;
 }
 
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedTupleModel,
+  ConstrainedEnumModel
+];
+
 /**
  * Generator for Go
  */
@@ -121,7 +143,8 @@ export class GoGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
 

diff --git a/src/generators/java/JavaGenerator.ts b/src/generators/java/JavaGenerator.ts
@@ -6,9 +6,16 @@ import {
   defaultGeneratorOptions
 } from '../AbstractGenerator';
 import {
+  ConstrainedAnyModel,
+  ConstrainedBooleanModel,
   ConstrainedEnumModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
   ConstrainedMetaModel,
   ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedTupleModel,
   ConstrainedUnionModel,
   InputMetaModel,
   MetaModel,
@@ -54,6 +61,23 @@ export type JavaTypeMapping = TypeMapping<JavaOptions, JavaDependencyManager>;
 export interface JavaRenderCompleteModelOptions {
   packageName: string;
 }
+
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedTupleModel,
+  ConstrainedEnumModel,
+  ConstrainedUnionModel
+];
+
 export class JavaGenerator extends AbstractGenerator<
   JavaOptions,
   JavaRenderCompleteModelOptions
@@ -126,7 +150,8 @@ export class JavaGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
 

diff --git a/src/generators/javascript/JavaScriptGenerator.ts b/src/generators/javascript/JavaScriptGenerator.ts
@@ -6,8 +6,19 @@ import {
   defaultGeneratorOptions
 } from '../AbstractGenerator';
 import {
+  ConstrainedAnyModel,
+  ConstrainedArrayModel,
+  ConstrainedBooleanModel,
+  ConstrainedDictionaryModel,
+  ConstrainedEnumModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
   ConstrainedMetaModel,
   ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedTupleModel,
+  ConstrainedUnionModel,
   InputMetaModel,
   MetaModel,
   RenderOutput
@@ -55,6 +66,24 @@ export type JavaScriptTypeMapping = TypeMapping<
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface JavaScriptRenderCompleteModelOptions {}
 
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedTupleModel,
+  ConstrainedArrayModel,
+  ConstrainedEnumModel,
+  ConstrainedUnionModel,
+  ConstrainedDictionaryModel
+];
+
 /**
  * Generator for JavaScript
  */
@@ -210,7 +239,8 @@ ${modelCode}`;
         dependencyManager: dependencyManagerToUse,
         options: this.options,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }
 

diff --git a/src/generators/kotlin/KotlinGenerator.ts b/src/generators/kotlin/KotlinGenerator.ts
@@ -6,9 +6,19 @@ import {
   defaultGeneratorOptions
 } from '../AbstractGenerator';
 import {
+  ConstrainedAnyModel,
+  ConstrainedArrayModel,
+  ConstrainedBooleanModel,
+  ConstrainedDictionaryModel,
   ConstrainedEnumModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
   ConstrainedMetaModel,
   ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedStringModel,
+  ConstrainedTupleModel,
+  ConstrainedUnionModel,
   InputMetaModel,
   MetaModel,
   RenderOutput
@@ -52,6 +62,25 @@ export type KotlinTypeMapping = TypeMapping<
 export interface KotlinRenderCompleteModelOptions {
   packageName: string;
 }
+
+/**
+ * All the constrained models that do not depend on others to determine the type
+ */
+const SAFE_MODEL_TYPES: any[] = [
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
+  ConstrainedAnyModel,
+  ConstrainedFloatModel,
+  ConstrainedIntegerModel,
+  ConstrainedStringModel,
+  ConstrainedBooleanModel,
+  ConstrainedTupleModel,
+  ConstrainedArrayModel,
+  ConstrainedEnumModel,
+  ConstrainedUnionModel,
+  ConstrainedDictionaryModel
+];
+
 export class KotlinGenerator extends AbstractGenerator<
   KotlinOptions,
   KotlinRenderCompleteModelOptions
@@ -127,7 +156,8 @@ export class KotlinGenerator extends AbstractGenerator<
         dependencyManager: dependencyManagerToUse,
         options: optionsToUse,
         constrainedName: '' //This is just a placeholder, it will be constrained within the function
-      }
+      },
+      SAFE_MODEL_TYPES
     );
   }