risei 3.2.0 → 3.3.0

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.0**, 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.0**, brings further significant improvements and bug fixes on top of the major improvements in other recent releases.
 
 Check out the [full list of changes](#version-history).
 
@@ -219,6 +219,14 @@ If errors are thrown while testing, gold bars listing them appear at the bottom,
 
 ## Version history
 
+- 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"`.
+
+
+- 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.
+
+
 - Release **3.2.0** (January, 2025) contains all the changes from **3.1.1** and **3.1.0**, plus this change:
   - Risei's self-dependency for its own self-testing has been moved back to the development-only scope.
 
@@ -274,7 +282,7 @@ Older releases
 
 ## Known issues and workarounds
 
-There are two minor issues at present:
+There are two 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "risei",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "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",
@@ -41,8 +41,7 @@
   "dependencies": {
     "chalk": "^5.0.0",
     "fs": "^0.0.1-security",
-    "minimatch": "^9.0.1",
-    "npm": "^11.0.0"
+    "minimatch": "^9.0.1"
   },
   "devDependencies": {
     "chai": "^4.3.6",
@@ -51,6 +50,6 @@
     "fs": "^0.0.1-security",
     "mocha": "^10.0.0",
     "morgan": "~1.9.1",
-    "risei": "^3.1.1"
+    "risei": "^3.2.1"
   }
 }

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 // || test.of === "toString"
             ? new test.on.prototype.constructor(...test.with) 
             : test.on;