@qubit-ltd/common-decorator 3.10.0 → 3.10.2

package/dist/common-decorator.cjs

@@ -1608,7 +1608,6 @@ function ofValueImpl(Class, value) {
  *     The default instance of the specified class, or a new instance will be
  *     created if it does not exist.
  * @author Haixing Hu
- * @private
  */
 function getDefaultInstance(Class) {
   if (Class.prototype === Object.prototype) {
@@ -1810,7 +1809,6 @@ function getFieldMetadata(metadata, field, key) {
  * @return {function|null}
  *     the element type of the specified field of the object, or `null` if the
  *     field element type cannot be inferred.
- * @private
  * @author Haixing Hu
  */
 function getFieldElementType(Class, field) {
@@ -1878,7 +1876,6 @@ function getFieldElementType(Class, field) {
  * @return {function|undefined}
  *     the type of the specified field of the object, or `undefined` if the field
  *     type cannot be inferred.
- * @private
  * @author Haixing Hu
  */
 function getFieldType(Class, field) {
@@ -1933,7 +1930,6 @@ function getFieldType(Class, field) {
  * @return {string}
  *     The corresponding key of the source object.
  * @author Haixing Hu
- * @private
  */
 function getSourceField(targetField, options) {
   if ((options === null || options === void 0 ? void 0 : options.convertNaming) === true) {
@@ -1953,22 +1949,26 @@ function getSourceField(targetField, options) {
 //    All rights reserved.
 //
 ////////////////////////////////////////////////////////////////////////////////
+
 /**
- * Determine whether the prototype of a specified class has the specified
- * prototype function.
+ * Determines whether the specified prototype function exists anywhere in the
+ * prototype chain of a specified class.
  *
- * Note that the function may be inherited from its parent class.
+ * This function checks the entire prototype chain, including methods inherited
+ * from parent classes. It uses `Reflect.has()` which searches through the complete
+ * prototype chain, unlike `Object.prototype.hasOwnProperty` which only checks
+ * direct properties.
  *
  * @param {function} Class
  *     Constructor for the specified class.
  * @param {string} name
  *     The name of the specified prototype function.
  * @returns {Boolean}
- *     Whether the prototype of the specified class has the specified prototype
- *     function. Note that the function may be inherited from its parent class.
+ *     Returns true if the specified function exists anywhere in the prototype chain
+ *     of the class, whether defined by the class itself or inherited from a parent class.
  * @see hasOwnPrototypeFunction
+ *     Checks only methods defined directly on the class.
  * @author Haixing Hu
- * @private
  */
 function hasPrototypeFunction(Class, name) {
   return Class !== null && Class.prototype && Reflect.has(Class.prototype, name) && typeof Class.prototype[name] === 'function';
@@ -3862,6 +3862,127 @@ clone.registerCloneHook(function (info, obj) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+/**
+ * Determines whether a class directly owns a specific property (not inherited from parent classes).
+ *
+ * This function checks if the specified property is directly defined on either:
+ * 1. The prototype of the class itself, or
+ * 2. The default instance of the class
+ *
+ * Unlike JavaScript's built-in `Object.prototype.hasOwnProperty`, this function:
+ * - Accepts a class constructor rather than an object instance
+ * - Checks both the prototype and default instance
+ * - Only reports properties owned directly by the class (not inherited properties)
+ *
+ * @param {function} Class
+ *     The constructor of the class to check.
+ * @param {string} field
+ *     The name of the property to check for.
+ * @returns {boolean}
+ *     Returns true if and only if the property is directly defined by the class
+ *     (either on its prototype or default instance), not inherited from parent classes.
+ * @see hasPrototypeFunction
+ *     For checking inherited properties in the prototype chain.
+ * @author Haixing Hu
+ */
+function hasOwnProperty(Class, field) {
+  if (!Class || !Class.prototype) {
+    return false;
+  }
+  if (Object.prototype.hasOwnProperty.call(Class.prototype, field)) {
+    return true;
+  } else {
+    var defaultInstance = getDefaultInstance(Class);
+    return defaultInstance && Object.prototype.hasOwnProperty.call(defaultInstance, field);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+//    Copyright (c) 2022 - 2025.
+//    Haixing Hu, Qubit Co. Ltd.
+//
+//    All rights reserved.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Determines whether the specified prototype function is directly defined in the
+ * prototype of a specified class (not inherited from parent classes).
+ *
+ * This function checks ONLY the methods defined directly on the class's prototype,
+ * and ignores methods inherited from parent classes. It uses `Object.prototype.hasOwnProperty`
+ * to ensure only "own properties" of the prototype are considered.
+ *
+ * @param {function} Class
+ *     Constructor for the specified class.
+ * @param {string} name
+ *     The name of the specified prototype function.
+ * @returns {Boolean}
+ *     Returns true if and only if the specified function is directly defined on
+ *     the prototype of the class itself (not inherited from parent classes).
+ * @see hasPrototypeFunction
+ *     Checks for methods anywhere in the prototype chain.
+ * @author Haixing Hu
+ * @private
+ */
+function hasOwnPrototypeFunction(Class, name) {
+  return Class !== null && Class.prototype && Object.prototype.hasOwnProperty.call(Class.prototype, name) && typeof Class.prototype[name] === 'function';
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+//    Copyright (c) 2022 - 2025.
+//    Haixing Hu, Qubit Co. Ltd.
+//
+//    All rights reserved.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Determines whether a class has a specific property (including inherited properties).
+ *
+ * This function checks if the specified property is defined on either:
+ * 1. The prototype chain of the class, or
+ * 2. The default instance of the class
+ *
+ * Unlike `hasOwnProperty()` which only checks direct properties, this function:
+ * - Accepts a class constructor rather than an object instance
+ * - Checks both the prototype chain and default instance
+ * - Reports properties defined anywhere in the inheritance chain
+ *
+ * @param {function} Class
+ *     The constructor of the class to check.
+ * @param {string} field
+ *     The name of the property to check for.
+ * @returns {boolean}
+ *     Returns true if the property is defined by the class or any of its parent
+ *     classes (either on its prototype chain or default instance).
+ * @see hasOwnProperty
+ *     For checking only direct properties not inherited from parent classes.
+ * @author Haixing Hu
+ */
+function hasProperty(Class, field) {
+  if (!Class || !Class.prototype) {
+    return false;
+  }
+  if (Reflect.has(Class.prototype, field)) {
+    return true;
+  } else {
+    var defaultInstance = getDefaultInstance(Class);
+    return defaultInstance && Reflect.has(defaultInstance, field);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+//    Copyright (c) 2022 - 2025.
+//    Haixing Hu, Qubit Co. Ltd.
+//
+//    All rights reserved.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 /**
  * Decorates a class field to specify its label, i.e., the display name of the
  * field in the UI.
@@ -10180,33 +10301,6 @@ function isNullishOrEmptyImpl(Class, obj) {
   return obj.isEmpty();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-//    Copyright (c) 2022 - 2025.
-//    Haixing Hu, Qubit Co. Ltd.
-//
-//    All rights reserved.
-//
-////////////////////////////////////////////////////////////////////////////////
-/**
- * Determines whether the specified prototype function is defined in the
- * prototype of a specified class.
- *
- * @param {function} Class
- *     Constructor for the specified class.
- * @param {string} name
- *     The name of the specified prototype function.
- * @returns {Boolean}
- *     Whether the specified prototype function is defined in the prototype of
- *     the specified class.
- * @see hasPrototypeFunction
- * @author Haixing Hu
- * @private
- */
-function hasOwnPrototypeFunction(Class, name) {
-  return Class !== null && Class.prototype && Object.prototype.hasOwnProperty.call(Class.prototype, name) && typeof Class.prototype[name] === 'function';
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //    Copyright (c) 2022 - 2025.
@@ -11432,40 +11526,6 @@ function validateImpl(Class, obj, fields, context) {
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-//    Copyright (c) 2022 - 2025.
-//    Haixing Hu, Qubit Co. Ltd.
-//
-//    All rights reserved.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Tests whether the specified class has the specified field.
- *
- * @param {function} Class
- *     The constructor of the specified class.
- * @param {string} field
- *     The name of the specified field.
- * @returns {boolean}
- *     Whether the specified class has the specified field defined in its
- *     prototype or its default instance.
- * @author Haixing Hu
- * @private
- */
-function hasOwnClassField(Class, field) {
-  if (!Class || !Class.prototype) {
-    return false;
-  }
-  if (Object.prototype.hasOwnProperty.call(Class.prototype, field)) {
-    return true;
-  } else {
-    var defaultInstance = getDefaultInstance(Class);
-    return defaultInstance && Object.prototype.hasOwnProperty.call(defaultInstance, field);
-  }
-}
-
 function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
@@ -11973,7 +12033,7 @@ function Model(Class, context) {
     };
   }
   // Add the instance method `generateId()` to the class containing the `id` field
-  if (hasOwnClassField(Class, 'id') && !hasPrototypeFunction(Class, 'generateId')) {
+  if (hasOwnProperty(Class, 'id') && !hasPrototypeFunction(Class, 'generateId')) {
     // If its own instance has an `id` field, and there is no `generateId()`
     // method on itself or its parent class prototype
     setClassMetadata(Class, KEY_CLASS_NEXT_ID, 0);
@@ -12063,8 +12123,15 @@ function Model(Class, context) {
      * @name Model#toJSON
      * @memberof Model
      */
-    Class.prototype.toJSON = function toJSON(key) {
-      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    Class.prototype.toJSON = function toJSON() {
+      var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      if (_typeof(key) === 'object') {
+        // if the key is an object, it means that the `toJSON()` method is called
+        // directly with the only argument `options`, so the `key` is the `options`
+        options = key;
+        key = '';
+      }
       return toJsonImpl(this, key, _objectSpread$1(_objectSpread$1({}, options), {}, {
         skipRootToJSON: true
       }));
@@ -12122,7 +12189,7 @@ function Model(Class, context) {
      * @memberof Model
      */
     Class.prototype.toJsonString = function toJsonString() {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return toJsonStringImpl(Class, this, options);
     };
   }
@@ -13319,6 +13386,14 @@ exports.createArray = createArray;
 exports.createPage = createPage;
 exports.defaultNormalizer = defaultNormalizer;
 exports.enumNormalizer = enumNormalizer;
+exports.getDefaultInstance = getDefaultInstance;
+exports.getFieldElementType = getFieldElementType;
+exports.getFieldType = getFieldType;
+exports.getSourceField = getSourceField;
+exports.hasOwnProperty = hasOwnProperty;
+exports.hasOwnPrototypeFunction = hasOwnPrototypeFunction;
+exports.hasProperty = hasProperty;
+exports.hasPrototypeFunction = hasPrototypeFunction;
 exports.isEnumClass = isEnumClass;
 exports.isEnumerator = isEnumerator;
 exports.normalize = normalize;