Clean ModelOptions and return structured and enum

diegomvh · Sep 7, 2021 · 664a283 · 664a283
1 parent 5938e68
commit 664a283
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 34 deletions.
diff --git a/projects/angular-odata/src/lib/models/options.ts b/projects/angular-odata/src/lib/models/options.ts
@@ -199,16 +199,14 @@ export class ODataModelField<F> {
   parser: ODataStructuredTypeFieldParser<F>;
   modelOptions: ODataModelOptions<any>;
   meta?: ODataModelOptions<any>;
-  options: {
-    default?: any;
-    required?: boolean;
-    concurrency?: boolean;
-    maxLength?: number;
-    minLength?: number;
-    min?: number;
-    max?: number;
-    pattern?: RegExp;
-  };
+  default?: any;
+  required: boolean;
+  concurrency: boolean;
+  maxLength?: number;
+  minLength?: number;
+  min?: number;
+  max?: number;
+  pattern?: RegExp;
   constructor(
     modelOptions: ODataModelOptions<any>,
     { name, field, parser, ...options }: ODataModelFieldOptions<F>
@@ -217,20 +215,24 @@ export class ODataModelField<F> {
     this.name = name;
     this.field = field;
     this.parser = parser;
-    this.options = options;
+    this.default = options.default || this.parser.default;
+    this.required = Boolean(options.required);
+    this.concurrency = Boolean(options.concurrency);
+    this.maxLength = options.maxLength;
+    this.minLength = options.minLength;
+    this.min = options.min;
+    this.max = options.max;
+    this.pattern = options.pattern;
   }
 
   get api() {
     return this.modelOptions.api;
   }
+
   get type() {
     return this.parser.type;
   }
 
-  get default() {
-    return this.options.default || this.parser.default;
-  }
-
   get navigation() {
     return Boolean(this.parser.navigation);
   }
@@ -239,10 +241,6 @@ export class ODataModelField<F> {
     return Boolean(this.parser.collection);
   }
 
-  get concurrency() {
-    return Boolean(this.options.concurrency);
-  }
-
   get computed() {
     return Boolean(
       this.parser.findAnnotation((a) => a.term === COMPUTED)?.bool
@@ -257,7 +255,7 @@ export class ODataModelField<F> {
     concurrency: boolean;
   }) {
     this.meta = findOptionsForType(this.parser.type);
-    if (concurrency) this.options.concurrency = concurrency;
+    if (concurrency) this.concurrency = concurrency;
   }
 
   isKey() {
@@ -277,15 +275,15 @@ export class ODataModelField<F> {
   }
 
   structured() {
-    return this.parser.structured();
+    return this.api.findStructuredTypeForType<F>(this.parser.type);
   }
 
   isEnumType() {
     return this.parser.isEnumType();
   }
 
   enum() {
-    return this.parser.enum();
+    return this.api.findEnumTypeForType<F>(this.parser.type);
   }
 
   validate(
@@ -314,43 +312,43 @@ export class ODataModelField<F> {
     } else {
       let errors = this.parser?.validate(value, { method, navigation }) || [];
       if (
-        this.options.required &&
+        this.required &&
         (value === null || (value === undefined && method !== 'patch')) // Is null or undefined without patch?
       ) {
         errors.push(`required`);
       }
       if (
-        this.options.maxLength !== undefined &&
+        this.maxLength !== undefined &&
         typeof value === 'string' &&
-        value.length > this.options.maxLength
+        value.length > this.maxLength
       ) {
         errors.push(`maxlength`);
       }
       if (
-        this.options.minLength !== undefined &&
+        this.minLength !== undefined &&
         typeof value === 'string' &&
-        value.length < this.options.minLength
+        value.length < this.minLength
       ) {
         errors.push(`minlength`);
       }
       if (
-        this.options.min !== undefined &&
+        this.min !== undefined &&
         typeof value === 'number' &&
-        value < this.options.min
+        value < this.min
       ) {
         errors.push(`min`);
       }
       if (
-        this.options.max !== undefined &&
+        this.max !== undefined &&
         typeof value === 'number' &&
-        value > this.options.max
+        value > this.max
       ) {
         errors.push(`max`);
       }
       if (
-        this.options.pattern !== undefined &&
+        this.pattern !== undefined &&
         typeof value === 'string' &&
-        !this.options.pattern.test(value)
+        !this.pattern.test(value)
       ) {
         errors.push(`pattern`);
       }

diff --git a/projects/angular-odata/src/lib/schema/structured-type.ts b/projects/angular-odata/src/lib/schema/structured-type.ts
@@ -7,7 +7,7 @@ import {
   ODataStructuredTypeFieldParser,
   ODataStructuredTypeParser,
 } from '../parsers';
-import { Options, OptionsHelper, Parser, StructuredTypeConfig } from '../types';
+import { Options, StructuredTypeConfig } from '../types';
 import { ODataAnnotation } from './annotation';
 import { ODataSchema } from './schema';