risei 1.2.0 → 1.3.1

package/system/TotalCopier.js

@@ -1,79 +1,106 @@
-/**/
-
-export class TotalCopier {
-    copy(original) /* passed */ {
-        return this.recursiveCopy(original);
-    }
-
-    recursiveCopy(original) /* verified */ {
-        /* &cruft, factor, possibly abstracting similar code, 
-                   and/or return copy only once, or similar */
-
-        /* Algorithm: First copied at current level by value if a value, by reference if 
-                      not a value; then recursively replaced at next level, and so on. */
-
-        let copy;
-
-        if (Array.isArray(original)) {
-            copy = [ ];
-            
-            // Traversal construction with recursion.
-            for (let item of original) {
-                let next = this.recursiveCopy(item);
-                copy.push(next);
-            }
-            
-            return copy;
-        }
-        
-        if (original instanceof Map) {
-            copy = new Map();
-
-            // Traversal construction with recursion.
-            for (let entry of original.entries()) {
-                let next = this.recursiveCopy(entry);
-                copy.set(next[0], next[1]);
-            }
-            
-            return copy;
-        }
-        
-        if (original instanceof Set) {
-            copy = new Set();
-
-            // Traversal construction with recursion.
-            for (let value of original.values()) {
-                let next = this.recursiveCopy(value);
-                copy.add(next);
-            }
-
-            return copy;
-        }
-
-        if (original instanceof Date) {
-            copy = new Date(original);
-            return copy;
-        }
-
-        if (original instanceof Object) {
-            copy = { };
-            
-            let keys = Object.keys(original);
-            
-            // Traversal construction with recursion.
-            for (let key of Object.keys(original)) {
-                let next = this.recursiveCopy(original[key]);
-                copy[key] = next;
-            }
-            
-            return copy;
-        }
-        
-        /* &cruft, other object types here */
-
-        // All object types exhausted, so this is a value, 
-        // which can be used directly for a copy.
-        copy = original;
-        return copy;
-    }
-}
+/**/
+
+import { TypeIdentifier } from "./TypeIdentifier.js";
+import { Types } from "./Types.js";
+
+export class TotalCopier {
+    #identifier = new TypeIdentifier();
+
+    copy(original) /* passed */ {
+        return this.recursiveCopy(original);
+    }
+
+    recursiveCopy(original) /* verified */ {
+        /* &cruft, factor, possibly abstracting similar code, 
+                   and/or return copy only once, or similar */
+
+        /* Algorithm: First copied at current level by value if a value, by reference if 
+                      not a value; then recursively replaced at next level, and so on. */
+
+        let copy;
+        
+        let type = this.#identifier.identify(original);
+
+        if (type === Types.isArray) {
+            copy = [ ];
+            
+            // Traversal construction with recursion.
+            for (let item of original) {
+                let next = this.recursiveCopy(item);
+                copy.push(next);
+            }
+            
+            return copy;
+        }
+        
+        if (type === Types.isMap) {
+            copy = new Map();
+
+            // Traversal construction with recursion.
+            for (let entry of original.entries()) {
+                let next = this.recursiveCopy(entry);
+                copy.set(next[0], next[1]);
+            }
+            
+            return copy;
+        }
+        
+        if (type === Types.isSet) {
+            copy = new Set();
+
+            // Traversal construction with recursion.
+            for (let value of original.values()) {
+                let next = this.recursiveCopy(value);
+                copy.add(next);
+            }
+
+            return copy;
+        }
+
+        if (type === Types.isDate) {
+            copy = new Date(original);
+            return copy;
+        }
+        
+        // Actually copying isn't needed (or desirable) here, 
+        // since should always point to same thing regardless.
+        if (type === Types.isClass) {
+            copy = original;
+            return copy;
+        }
+
+        // The workaround here makes a true independent copy of the 
+        // original function, regardless of its definition style.
+        if (type === Types.isFunction) {
+            let passer = [ original ];
+            passer = [ ...passer ];
+            copy = passer[0];
+
+            return copy;
+        }
+
+        if (original instanceof Object) {
+            // If original has a prototype, it's probably a class instance, 
+            // so it's constructed, so it includes all methods and accessors.
+            let prototype = Object.getPrototypeOf(original);
+            copy = prototype !== null ? new prototype.constructor() : { };
+            
+            let keys = Object.keys(original);
+            
+            // Settable properties are added, with recursion.
+            for (let key of Object.keys(original)) {
+                let next = this.recursiveCopy(original[key]);
+                copy[key] = next;
+            }
+            
+            return copy;
+        }
+        
+        /* &cruft, other object types here */
+
+        // All object types exhausted, so this is a value, 
+        // which can be used directly for a copy.
+        copy = original;
+        return copy;
+    }
+}

package/system/TypeAnalyzer.js

