@bedrockio/model 0.1.18 → 0.1.20

package/dist/cjs/include.js

@@ -256,8 +256,8 @@ function resolvePaths(schema, str) {
     source = source.replaceAll('\\*', '[^.]+');
     source = `^${source}$`;
     const reg = RegExp(source);
-    paths = Object.keys(schema.paths || {}).filter(path => {
-      return !path.startsWith('_') && reg.test(path);
+    paths = getSchemaPaths(schema).filter(path => {
+      return reg.test(path);
     });
   } else {
     paths = [str];
@@ -265,4 +265,17 @@ function resolvePaths(schema, str) {
   return paths.map(path => {
     return [path, schema.pathType(path)];
   });
+}
+function getSchemaPaths(schema) {
+  return Object.entries(schema.paths || {}).flatMap(([key, schema]) => {
+    if (key.startsWith('_')) {
+      return [];
+    } else if (schema.schema) {
+      return getSchemaPaths(schema.schema).map(path => {
+        return [key, path].join('.');
+      });
+    } else {
+      return [key];
+    }
+  });
 }

package/dist/cjs/schema.js

@@ -118,6 +118,8 @@ function attributesToMongoose(attributes) {
       } else if (key === 'validate' && type === 'string') {
         // Allow custom mongoose validation function that derives from the schema.
         val = (0, _validation.getNamedValidator)(val);
+      } else if (key === 'attributes' && type === 'object') {
+        val = attributesToMongoose(val);
       }
     } else if ((0, _lodash.isPlainObject)(val)) {
       if (isScopeExtension(val)) {

package/dist/cjs/utils.js

@@ -80,7 +80,9 @@ function resolveInnerField(field) {
   if (Array.isArray(field?.type)) {
     field = field.type[0];
   }
-  if (field instanceof _mongoose.default.Schema) {
+  if (field?.type instanceof _mongoose.default.Schema) {
+    field = field.type.obj;
+  } else if (field instanceof _mongoose.default.Schema) {
     field = field.obj;
   }
   return field;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {

package/src/include.js

@@ -242,8 +242,8 @@ function resolvePaths(schema, str) {
     source = source.replaceAll('\\*', '[^.]+');
     source = `^${source}$`;
     const reg = RegExp(source);
-    paths = Object.keys(schema.paths || {}).filter((path) => {
-      return !path.startsWith('_') && reg.test(path);
+    paths = getSchemaPaths(schema).filter((path) => {
+      return reg.test(path);
     });
   } else {
     paths = [str];
@@ -252,3 +252,17 @@ function resolvePaths(schema, str) {
     return [path, schema.pathType(path)];
   });
 }
+
+function getSchemaPaths(schema) {
+  return Object.entries(schema.paths || {}).flatMap(([key, schema]) => {
+    if (key.startsWith('_')) {
+      return [];
+    } else if (schema.schema) {
+      return getSchemaPaths(schema.schema).map((path) => {
+        return [key, path].join('.');
+      });
+    } else {
+      return [key];
+    }
+  });
+}

package/src/schema.js

@@ -128,6 +128,8 @@ function attributesToMongoose(attributes) {
       } else if (key === 'validate' && type === 'string') {
         // Allow custom mongoose validation function that derives from the schema.
         val = getNamedValidator(val);
+      } else if (key === 'attributes' && type === 'object') {
+        val = attributesToMongoose(val);
       }
     } else if (isPlainObject(val)) {
       if (isScopeExtension(val)) {

package/src/utils.js

@@ -72,7 +72,9 @@ function resolveInnerField(field) {
   if (Array.isArray(field?.type)) {
     field = field.type[0];
   }
-  if (field instanceof mongoose.Schema) {
+  if (field?.type instanceof mongoose.Schema) {
+    field = field.type.obj;
+  } else if (field instanceof mongoose.Schema) {
     field = field.obj;
   }
   return field;