fix(schema): set correct options for ArrayType

Closes: #716
couchbaselabs · Apr 4, 2023 · 2f05828 · 2f05828
1 parent aba3e85
commit 2f05828
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/__test__/schema-cast.spec.ts b/__test__/schema-cast.spec.ts
@@ -48,10 +48,14 @@ test('support array of primitive types', () => {
     coordinates: {
       type: [Number],
       required: true,
+      default: [0],
     },
+    articles: { default: () => [], type: [{ type: String, ref: 'Article' }] },
   });
   const fields = schema.fields;
   expect(fields.coordinates.typeName).toBe(Array.name);
+  expect((fields.articles as ArrayType).options).toBeDefined();
+  expect((fields.articles as ArrayType).options!.default).toBeInstanceOf(Function);
   expect((fields.coordinates as ArrayType).itemType.typeName).toBe(Number.name);
 });
 

diff --git a/src/schema/helpers/fn-schema.ts b/src/schema/helpers/fn-schema.ts
@@ -2,7 +2,14 @@ import { is, isSchemaFactoryType } from '../../utils';
 import { BuildSchemaError, ValidationError } from '../errors';
 import { Schema } from '../schema';
 import { CoreType } from '../types';
-import { CustomValidations, FactoryFunction, FieldMap, IOttomanType, SchemaDef } from '../interfaces/schema.types';
+import {
+  CoreTypeOptions,
+  CustomValidations,
+  FactoryFunction,
+  FieldMap,
+  IOttomanType,
+  SchemaDef,
+} from '../interfaces/schema.types';
 import { cast, CAST_STRATEGY, CastOptions } from '../../utils/cast-strategy';
 
 type ParseResult = {
@@ -37,7 +44,7 @@ export const buildFields = (obj: Schema | SchemaDef, strict = true): FieldMap =>
     if (!opts.type) {
       throw new BuildSchemaError(`Property '${_key}' is a required type`);
     }
-    fields[_key] = _makeField(_key, opts);
+    fields[_key] = _makeField(_key, opts, obj[_key]);
   }
   return fields;
 };
@@ -105,11 +112,14 @@ const _getFieldType = (type: any): any => {
  * @param def result of parsing the field schema
  * @throws BuildSchemaError
  */
-const _makeField = (name: string, def: ParseResult): IOttomanType => {
+const _makeField = (name: string, def: ParseResult, arrayOptions?: CoreTypeOptions): IOttomanType => {
   const typeFactory = Schema.FactoryTypes[String(def.type)];
   if (typeFactory === undefined) {
     throw new BuildSchemaError(`Unsupported type specified in the property '${name}'`);
   }
+  if (arrayOptions !== undefined) {
+    return typeFactory(name, def.options, arrayOptions);
+  }
   return typeFactory(name, def.options);
 };
 /**

diff --git a/src/schema/types/array-type.ts b/src/schema/types/array-type.ts
@@ -52,4 +52,5 @@ export class ArrayType extends CoreType {
   }
 }
 
-export const arrayTypeFactory = (name: string, item: CoreType): ArrayType => new ArrayType(name, item);
+export const arrayTypeFactory = (name: string, item: CoreType, options?: CoreTypeOptions): ArrayType =>
+  new ArrayType(name, item, options);