@@ -1,103 +1,103 @@
-/**/
-
-/* Used to analyze classes / members of classes being tested. */
-
-export class TypeAnalyzer {
-    // region Definitions
-
-    static constructorName = "constructor";
-    static getName = "get";
-    static setName = "set";
-
-    // endregion Definitions
-
-    // region Fields
-
-    #type;
-
-    // endregion Fields
-
-    constructor(type) {
-        this.#type = type;
-    }
-
-    /* Returns true if instance or static member is a property (value or accessor).  Returns false if member is a method. */
-    memberIsProperty(name) /* passed */ {
-        // Constructor is never a property and is irregular, 
-        // so other type-analysis code can't handle it.
-        if (name === TypeAnalyzer.constructorName) {
-            return false;
-        }
-    
-        // Static methods and properties (value or accessor) are on type.
-        if (name in this.#type) {
-            return this.#staticMemberIsProperty(this.#type, name);
-        }
-        
-        // Methods and accessor properties are on prototype.
-        if (name in this.#type.prototype) {
-            return this.#instanceMemberIsProperty(this.#type.prototype, name);
-        }
-
-        // Instance value properties are not on type or prototype.
-        return true;
-    }
-    
-    // region Dependencies of memberIsProperty()
-    
-    /* Algorithm specialized with function check for static members. */
-    #staticMemberIsProperty(type, name) {
-        let descriptor = Object.getOwnPropertyDescriptor(type, name);
-        
-        // If on type and has accessors, it's a static accessor property.
-        if (this.#doesHaveAccessorProps(descriptor)) {
-            return true;
-        }
-        
-        // If on type and has non-Function .value, it's a static value property.
-        if (this.#doesNotHaveFunctionValue(descriptor)) {
-            return true;
-        }
-
-        // If on type but not a static property, it's a static method.
-        return false;
-    }
-
-    /* Algorithm specialized for instance members, no function check. */
-    #instanceMemberIsProperty(prototype, name) {
-        let descriptor = Object.getOwnPropertyDescriptor(prototype, name);
-        
-        // If on prototype and has accessors, it's an accessor property.
-        if (this.#doesHaveAccessorProps(descriptor)) {
-            return true;
-        }
-        
-        // If on prototype but not an accessor property, it's a method.
-        return false;
-    }
-    
-    // region Internally reused dependencies of other memberIsProperty() dependencies
-    
-    #doesHaveAccessorProps(descriptor) /* verified */ {
-        // Accessor properties have one or both of these in descriptor.
-        if (TypeAnalyzer.getName in descriptor || TypeAnalyzer.setName in descriptor) {
-            return true;
-        }
-        
-        return false;
-    }
-    
-    #doesNotHaveFunctionValue(descriptor) /* verified */ {
-        // Simple inverter of other method for readability.
-        return !this.#doesHaveFunctionValue(descriptor);
-    }
-    
-    #doesHaveFunctionValue(descriptor) /* verified */ {
-        // If no member, .value of undefined.
-        return descriptor.value instanceof Function;
-    }
-
-    // endregion Internally reused dependencies of other memberIsProperty() dependencies
-
-    // endregion Dependencies of memberIsProperty()
-}
+/**/
+
+/* Used to analyze classes / members of classes being tested. */
+
+export class TypeAnalyzer {
+    // region Definitions
+
+    static constructorName = "constructor";
+    static getName = "get";
+    static setName = "set";
+
+    // endregion Definitions
+
+    // region Fields
+
+    #type;
+
+    // endregion Fields
+
+    constructor(type) {
+        this.#type = type;
+    }
+
+    /* Returns true if instance or static member is a property (value or accessor).  Returns false if member is a method. */
+    memberIsProperty(name) /* passed */ {
+        // Constructor is never a property and is irregular, 
+        // so other type-analysis code can't handle it.
+        if (name === TypeAnalyzer.constructorName) {
+            return false;
+        }
+    
+        // Static methods and properties (value or accessor) are on type.
+        if (name in this.#type) {
+            return this.#staticMemberIsProperty(this.#type, name);
+        }
+        
+        // Methods and accessor properties are on prototype.
+        if (name in this.#type.prototype) {
+            return this.#instanceMemberIsProperty(this.#type.prototype, name);
+        }
+
+        // Instance value properties are not on type or prototype.
+        return true;
+    }
+    
+    // region Dependencies of memberIsProperty()
+    
+    /* Algorithm specialized with function check for static members. */
+    #staticMemberIsProperty(type, name) {
+        let descriptor = Object.getOwnPropertyDescriptor(type, name);
+        
+        // If on type and has accessors, it's a static accessor property.
+        if (this.#doesHaveAccessorProps(descriptor)) {
+            return true;
+        }
+        
+        // If on type and has non-Function .value, it's a static value property.
+        if (this.#doesNotHaveFunctionValue(descriptor)) {
+            return true;
+        }
+
+        // If on type but not a static property, it's a static method.
+        return false;
+    }
+
+    /* Algorithm specialized for instance members, no function check. */
+    #instanceMemberIsProperty(prototype, name) {
+        let descriptor = Object.getOwnPropertyDescriptor(prototype, name);
+        
+        // If on prototype and has accessors, it's an accessor property.
+        if (this.#doesHaveAccessorProps(descriptor)) {
+            return true;
+        }
+        
+        // If on prototype but not an accessor property, it's a method.
+        return false;
+    }
+    
+    // region Internally reused dependencies of other memberIsProperty() dependencies
+    
+    #doesHaveAccessorProps(descriptor) /* verified */ {
+        // Accessor properties have one or both of these in descriptor.
+        if (TypeAnalyzer.getName in descriptor || TypeAnalyzer.setName in descriptor) {
+            return true;
+        }
+        
+        return false;
+    }
+    
+    #doesNotHaveFunctionValue(descriptor) /* verified */ {
+        // Simple inverter of other method for readability.
+        return !this.#doesHaveFunctionValue(descriptor);
+    }
+    
+    #doesHaveFunctionValue(descriptor) /* verified */ {
+        // If no member, .value of undefined.
+        return descriptor.value instanceof Function;
+    }
+
+    // endregion Internally reused dependencies of other memberIsProperty() dependencies
+
+    // endregion Dependencies of memberIsProperty()
+}