Improved namespace mapping, improved string hasNumericalValue, fix errors snapshots

Author: scammo

CHANGES.md

@@ -30,7 +30,7 @@ To be released.
         a proposal, with `action`, `resourceConformsTo`, `resourceQuantity`,
         `availableQuantity`, and `minimumQuantity` properties.
      -  Added `Measure` class for representing quantities with units of
-        measure, with `hasUnit` and `hasNumericalValue` properties.
+        measure, with `unit` and `numericalValue` properties.
 
 [#578]: https://github.com/fedify-dev/fedify/issues/578
 

docs/manual/vocab.md

@@ -158,6 +158,8 @@ property.
 > | [`alsoKnownAs`]              | `Application.getAliases()`/`Group.getAliases()`/`Organization.getAliases()`/`Person.getAliases()`/`Service.getAliases()`                |
 > | [`anyOf`]                    | `Question.getInclusiveOptions()`                                                                                                        |
 > | [`attributedTo`]             | `Object.getAttributions()`                                                                                                              |
+> | [`hasNumericalValue`]        | `Measure.numericalValue`                                                                                                                |
+> | [`hasUnit`]                  | `Measure.unit`                                                                                                                          |
 > | [`hreflang`]                 | `Link.language`                                                                                                                         |
 > | [`inReplyTo`]                | `Object.getReplyTargets()`                                                                                                              |
 > | [`isCat`]                    | `Application.cat`/`Group.cat`/`Organization.cat`/`Person.cat`/`Service.cat`                                                             |
@@ -174,6 +176,8 @@ property.
 [`alsoKnownAs`]: https://www.w3.org/TR/did-core/#dfn-alsoknownas
 [`anyOf`]: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-anyof
 [`attributedTo`]: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-attributedto
+[`hasNumericalValue`]: http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue
+[`hasUnit`]: http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit
 [`hreflang`]: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-hreflang
 [`inReplyTo`]: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-inreplyto
 [`isCat`]: https://misskey-hub.net/ns#iscat

packages/vocab-tools/src/__snapshots__/class.test.ts.deno.snap

@@ -417,24 +417,24 @@ snapshot[`Deno.inspect(PropertyValue) [auto] 3`] = `'PropertyValue { id: URL "ht
 snapshot[`Deno.inspect(Measure) [auto] 1`] = `
 'Measure {
   id: URL "https://example.com/",
-  hasUnit: "hello",
-  hasNumericalValue: "hello"
+  unit: "hello",
+  numericalValue: "12.34"
 }'
 `;
 
 snapshot[`Deno.inspect(Measure) [auto] 2`] = `
 'Measure {
   id: URL "https://example.com/",
-  hasUnit: "hello",
-  hasNumericalValue: "hello"
+  unit: "hello",
+  numericalValue: "12.34"
 }'
 `;
 
 snapshot[`Deno.inspect(Measure) [auto] 3`] = `
 'Measure {
   id: URL "https://example.com/",
-  hasUnit: "hello",
-  hasNumericalValue: "hello"
+  unit: "hello",
+  numericalValue: "12.34"
 }'
 `;
 

packages/vocab-tools/src/__snapshots__/class.test.ts.node.snap

@@ -11,7 +11,7 @@ defaultContext:
   hasNumericalValue: "om2:hasNumericalValue"
 
 properties:
-- singularName: hasUnit
+- singularName: unit
   functional: true
   compactName: hasUnit
   uri: "http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit"
@@ -21,15 +21,12 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#string"
 
-- singularName: hasNumericalValue
+- singularName: numericalValue
   functional: true
   compactName: hasNumericalValue
   uri: "http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue"
   description: |
-    The amount of the resource, represented as a decimal string.  If not
-    specified, arbitrary amounts can be used when responding to the proposal.
-
-    NOTE: This property uses `xsd:string` as a temporary measure until
-    `xsd:decimal` is supported.  See #617.
+    The amount of the resource.  If not specified, arbitrary amounts can be
+    used when responding to the proposal.
   range:
-  - "http://www.w3.org/2001/XMLSchema#string"
+  - "http://www.w3.org/2001/XMLSchema#decimal"

packages/vocab-tools/src/__snapshots__/class.test.ts.snap

@@ -25,8 +25,14 @@ description: |
 defaultContext:
 - "https://www.w3.org/ns/activitystreams"
 - "https://w3id.org/security/data-integrity/v1"
+- "https://gotosocial.org/ns"
 - vf: "https://w3id.org/valueflows/ont/vf#"
   om2: "http://www.ontology-of-units-of-measure.org/resource/om-2/"
+  fedibird: "http://fedibird.com/ns#"
+  sensitive: "as:sensitive"
+  emojiReactions:
+    "@id": "fedibird:emojiReactions"
+    "@type": "@id"
   Proposal: "vf:Proposal"
   Intent: "vf:Intent"
   purpose: "vf:purpose"

packages/vocab/src/__snapshots__/vocab.test.ts.snap

@@ -1,5 +1,9 @@
 import { mockDocumentLoader, test } from "@fedify/fixture";
-import { decodeMultibase, LanguageString } from "@fedify/vocab-runtime";
+import {
+  decodeMultibase,
+  LanguageString,
+  parseDecimal,
+} from "@fedify/vocab-runtime";
 import {
   areAllScalarTypes,
   loadSchemaFiles,
@@ -1915,6 +1919,7 @@ const sampleValues: Record<string, any> = {
   "http://www.w3.org/2001/XMLSchema#integer": -123,
   "http://www.w3.org/2001/XMLSchema#nonNegativeInteger": 123,
   "http://www.w3.org/2001/XMLSchema#float": 12.34,
+  "http://www.w3.org/2001/XMLSchema#decimal": parseDecimal("12.34"),
   "http://www.w3.org/2001/XMLSchema#string": "hello",
   "http://www.w3.org/2001/XMLSchema#anyURI": new URL("https://example.com/"),
   "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString": new LanguageString(