npm - @sumaris-net/ngx-components - Versions diffs - 2.0.0-rc40 → 2.0.0-rc41 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/esm2020/src/app/core/services/model/entity.decorators.mjs +39 -65
package/fesm2015/sumaris-net.ngx-components.mjs +38 -64
package/fesm2015/sumaris-net.ngx-components.mjs.map +1 -1
package/fesm2020/sumaris-net.ngx-components.mjs +38 -64
package/fesm2020/sumaris-net.ngx-components.mjs.map +1 -1
package/package.json +1 -1
package/src/app/core/services/model/entity.decorators.d.ts +1 -1

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

@@ -11180,73 +11180,47 @@ function EntityClass(opts) {
         // 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 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 constructor();
-                    target.fromObject(source, opts);
-                    return target;
-                };
-                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;
-                };
-            }
+        if (opts.fromObjectReuseStrategy === 'clone') {
+            clazz.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;
+            };
+            clazz.asObject = function (source, opts) {
+                if (!source)
+                    return undefined;
+                if (source instanceof constructor)
+                    return source.asObject(opts);
+                return Object.assign({}, source);
+            };
         }
-        // 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);
-                    }
+        else {
+            clazz.fromObject = function (source, opts) {
+                if (!source)
+                    return undefined;
+                if (source instanceof constructor) {
                     // DEBUG
-                    //console.debug('@EntityClass() asObject() => will recycle existing object: ', source);
+                    //console.debug('@EntityClass() fromObject() => will recycle existing object: ', source);
                     return source;
-                };
-            }
+                }
+                const target = new constructor();
+                target.fromObject(source, opts);
+                return target;
+            };
+            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, constructor);