@sumaris-net/ngx-components 2.0.0-rc39 → 2.0.0-rc40

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -11168,7 +11168,6 @@ EntityClasses.CLASSES_BY_NAME = new Map();
 function EntityClass(opts) {
     // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
     return function (constructor) {
-        var _a, _b;
         // Make sure the class extends Entity
         if (!environment.production) {
             const obj = new constructor();
@@ -11176,61 +11175,82 @@ function EntityClass(opts) {
                 throw new Error(`Class ${constructor.name} must extends <<Entity>> to be able to use @FromObject!`);
             }
         }
-        const typename = opts?.typename || `${constructor.name}VO`;
-        if (opts?.fromObjectReuseStrategy === 'clone') {
-            const decoratedClass = (_a = class extends constructor {
-                    static fromObject(source, opts) {
-                        if (!source)
-                            return undefined;
-                        if (source instanceof decoratedClass)
-                            return source.clone(opts);
-                        const target = new decoratedClass();
-                        target.fromObject(source, opts);
-                        return target;
-                    }
-                    static asObject(source, opts) {
-                        if (!source)
-                            return undefined;
-                        if (source instanceof decoratedClass)
-                            return source.asObject(opts);
-                        return Object.assign({}, source);
-                    }
-                },
-                _a.TYPENAME = typename,
-                _a);
-            // Register the entity class
-            EntityClasses.register(typename, decoratedClass);
-            return decoratedClass;
-        }
-        const decoratedClass = (_b = class extends constructor {
-                static fromObject(source, opts) {
+        const clazz = constructor;
+        const typename = opts.typename || `${constructor.name}VO`;
+        // Define static field TYPENAME
+        clazz.TYPENAME = typename;
+        // Define static fromObject()
+        if (!clazz.fromObject) {
+            if (opts.fromObjectReuseStrategy === 'clone') {
+                constructor.fromObject = function (source, opts) {
+                    if (!source)
+                        return undefined;
+                    if (source instanceof constructor)
+                        return source.clone(opts);
+                    const target = new constructor();
+                    target.fromObject(source, opts);
+                    return target;
+                };
+                constructor.asObject = function (source, opts) {
                     if (!source)
                         return undefined;
-                    if (source instanceof decoratedClass) {
+                    if (source instanceof constructor)
+                        return source.asObject(opts);
+                    return Object.assign({}, source);
+                };
+            }
+            else {
+                clazz.fromObject = function (source, opts) {
+                    if (!source)
+                        return undefined;
+                    if (source instanceof constructor) {
                         // DEBUG
                         //console.debug('@EntityClass() fromObject() => will recycle existing object: ', source);
                         return source;
                     }
-                    const target = new decoratedClass();
+                    const target = new constructor();
                     target.fromObject(source, opts);
                     return target;
-                }
-                static asObject(source, opts) {
+                };
+                clazz.asObject = function (source, opts) {
                     if (!source)
                         return undefined;
-                    if (source instanceof decoratedClass) {
+                    if (source instanceof constructor) {
                         return source.asObject(opts);
                     }
                     // DEBUG
                     //console.debug('@EntityClass() asObject() => will recycle existing object: ', source);
                     return source;
-                }
-            },
-            _b.TYPENAME = typename,
-            _b);
+                };
+            }
+        }
+        // Define static asObject()
+        if (!clazz.asObject) {
+            if (opts.fromObjectReuseStrategy === 'clone') {
+                clazz.asObject = function (source, opts) {
+                    if (!source)
+                        return undefined;
+                    if (source instanceof constructor)
+                        return source.asObject(opts);
+                    return Object.assign({}, source);
+                };
+            }
+            else {
+                clazz.asObject = function (source, opts) {
+                    if (!source)
+                        return undefined;
+                    if (source instanceof constructor) {
+                        return source.asObject(opts);
+                    }
+                    // DEBUG
+                    //console.debug('@EntityClass() asObject() => will recycle existing object: ', source);
+                    return source;
+                };
+            }
+        }
         // Register the entity class
-        EntityClasses.register(typename, decoratedClass);
-        return decoratedClass;
+        EntityClasses.register(typename, constructor);
+        return constructor;
     };
 }