openchs-models 1.33.4 → 1.33.5

package/dist/framework/RealmEmbeddedObjectHandler.js

@@ -0,0 +1,126 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _lodash = _interopRequireDefault(require("lodash"));
+var _RealmCollectionHelper = require("./RealmCollectionHelper");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Framework-level handler for embedded object safety in Realm 12+
+ * This automatically processes embedded objects to prevent invalidation issues
+ */
+class RealmEmbeddedObjectHandler {
+  /**
+   * Automatically processes embedded objects in a data structure
+   * This should be called by RealmProxy.create() before creating objects
+   * 
+   * @param {Object} data - The object data to process
+   * @param {Object} schema - The Realm schema for the object
+   * @returns {Object} Processed data with safe embedded objects
+   */
+  static processEmbeddedObjects(data, schema) {
+    if (!data || !schema || !schema.properties) {
+      return data || {};
+    }
+    const processedData = _objectSpread({}, data);
+    Object.keys(schema.properties).forEach(propertyName => {
+      const propertySchema = schema.properties[propertyName];
+      const propertyValue = data[propertyName];
+
+      // Handle embedded objects (including optional ones)
+      if (this.isEmbeddedObjectProperty(propertySchema) && propertyValue) {
+        processedData[propertyName] = this.safeCopyEmbeddedObject(propertyValue);
+      }
+
+      // Handle lists with embedded objects
+      if (this.isListOfEmbeddedObjects(propertySchema) && Array.isArray(propertyValue)) {
+        processedData[propertyName] = propertyValue.map(item => item ? this.safeCopyEmbeddedObject(item) : item);
+      }
+    });
+    return processedData;
+  }
+
+  /**
+   * Checks if a property schema defines an embedded object
+   */
+  static isEmbeddedObjectProperty(propertySchema) {
+    if (!propertySchema || propertySchema.type !== 'object') {
+      return false;
+    }
+    return !!(propertySchema.objectType && propertySchema.objectType !== 'string');
+  }
+
+  /**
+   * Checks if a property schema defines a list of embedded objects
+   */
+  static isListOfEmbeddedObjects(propertySchema) {
+    return propertySchema && propertySchema.type === 'list' && propertySchema.objectType && propertySchema.objectType !== 'string';
+  }
+
+  /**
+   * Safely copies an embedded object using the best available method
+   */
+  static safeCopyEmbeddedObject(embeddedObj) {
+    if (!embeddedObj) {
+      return null;
+    }
+
+    // If it's not a Realm object, return as-is
+    if (!(0, _RealmCollectionHelper.isRealmObject)(embeddedObj)) {
+      return embeddedObj;
+    }
+    try {
+      // Method 1: Try toJSON() (convenient)
+      if (typeof embeddedObj.toJSON === 'function') {
+        return embeddedObj.toJSON();
+      }
+    } catch (error) {
+      // Fall back to manual copy if toJSON fails
+    }
+
+    // Method 2: Manual deep copy (reliable)
+    return this.deepCopyEmbeddedObject(embeddedObj);
+  }
+
+  /**
+   * Manual deep copy of embedded object
+   */
+  static deepCopyEmbeddedObject(embeddedObj) {
+    if (!embeddedObj) {
+      return null;
+    }
+    const plainCopy = {};
+
+    // Try to get schema properties
+    try {
+      if (embeddedObj.objectSchema && typeof embeddedObj.objectSchema === 'function') {
+        const schema = embeddedObj.objectSchema();
+        if (schema && schema.properties) {
+          Object.keys(schema.properties).forEach(prop => {
+            plainCopy[prop] = embeddedObj[prop];
+          });
+          return plainCopy;
+        }
+      }
+    } catch (error) {
+      // Fall back to enumerable properties
+    }
+
+    // Fallback: Copy all enumerable properties
+    Object.keys(embeddedObj).forEach(prop => {
+      if (typeof embeddedObj[prop] !== 'function') {
+        plainCopy[prop] = embeddedObj[prop];
+      }
+    });
+    return plainCopy;
+  }
+}
+var _default = RealmEmbeddedObjectHandler;
+exports.default = _default;

