risei 3.2.1 → 3.3.1

package/README.md

@@ -46,7 +46,7 @@ And they have a summary bar at the bottom:
 
 ## Status
 
-Risei's major features are now complete, but new enhancements or fixes may appear from time to time.   The latest release, **3.2.1**, includes significant improvements and bug fixes, on top of the major improvements in releases **3.0.0** and **2.0.0**.
+Risei's major features are now complete, but new enhancements or fixes may appear from time to time.   The latest release, **3.3.1**, fixes an edge case with addressing properties.
 
 Check out the [full list of changes](#version-history).
 
@@ -91,33 +91,9 @@ And add Risei's metadata to `package.json`:
 }
 ```
 
-## Testing Risei
-
-To test Risei, you clone it from a parallel [repository](https://gitlab.com/riseimaker/risei-public.git), install its dependencies, and run its self-tests.   See the full explanation [here](https://deusware.com/risei/index.html#self-testing).
-
-
-## Running Tests
-
-Once you have some tests written, you can run them manually:
-
-```bash
-node ./node_modules/risei/index.js
-```
-
-Or write a script in `package.json` that does the same:
-
-```json
-"scripts": {
-  "test": "node ./node_modules/risei/index.js"
-}
-```
-
-And then run that script:
-
-```bash
-npm test
-```
+## Testing Risei Itself
 
+To test Risei itself, you clone it from a parallel [repository](https://gitlab.com/riseimaker/risei-public.git), install its dependencies, and run its self-tests.   See the full explanation [here](https://deusware.com/risei/index.html#self-testing).
 
 
 ## Writing Tests
@@ -150,9 +126,32 @@ tests = [ ...
 - You can use [long names](https://deusware.com/risei/index.html#long-names) for properties if you want.
 
 
+## Running Tests
+
+Once you have some tests written, you can run them manually:
+
+```bash
+node ./node_modules/risei/index.js
+```
+
+Or write a script in `package.json` that does the same:
+
+```json
+"scripts": {
+  "test": "node ./node_modules/risei/index.js"
+}
+```
+
+And then run that script:
+
+```bash
+npm test
+```
+
+
 ## Basic collapsing forward example
 
-You can state test properties once and let them _collapse forward_ across subsequent tests to save time and make tests easier to read.
+You can state repeated test properties just once, and let them _collapse forward_ across subsequent tests to save time and make tests easier to read.
 
 Risei collapses values together from partial or full test objects until it has a full test to run.   Every property collapses forward until it is changed or wiped out:
 
@@ -219,6 +218,20 @@ If errors are thrown while testing, gold bars listing them appear at the bottom,
 
 ## Version history
 
+- Release **3.3.1** (February, 2025) contains this change:
+  - You can now spoof and otherwise address value properties (formally _data descriptors_) that don't have an initial value, whether they are static or instance class members.
+
+
+- Release **3.3.0** (January, 2025) adds this change to those of other recent releases:
+  - You can now test instance members with the same names as static members using a new `.and` option of `"instance"`.
+
+
+
+<details>
+<summary>
+Older releases
+</summary>
+
 - Release **3.2.1** (January, 2025) contains all the changes from **3.2.0**, **3.1.1**, and **3.1.0**, plus this change:
   - Risei's mistaken nominal dependency on **npm** has been removed.
 
@@ -242,34 +255,6 @@ If errors are thrown while testing, gold bars listing them appear at the bottom,
   - Widespread internal reengineering of other kinds.
 
 
-
-<details>
-<summary>
-Older releases
-</summary>
-
-- Release **3.0.0** (August, 2024) contained all of these changes:
-  - Asynchronous code with `async` syntax is now supported, with no special test syntax.
-  - **(Breaking change)**&nbsp;  `.from` functions now take `test` and `actual` as parameters, rather than `target` and `test`.
-    - If you need to work with the target of the test (usually an instance of the class being tested), it's available as `test.target`.
-  - You can now call target code more than once in one test using an `.and` of `"poly"` (AKA _poly-calling_).
-
-
-- Release **2.0.0** / **2.0.1** (August, 2024) contained all of these changes:
-  - Risei now can determine automatically if tested methods are static.
-  - You can now directly test properties just like methods.
-    - Risei can also determine automatically if these are static.
-    - Directly tested properties appear in the output in the form `.name`.
-  - You can now spoof properties on the targeted class instance, and static properties on the target class itself.
-  - You can now perform arbitrary operations, if needed, with the two-part `.do` property and one-part `.undo` property.
-  - You can now change test properties without accidentally creating a new test using `.just`.
-  - You can now directly test for `undefined` in `.out` using `this.undef` / `ATestSource.undefSymbol`.
-  - `Error` objects are now compared accurately.
-  - You can now identify member types with `.`, `:`, and `()` in any of `.of`, `.plus`, and `.from`, though it isn't necessary.
-  - **(Breaking change)**&nbsp;  The actual for throw tests is now the entire thrown object (usually an `Error`), rather than the `Error`'s message text.
-  - **(Breaking change)**&nbsp;  `ATestSource` is now a default export, changing its imports from `import { ATestSource } from` to `import ATestSource from`.
-  - Major internal re-engineering.
-
 > Older releases are dropped from this list progressively over time.&nbsp;  Using the latest release is recommended.
 
 </details>
@@ -278,7 +263,7 @@ Older releases
 
 ## Known issues and workarounds
 
-There are two minor issues at present:
+There are the known minor issues:
 
 - If args for a test are mutated by tested code, the mutated args are used when collapsing forward.
   - The workaround is just to restate those args for each test.
@@ -288,6 +273,10 @@ There are two minor issues at present:
   - The workaround is to find another way to produce the property values you need.
 
 
+- Predefined JavaScript methods like `toString()` may not be recognized, nor any instance method that has the same name as a static method.
+  - The workaround is to use an `.and` value of `"instance"` for any methods like these that you test.
+
+
 
 ## Exclusions from Risei
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "risei",
-  "version": "3.2.1",
+  "version": "3.3.1",
   "description": "Risei allows you to write unit tests as simple JavaScript objects, so it's easy and fast, with no drag on redesign.",
   "keywords": [
     "unit test",
@@ -50,6 +50,6 @@
     "fs": "^0.0.1-security",
     "mocha": "^10.0.0",
     "morgan": "~1.9.1",
-    "risei": "^3.2.0"
+    "risei": "^3.3.0"
   }
 }

package/system/MethodSpoofer.js

@@ -80,7 +80,7 @@ export default class MethodSpoofer extends ASpoofingFixture {
         // Map of Maps: by type, then by method.
         for (let def of spoofDefs) {
             let spoofsByTarget = this.#supplyMemberMap(this.#spoofsByClass, def.target);
-            
+
             // A single-method spoof is set for later use.
             if (def.method) {
                 spoofsByTarget.set(def.method, def.output);
@@ -104,7 +104,7 @@ export default class MethodSpoofer extends ASpoofingFixture {
             
             // Saving originals in the Map for later.
             for (let name of names) {
-                let original = TypeAnalyzer.isInstanceMember(type, name)
+               let original = TypeAnalyzer.isInstanceMember(type, name)
                     ? type.prototype[name]
                     : type[name];
 

package/system/TestDef.js

@@ -14,6 +14,7 @@ export default class TestDef {
     // region Definitions
 
     static staticName = "static";
+    static instanceName = "instance";
     static throwName = "throw";
     static polyName = "poly";
     static constructorName = "constructor";
@@ -173,16 +174,19 @@ export default class TestDef {
     }
 
     get isInstanceTest() /* passed */ {
-        return !this.isStaticTest || this.isConstructorTest;
+        return this.#isNamedTypeTest(
+            TestDef.instanceName, 
+            TestDef.staticName, 
+            TypeAnalyzer.isInstanceMember
+        );
     }
 
     get isStaticTest() /* passed */ {
-        let plainName = NameAnalyzer.plainNameOf(this.of);
-
-        let is = TypeAnalyzer.isStaticMember(this.on, plainName);
-        let stated = this.andStringContains(TestDef.staticName);
-
-        return is || stated;
+        return this.#isNamedTypeTest(
+            TestDef.staticName, 
+            TestDef.instanceName, 
+            TypeAnalyzer.isStaticMember
+        );
     }
 
     get isThrowTest() /* passed */ {
@@ -308,6 +312,25 @@ export default class TestDef {
 
     // region State methods
 
+    /* Dependency of .isInstanceTest and .isStaticTest. */
+    #isNamedTypeTest(type, antiType, analyzer) /* verified */ {
+        // If stated to be the opposite type, not this type.
+        if (this.andStringContains(antiType)) {
+            return false;
+        }
+
+        // Analysis of what the type probably is.
+        let plainName = NameAnalyzer.plainNameOf(this.of);
+        let is = analyzer(this.on, plainName);
+
+        // If states to be this type, then this type.
+        let stated = this.andStringContains(type);
+
+        // Whichever may apply.
+        return is || stated;
+    }
+
+
     /* Needed externally, and dependency 
        of all .and-based properties. */
     andStringContains(keyword) /* passed */ {

package/system/TestStages.js

@@ -42,7 +42,7 @@ export default class TestStages {
             return;
         }
 
-        let target = test.isInstanceTest 
+        let target = test.isInstanceTest
             ? new test.on.prototype.constructor(...test.with) 
             : test.on;
 

package/system/TypeAnalyzer.js

@@ -105,10 +105,8 @@ export default class TypeAnalyzer {
             return false;
         }
 
-        // Members with any other values are properties.
-        if (named.value !== undefined) {
-            return true;
-        }
+        // Any other members are properties.
+        return true;
     }
 
     static #typeTextContainsNameAsProperty(type, name) /* verified */ {