Return undefined not null when resolving fails

[Etiquette] / model.test.js

diff --git a/model.test.js b/model.test.js
index 7190830c3a043dd200bfecf4ed7d68d924e6b32c..ed1430e8a49246c1a97190eb3e64ca9e443bbad3 100644 (file)
--- a/model.test.js
+++ b/model.test.js
@@ -105,13 +105,13 @@ describe("TagSystem", () => {
     });
 
     it("[[Construct]] defaults the preferred label to the empty string", () => {
-      assertStrictEquals(new Tag().prefLabel, "");
+      assertEquals({ ...new Tag().prefLabel }, { "@value": "" });
     });
 
     it("[[Construct]] correctly sets the preferred label to a simple string", () => {
-      assertStrictEquals(
-        new Tag("RelationshipTag", "Shadow, Me").prefLabel,
-        "Shadow, Me",
+      assertEquals(
+        { ...new Tag("RelationshipTag", "Shadow, Me").prefLabel },
+        { "@value": "Shadow, Me" },
       );
     });
 
@@ -164,6 +164,12 @@ describe("TagSystem", () => {
       });
     });
 
+    describe(".constructor", () => {
+      it("[[Get]] is `Function`", () => {
+        assertStrictEquals(Tag.constructor, Function);
+      });
+    });
+
     describe(".fromIRI", () => {
       it("[[Call]] returns the persisted tag with the given I·R·I", () => {
         const tag = new Tag();
@@ -177,17 +183,19 @@ describe("TagSystem", () => {
         assertStrictEquals(retrieved.identifier, identifier);
       });
 
-      it("[[Call]] returns null if no tag with the given I·R·I has been persisted", () => {
+      it("[[Call]] returns undefined if no tag with the given I·R·I has been persisted", () => {
         assertStrictEquals(
           Tag.fromIRI(
             `https://${system.authorityName}/tag:${system.taggingEntity}:000-0000`,
           ),
-          null,
+          undefined,
         );
       });
 
-      it("[[Call]] returns null if passed an invalid I·R·I", () => {
-        assertStrictEquals(Tag.fromIRI(`bad iri`), null);
+      it("[[Call]] throws if passed an invalid I·R·I", () => {
+        assertThrows(() => {
+          Tag.fromIRI(`bad iri`);
+        });
       });
     });
 
@@ -204,8 +212,8 @@ describe("TagSystem", () => {
         assertStrictEquals(retrieved.identifier, identifier);
       });
 
-      it("[[Call]] returns null if no tag with the given identifier has been persisted", () => {
-        assertStrictEquals(Tag.fromIdentifier("000-0000"), null);
+      it("[[Call]] returns undefined if no tag with the given identifier has been persisted", () => {
+        assertStrictEquals(Tag.fromIdentifier("000-0000"), undefined);
       });
 
       it("[[Call]] throws if passed an invalid identifier", () => {
@@ -231,14 +239,14 @@ describe("TagSystem", () => {
         assertStrictEquals(retrieved.identifier, identifier);
       });
 
-      it("[[Call]] returns null if no tag with the given Tag U·R·I has been persisted", () => {
+      it("[[Call]] returns undefined if no tag with the given Tag U·R·I has been persisted", () => {
         assertStrictEquals(
-          Tag.fromIRI(`tag:${system.taggingEntity}:`),
-          null,
+          Tag.fromTagURI(`tag:${system.taggingEntity}:`),
+          undefined,
         );
         assertStrictEquals(
-          Tag.fromIRI(`tag:${system.taggingEntity}:000-0000`),
-          null,
+          Tag.fromTagURI(`tag:${system.taggingEntity}:000-0000`),
+          undefined,
         );
       });
 
@@ -254,12 +262,6 @@ describe("TagSystem", () => {
       });
     });
 
-    describe(".getSystem", () => {
-      it("[[Has]] is not present", () => {
-        assertFalse("getSystem" in Tag);
-      });
-    });
-
     describe(".identifiers", () => {
       it("[[Call]] yields all the persisted identifiers", () => {
         const tags = new Set(function* () {
@@ -295,13 +297,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
         );
         assertEquals(
-          Array.from(
-            tag.altLabels(),
-            ($) => typeof $ == "string" ? $ : { ...$ },
-          ),
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
           [
-            "one",
-            "two",
+            { "@value": "one" },
+            { "@value": "two" },
             { "@value": "three", "@language": "en" },
           ],
         );
@@ -371,13 +370,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
         );
         assertEquals(
-          Array.from(
-            tag.hiddenLabels(),
-            ($) => typeof $ == "string" ? $ : { ...$ },
-          ),
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
           [
-            "one",
-            "two",
+            { "@value": "one" },
+            { "@value": "two" },
             { "@value": "three", "@language": "en" },
           ],
         );
@@ -415,8 +411,10 @@ describe("TagSystem", () => {
       });
 
       it("[[Call]] throws when this is not a tag which can be placed in canon", () => {
+        const canon = new Tag("CanonTag");
+        canon.persist();
         assertThrows(() => {
-          new Tag().addInCanonTag();
+          new Tag().addInCanonTag(canon);
         });
       });
 
@@ -473,8 +471,10 @@ describe("TagSystem", () => {
       });
 
       it("[[Call]] throws when this is not a conceptual tag", () => {
+        const involved = new Tag();
+        involved.persist();
         assertThrows(() => {
-          new Tag().addInvolvesTag();
+          new Tag().addInvolvesTag(involved);
         });
       });
 
@@ -553,7 +553,10 @@ describe("TagSystem", () => {
         const tag = new Tag();
         tag.addAltLabel("etaoin");
         tag.deleteAltLabel();
-        assertEquals([...tag.altLabels()], ["etaoin"]);
+        assertEquals(
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
+          [{ "@value": "etaoin" }],
+        );
       });
 
       it("[[Call]] deletes only the provided hidden labels", () => {
@@ -570,7 +573,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
           { "@value": "four", "@language": "en" },
         );
-        assertEquals([...tag.altLabels()], ["four"]);
+        assertEquals(
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
+          [{ "@value": "four" }],
+        );
       });
 
       it("[[Call]] returns this", () => {
@@ -621,7 +627,10 @@ describe("TagSystem", () => {
         const tag = new Tag();
         tag.addHiddenLabel("etaoin");
         tag.deleteHiddenLabel();
-        assertEquals([...tag.hiddenLabels()], ["etaoin"]);
+        assertEquals(
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
+          [{ "@value": "etaoin" }],
+        );
       });
 
       it("[[Call]] deletes only the provided alternative labels", () => {
@@ -638,7 +647,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
           { "@value": "four", "@language": "en" },
         );
-        assertEquals([...tag.hiddenLabels()], ["four"]);
+        assertEquals(
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
+          [{ "@value": "four" }],
+        );
       });
 
       it("[[Call]] returns this", () => {
@@ -763,6 +775,8 @@ describe("TagSystem", () => {
 
     // `::iri` is tested by a `.fromIRI`.
 
+    // `::iriSpace` is tested by a `.fromIRI`.
+
     // `::kind` is tested by the constructor.
 
     describe("::narrowerTags", () => {
@@ -914,9 +928,9 @@ describe("TagSystem", () => {
       it("[[Set]] sets the preferred label", () => {
         const tag = new Tag();
         tag.prefLabel = "one";
-        assertStrictEquals(tag.prefLabel, "one");
+        assertEquals({ ...tag.prefLabel }, { "@value": "one" });
         tag.prefLabel = { "@value": "two" };
-        assertStrictEquals(tag.prefLabel, "two");
+        assertEquals({ ...tag.prefLabel }, { "@value": "two" });
         tag.prefLabel = { "@value": "three", "@language": "en" };
         assertEquals(
           { ...tag.prefLabel },
@@ -1028,6 +1042,25 @@ describe("TagSystem", () => {
     });
   });
 
+  describe("::iriSpace", () => {
+    it("[[Get]] returns the I·R·I space", () => {
+      const system = new TagSystem("etaoin.example", "1972-12-31");
+      assertStrictEquals(
+        system.iriSpace,
+        "https://etaoin.example/tag:etaoin.example,1972-12-31:",
+      );
+      const system2 = new TagSystem(
+        "etaoin.example",
+        "1972-12-31",
+        "etaoin",
+      );
+      assertStrictEquals(
+        system2.iriSpace,
+        "https://etaoin.example/tag:etaoin.example,1972-12-31:",
+      );
+    });
+  });
+
   describe("::tagURI", () => {
     it("[[Get]] returns the Tag U·R·I", () => {
       const system = new TagSystem("etaoin.example", "1972-12-31");