@acodeninja/persist 3.0.0-next.6 → 3.0.0-next.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acodeninja/persist",
-  "version": "3.0.0-next.6",
+  "version": "3.0.0-next.8",
   "description": "A JSON based data modelling and persistence module with alternate storage mechanisms.",
   "type": "module",
   "scripts": {

package/src/SchemaCompiler.js

@@ -79,7 +79,11 @@ class SchemaCompiler {
                     schema.properties[name].items.format = property?._items._format;
                 }
 
-                if (Type.Model.isModel(property?._items)) {
+                const prop = typeof property?._items === 'function' &&
+                !/^class/.test(Function.prototype.toString.call(property?._items)) ?
+                    property?._items() : property?._items;
+
+                if (Type.Model.isModel(prop)) {
                     schema.properties[name].items = {
                         type: 'object',
                         additionalProperties: false,
@@ -87,7 +91,7 @@ class SchemaCompiler {
                         properties: {
                             id: {
                                 type: 'string',
-                                pattern: `^${property?._items.toString()}/[A-Z0-9]+$`,
+                                pattern: `^${prop.toString()}/[A-Z0-9]+$`,
                             },
                         },
                     };

package/src/engine/StorageEngine.js

@@ -86,7 +86,7 @@ export default class StorageEngine {
 
                 await this._putSearchIndex(modelConstructor, {
                     ...index || {},
-                    ...Object.fromEntries(models.map(m => [m.id, m.toIndexData()])),
+                    ...Object.fromEntries(models.map(m => [m.id, m.toSearchData()])),
                 });
             })),
         ]);
@@ -170,7 +170,10 @@ export default class StorageEngine {
                     .map(([propertyName, propertyType]) => [
                         registeredModelName,
                         propertyName,
-                        typeof propertyType === 'function' && !Type.Model.isModel(propertyType) ? propertyType() : propertyType,
+                        typeof propertyType === 'function' &&
+                            !/^class/.test(Function.prototype.toString.call(propertyType)) &&
+                            !Type.Model.isModel(propertyType) ?
+                                propertyType() : propertyType,
                     ])
                     .filter(([_m, _p, type]) => Type.Model.isModel(type))
                     .map(([containingModel, propertyName, propertyType]) => ({
@@ -276,18 +279,14 @@ export default class StorageEngine {
 
 
 /**
- * Decide if two models indexable fields have changed
+ * Decide if two models indexable fields are different
  * @param {Type.Model} currentModel
  * @param {Type.Model} modelToProcess
  * @return {boolean}
  * @private
  */
 function indexedFieldsHaveChanged(currentModel, modelToProcess) {
-    return !currentModel || Boolean(
-        modelToProcess.constructor.indexedProperties()
-            .filter(field => JSON.stringify(_.get(currentModel, field)) !== JSON.stringify(_.get(modelToProcess, field)))
-            .length,
-    );
+    return !currentModel || JSON.stringify(currentModel.toIndexData()) !== JSON.stringify(modelToProcess.toIndexData());
 }
 
 /**
@@ -298,11 +297,7 @@ function indexedFieldsHaveChanged(currentModel, modelToProcess) {
  * @private
  */
 function searchableFieldsHaveChanged(currentModel, modelToProcess) {
-    return !currentModel || Boolean(
-        modelToProcess.constructor.searchProperties()
-            .filter(field => JSON.stringify(_.get(currentModel, field)) !== JSON.stringify(_.get(modelToProcess, field)))
-            .length,
-    );
+    return !currentModel || JSON.stringify(currentModel.toSearchData()) !== JSON.stringify(modelToProcess.toSearchData());
 }
 
 /**

package/src/type/Model.js

@@ -100,11 +100,11 @@ class Model {
 
     /**
      * Extracts data from the model based on the indexed properties defined in the class.
-     *
+     * Includes the ID of any linked models.
      * @returns {Object} - A representation of the model's indexed data.
      */
     toIndexData() {
-        return this._extractData(this.constructor.indexedProperties());
+        return this._extractData(this.constructor.indexedPropertiesResolved());
     }
 
     /**
@@ -187,6 +187,39 @@ class Model {
         return [];
     }
 
+    /**
+     * Returns a list of properties that are indexed including links to other models.
+     *
+     * @returns {Array<string>} - The indexed properties.
+     * @abstract
+     * @static
+     */
+    static indexedPropertiesResolved() {
+        return []
+            .concat(
+                Object.entries(this)
+                    .filter(([_, type]) =>
+                        this.isModel(
+                            typeof type === 'function' &&
+                            !/^class/.test(Function.prototype.toString.call(type)) ?
+                                type() : type,
+                        ),
+                    )
+                    .map(([name, _]) => `${name}.id`),
+            )
+            .concat(
+                Object.entries(this)
+                    .filter(([_, type]) =>
+                            type?._type === 'array' && this.isModel(
+                                typeof type._items === 'function' &&
+                                !/^class/.test(Function.prototype.toString.call(type._items)) ?
+                                    type._items() : type._items,
+                            ),
+                    ).map(([name, _]) => `${name}.[*].id`),
+            )
+            .concat(this.indexedProperties());
+    }
+
     /**
      * Returns a list of properties used for search.
      *