risei 3.0.0 → 3.1.1

package/system/TotalDisplayer.js

@@ -3,23 +3,27 @@
 import TypeIdentifier from "./TypeIdentifier.js";
 import Types from "./Types.js";
 import ATestSource from "./ATestSource.js";
+import ObjectAnalyzer from "./ObjectAnalyzer.js";
 
 export default class TotalDisplayer {
-    display(value) /* good */ {
+    static defaultToString = "[object Object]";
+
+    display(value) /* passed */ {
         let typeId = TypeIdentifier.identify(value);
 
         switch (typeId) {
+            case Types.isUndefined: return this.displayUndefined(value);
             case Types.isValue: return this.displayValue(value);
             case Types.isString: return this.displayString(value);
             case Types.isArray: return this.displayArray(value);
             case Types.isMap: return this.displayMap(value);
             case Types.isSet: return this.displaySet(value);
+            case Types.isFile: return this.displayFile(value);
             case Types.isError: return this.displayError(value);
             case Types.isClass: return this.displayClass(value);
             case Types.isFunction: return this.displayFunction(value);
             case Types.isObject: return this.displayObject(value);
             case Types.isDate: return this.displayValue(value);
-            case Types.isUndefined: return this.displayUndefined(value);
             case Types.isUndefSymbol: return this.displayUndefined(value);
             case Types.isNull: return this.displayNull(value);
         }
@@ -82,6 +86,10 @@ export default class TotalDisplayer {
         return output;
     }
 
+    displayFile(value) /* passed */ {
+        return `File{name:"${ value.name }",size:${ value.size }}`;
+    }
+
     displayError(value) /* passed */ {
         // Subtype can't be found with typeof.
         let type = value.name;
@@ -125,13 +133,28 @@ export default class TotalDisplayer {
     }
 
     displayObject(value) /* passed */ {
+        // If a custom toString() exists, use its output.
+        let asString = value.toString();
+
+        if (asString !== TotalDisplayer.defaultToString) {
+            return asString;
+        }
+
         // Each property of the object is handled individually.
         let items = [ ];
 
-        for (let p in value) {
-            // Cross-recursion.
-            let item = this.display(value[p]);
-            items.push(`${ p }:${ item }`);
+        let props = ObjectAnalyzer.allProperties(value);
+
+        for (let prop of props) {
+            // Cross-recursion.  Try-catch because getters can fail.
+            try { 
+                let item = this.display(value[prop]);
+                items.push(`${ prop }:${ item }`);
+            }
+            catch (e) 
+            {
+                items.push(`${ prop }:(threw)`);
+            }
         }
 
         // Properties are all listed together.

package/system/TypeAnalyzer.js

@@ -59,9 +59,12 @@ export default class TypeAnalyzer {
         return isProperty;
     }
 
+    // region Dependencies of isPropertyMember()
+    
     static #typeChainIncludesAsProperty(type, name) /* verified */ {
         let prototype = type.prototype;
 
+        // Rootward traversal of the prototype chain.
         while (prototype !== null) {
             // Type is needed, rather than prototype.
             type = prototype.constructor;
@@ -71,17 +74,13 @@ export default class TypeAnalyzer {
                 = TypeAnalyzer.#typeDefinitionIncludesAsProperty(type, name) 
                 || TypeAnalyzer.#typeTextContainsNameAsProperty(type, name);
 
-            // Found as static or instance.
+            // Was found as static or instance.
             if (isProperty) {
                 return true;
             }
 
-            // Parent class.
+            // Parent class, or null at root.
             prototype = Object.getPrototypeOf(prototype);
-
-            if (prototype === null) {
-                break;
-            }
         }
 
         // Never found.
@@ -120,18 +119,57 @@ export default class TypeAnalyzer {
         let valueRegex = new RegExp(`^\\s*${ name }\\s*[=;]`, "m");
         let accessorRegex = new RegExp(`^\\s*get ${ name }\\(\\)`, "m");
 
-        let anyIndexOf = text.search(valueRegex);
+        // Conditional execution of the second test() call.
+        let doesContain = valueRegex.test(text) || accessorRegex.test(text);
+        return doesContain;
+    }
+    
+    // endregion Dependencies of isPropertyMember()
+    
+    static allGetters(type) /* passed */ {
+        return TypeAnalyzer.#allTypeChainGetters(type);
+    }
+    
+    // region Dependencies of allGetters()
+    
+    static #allTypeChainGetters(type) /* verified */ {
+        let output = [];
 
-        if (anyIndexOf >= 0) {
-            return true;
-        }
+        let prototype = type.prototype;
+
+        // Rootward traversal of the prototype chain.
+        while (prototype !== null) {
+            // Type is needed, rather than prototype.
+            type = prototype.constructor;
 
-        anyIndexOf = text.search(accessorRegex);
+            // Any getters at this level.
+            let local = TypeAnalyzer.#gettersInTypeText(type);
+            output.push(...local);
 
-        if (anyIndexOf >= 0) {
-            return true;
+            // Parent class, or null at root.
+            prototype = Object.getPrototypeOf(prototype);
         }
 
-        return false;
+        return output;
+    }
+    
+    static #gettersInTypeText(type) /* verified */ {
+        let text = type.toString();
+
+        // At start of line's text, get + name + ().
+        let getterRegex = /^\s*get\s+(\w+)\(\)/gm;
+
+        // All getters and their names 
+        // as an array of arrays.
+        let raw = text.matchAll(getterRegex);
+        raw = [ ...raw ];
+
+        // First capturing group is name.
+        let names = raw.map(x => x[1]);
+
+        return names;
     }
+    
+    // endregion Dependencies of allGetters()
+    
 }

package/system/TypeIdentifier.js

@@ -14,27 +14,31 @@ export default class TypeIdentifier {
             if (Array.isArray(value)) {
                 return Types.isArray;
             }
-        
+
             if (value instanceof Map) {
                 return Types.isMap;
             }
-            
+
             if (value instanceof Set) {
                 return Types.isSet;
             }
-            
+
+            if (value instanceof File) {
+                return Types.isFile;
+            }
+
             if (value instanceof Date) {
                 return Types.isDate;
             }
-            
+
             if (value instanceof Error) {
                 return Types.isError;
             }
-            
+
             if (value === null) {
                 return Types.isNull;
             }
-            
+
             return Types.isObject;
         }
 

package/system/Types.js

@@ -9,6 +9,7 @@ export default class Types {
     static isObject = "object";
     static isMap = "map";
     static isSet = "set";
+    static isFile = "file";
     static isFunction = "function";
     static isClass = "class";
     static isDate = "date";

package/system/ATestCaller.js

@@ -1,61 +0,0 @@
-/**/
-
-/*  Defines operations that a test caller (which requests 
-    the running / reporting of tests) must implement.  
-    Uses the ATestRunner to run all the tests via a generator, 
-    and the ATestReporter for out / formatting if needed.
-    A = abstract. */
-
-import TestRunner from "./TestRunner.js";
-import ATestReporter from "./ATestReporter.js";
-
-export default class ATestCaller {
-    // region Private fields
-
-    #finder;
-    #runner;
-    #reporter;
-
-    // endregion Private fields
-
-    // region Properties
-
-    get finder() {
-        return this.#finder;
-    }
-    
-    set finder(value) {
-        this.#finder = value;
-    }
-
-    get runner() {
-        return this.#runner;
-    }
-
-    set runner(value) {
-        this.#runner = value;
-    }
-
-    get reporter() {
-        return this.#reporter;
-    }
-
-    set reporter(value) {
-        this.#reporter = value;
-    }
-
-    // endregion Properties
-
-    constructor(finder, runner, reporter) {
-        this.#finder = finder;
-        this.#runner = runner;
-        this.#reporter = reporter;
-    }
-
-    async runAllTests() {
-        throw new Error(
-            "Implement runAllTests() on a subclass, " +
-            "using .reporter for out / formatting if needed."
-        );
-    }
-}

package/system/ATestFinder.js

@@ -1,38 +0,0 @@
-/**/
-
-/* Defines operations that test-finding classes should implement.  A = abstract. */
-
-import ATestSource from "./ATestSource.js";
-
-export default class ATestFinder {
-    // region Fields
-
-    #testSources;
-    #thrown = [];
-
-    // endregion Fields
-
-    // region Properties
-
-    get testSources() {
-        return this.#testSources;
-    }
-
-    set testSources(value) {
-        this.#testSources = value;
-    }
-
-    get thrown() {
-        return this.#thrown;
-    }
-
-    // endregion Properties
-
-    constructor() {
-        this.#testSources = [];
-    }
-
-    async findAllTests() {
-        throw new Error("Implement findAllTests() on a subclass of ATestFinder.");
-    }
-}

package/system/ATestReporter.js

@@ -1,26 +0,0 @@
-/**/
-
-/* Defines operations that a test reporter must implement.  A = abstract. */
-
-/* &cruft, ? replace with my own code eventually */
-import chalk from "chalk";
-
-export default class ATestReporter {
-    // Reports whatever was just provided by the TestRunner.
-    // Can delegate to the other report-x methods.
-    reportNext(result) {
-    }
-
-    reportGroup() {
-    }
-
-    reportPassed(result) {
-    }
-
-    reportFailed(result) {
-    }
-
-    reportSummary(summary) {
-    }
-
-}