package/dist/framework/RealmProxy.js

@@ -8,6 +8,7 @@ var _RealmResultsProxy = _interopRequireDefault(require("./RealmResultsProxy"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _RealmCollectionHelper = require("./RealmCollectionHelper");
 var _General = _interopRequireDefault(require("../utility/General"));
+var _RealmEmbeddedObjectHandler = _interopRequireDefault(require("./RealmEmbeddedObjectHandler"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const isVanillaArray = function (object) {
   return !_lodash.default.isNil(object) && "RealmListProxy" !== object.constructor.name && _lodash.default.isArrayLikeObject(object);
@@ -44,26 +45,30 @@ class RealmProxy {
   /**
    *
    * @param schemaName
-   * @param properties
+   * @param object
    * @param updateMode , all === true, modified , never === false
    * @returns {*}
    */
-  create(schemaName, properties, updateMode = "never") {
-    const underlyingObject = _lodash.default.isNil(properties.that) ? properties : properties.that;
+  create(schemaName, object, updateMode = "never") {
     const entityClass = this.entityMappingConfig.getEntityClass(schemaName);
-    const mandatoryObjectSchemaProperties = this.entityMappingConfig.getMandatoryObjectSchemaProperties(schemaName);
+    const underlyingObject = (0, _RealmCollectionHelper.getUnderlyingRealmObject)(object);
+    const schema = entityClass.schema;
+
+    // 🚀 FRAMEWORK-LEVEL: Automatically process embedded objects for Realm 12+ safety
+    const processedObject = _RealmEmbeddedObjectHandler.default.processEmbeddedObjects(underlyingObject, schema);
+    const mandatoryObjectSchemaProperties = _lodash.default.keys(_lodash.default.pickBy(schema.properties, property => !property.optional));
     const emptyMandatoryProperties = [];
-    const saveObjectKeys = Object.keys(underlyingObject);
+    const saveObjectKeys = Object.keys(processedObject);
     if (updateMode === "never" || updateMode === false || _lodash.default.intersection(mandatoryObjectSchemaProperties, saveObjectKeys).length > 0) {
       saveObjectKeys.forEach(x => {
-        const propertyValue = underlyingObject[x];
+        const propertyValue = processedObject[x];
         if (_lodash.default.isNil(propertyValue) && _lodash.default.some(mandatoryObjectSchemaProperties, y => y === x)) emptyMandatoryProperties.push(x);
       });
       if (emptyMandatoryProperties.length > 0) {
-        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}. UUID: ${underlyingObject.uuid}`);
+        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}. UUID: ${processedObject.uuid}`);
       }
     }
-    const dbEntity = this.realmDb.create(schemaName, underlyingObject, updateMode);
+    const dbEntity = this.realmDb.create(schemaName, processedObject, updateMode);
     return new entityClass(dbEntity);
   }
   delete(object) {

package/dist/index.js

@@ -315,6 +315,12 @@ Object.defineProperty(exports, "EntityMappingConfig", {
     return _Schema.default;
   }
 });
+Object.defineProperty(exports, "RealmEmbeddedObjectHandler", {
+  enumerable: true,
+  get: function () {
+    return _RealmEmbeddedObjectHandler.default;
+  }
+});
 Object.defineProperty(exports, "Settings", {
   enumerable: true,
   get: function () {
@@ -869,6 +875,7 @@ var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
 var _RuleDependency = _interopRequireDefault(require("./RuleDependency"));
 var _Rule = _interopRequireDefault(require("./Rule"));
 var _Schema = _interopRequireDefault(require("./Schema"));
+var _RealmEmbeddedObjectHandler = _interopRequireDefault(require("./framework/RealmEmbeddedObjectHandler"));
 var _Settings = _interopRequireDefault(require("./Settings"));
 var _SingleCodedValue = _interopRequireDefault(require("./observation/SingleCodedValue"));
 var _SingleSelectFilter = _interopRequireDefault(require("./application/SingleSelectFilter"));

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.33.4",
+    "version": "1.33.5",
     "private": false,
     "repository": {
         "type": "git",