@fedify/vocab 2.2.0-dev.635 → 2.2.0-dev.700

package/dist-tests/vocab.test.mjs

@@ -1,10 +1,10 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { _ as Place, a as Create, b as Source, c as Follow, d as Link, f as Note, g as Person, i as Collection, m as OrderedCollectionPage, n as Announce, o as CryptographicKey, p as Object$1, s as Endpoints, t as Activity, u as Hashtag, v as Question, x as vocab_exports } from "./vocab-ZNOT6nzY.mjs";
+import { _ as Place, a as Create, b as Source, c as Follow, d as Link, f as Note, g as Person, i as Collection, m as OrderedCollectionPage, n as Announce, o as CryptographicKey, p as Object$1, s as Endpoints, t as Activity, u as Hashtag, v as Question, x as vocab_exports } from "./vocab-CGZuHaxe.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
-import { LanguageString, decodeMultibase } from "@fedify/vocab-runtime";
+import { LanguageString, decodeMultibase, parseDecimal } from "@fedify/vocab-runtime";
 import { pascalCase } from "es-toolkit";
 import { areAllScalarTypes, loadSchemaFiles } from "@fedify/vocab-tools";
 //#region src/vocab.test.ts
@@ -1222,6 +1222,7 @@ const sampleValues = {
 	"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("hello", "en"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.2.0-dev.635+ece5910c",
+  "version": "2.2.0-dev.700+5323388d",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "es-toolkit": "1.43.0",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.2.0-dev.635+ece5910c",
-    "@fedify/webfinger": "2.2.0-dev.635+ece5910c",
-    "@fedify/vocab-runtime": "2.2.0-dev.635+ece5910c"
+    "@fedify/vocab-tools": "2.2.0-dev.700+5323388d",
+    "@fedify/vocab-runtime": "2.2.0-dev.700+5323388d",
+    "@fedify/webfinger": "2.2.0-dev.700+5323388d"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

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

@@ -414,6 +414,30 @@ snapshot[`Deno.inspect(PropertyValue) [auto] 2`] = `'PropertyValue { id: URL "ht
 
 snapshot[`Deno.inspect(PropertyValue) [auto] 3`] = `'PropertyValue { id: URL "https://example.com/", name: "hello", value: "hello" }'`;
 
+snapshot[`Deno.inspect(Measure) [auto] 1`] = `
+'Measure {
+  id: URL "https://example.com/",
+  unit: "hello",
+  numericalValue: "12.34"
+}'
+`;
+
+snapshot[`Deno.inspect(Measure) [auto] 2`] = `
+'Measure {
+  id: URL "https://example.com/",
+  unit: "hello",
+  numericalValue: "12.34"
+}'
+`;
+
+snapshot[`Deno.inspect(Measure) [auto] 3`] = `
+'Measure {
+  id: URL "https://example.com/",
+  unit: "hello",
+  numericalValue: "12.34"
+}'
+`;
+
 snapshot[`Deno.inspect(AnnounceAuthorization) [auto] 1`] = `
 'AnnounceAuthorization {
   id: URL "https://example.com/",
@@ -1479,6 +1503,180 @@ snapshot[`Deno.inspect(Multikey) [auto] 3`] = `
 }'
 `;
 
+snapshot[`Deno.inspect(Intent) [auto] 1`] = `
+'Intent {
+  id: URL "https://example.com/",
+  action: "hello",
+  resourceConformsTo: URL "https://example.com/",
+  resourceQuantity: Measure {},
+  availableQuantity: Measure {},
+  minimumQuantity: Measure {}
+}'
+`;
+
+snapshot[`Deno.inspect(Intent) [auto] 2`] = `
+'Intent {
+  id: URL "https://example.com/",
+  action: "hello",
+  resourceConformsTo: URL "https://example.com/",
+  resourceQuantity: Measure {},
+  availableQuantity: Measure {},
+  minimumQuantity: Measure {}
+}'
+`;
+
+snapshot[`Deno.inspect(Intent) [auto] 3`] = `
+'Intent {
+  id: URL "https://example.com/",
+  action: "hello",
+  resourceConformsTo: URL "https://example.com/",
+  resourceQuantity: Measure {},
+  availableQuantity: Measure {},
+  minimumQuantity: Measure {}
+}'
+`;
+
+snapshot[`Deno.inspect(Proposal) [auto] 1`] = `
+'Proposal {
+  id: URL "https://example.com/",
+  attachments: [ Object {}, Link {}, PropertyValue {} ],
+  attributions: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
+  audience: Object {},
+  contents: [ "hello", <en> "hello" ],
+  contexts: [ Object {}, Link {} ],
+  names: [ "hello", <en> "hello" ],
+  endTime: 2024-03-03T08:30:06.796196096Z,
+  generators: [ Object {}, Link {} ],
+  icon: Image {},
+  image: Image {},
+  replyTargets: [ Object {}, Link {} ],
+  locations: [ Object {}, Link {} ],
+  previews: [ Link {}, Object {} ],
+  published: 2024-03-03T08:30:06.796196096Z,
+  replies: Collection {},
+  shares: Collection {},
+  likes: Collection {},
+  emojiReactions: Collection {},
+  startTime: 2024-03-03T08:30:06.796196096Z,
+  summaries: [ "hello", <en> "hello" ],
+  tags: [ Object {}, Link {} ],
+  updated: 2024-03-03T08:30:06.796196096Z,
+  urls: [ URL "https://example.com/", Link {} ],
+  to: Object {},
+  bto: Object {},
+  cc: Object {},
+  bcc: Object {},
+  mediaType: "hello",
+  duration: PT1H,
+  sensitive: true,
+  source: Source {},
+  proof: DataIntegrityProof {},
+  interactionPolicy: InteractionPolicy {},
+  approvedBy: URL "https://example.com/",
+  likeAuthorization: LikeAuthorization {},
+  replyAuthorization: ReplyAuthorization {},
+  announceAuthorization: AnnounceAuthorization {},
+  purpose: "hello",
+  publishes: Intent {},
+  reciprocal: Intent {},
+  unitBased: true
+}'
+`;
+
+snapshot[`Deno.inspect(Proposal) [auto] 2`] = `
+'Proposal {
+  id: URL "https://example.com/",
+  attachments: [ URL "https://example.com/" ],
+  attribution: URL "https://example.com/",
+  audience: URL "https://example.com/",
+  contents: [ "hello", <en> "hello" ],
+  contexts: [ URL "https://example.com/" ],
+  names: [ "hello", <en> "hello" ],
+  endTime: 2024-03-03T08:30:06.796196096Z,
+  generators: [ URL "https://example.com/" ],
+  icon: URL "https://example.com/",
+  image: URL "https://example.com/",
+  replyTarget: URL "https://example.com/",
+  location: URL "https://example.com/",
+  preview: URL "https://example.com/",
+  published: 2024-03-03T08:30:06.796196096Z,
+  replies: URL "https://example.com/",
+  shares: URL "https://example.com/",
+  likes: URL "https://example.com/",
+  emojiReactions: URL "https://example.com/",
+  startTime: 2024-03-03T08:30:06.796196096Z,
+  summaries: [ "hello", <en> "hello" ],
+  tags: [ URL "https://example.com/" ],
+  updated: 2024-03-03T08:30:06.796196096Z,
+  urls: [ URL "https://example.com/", Link {} ],
+  to: URL "https://example.com/",
+  bto: URL "https://example.com/",
+  cc: URL "https://example.com/",
+  bcc: URL "https://example.com/",
+  mediaType: "hello",
+  duration: PT1H,
+  sensitive: true,
+  source: Source {},
+  proof: URL "https://example.com/",
+  interactionPolicy: InteractionPolicy {},
+  approvedBy: URL "https://example.com/",
+  likeAuthorization: URL "https://example.com/",
+  replyAuthorization: URL "https://example.com/",
+  announceAuthorization: URL "https://example.com/",
+  purpose: "hello",
+  publishes: Intent {},
+  reciprocal: Intent {},
+  unitBased: true
+}'
+`;
+
+snapshot[`Deno.inspect(Proposal) [auto] 3`] = `
+'Proposal {
+  id: URL "https://example.com/",
+  attachments: [ Object {}, Object {} ],
+  attributions: [ Application {}, Application {} ],
+  audiences: [ Object {}, Object {} ],
+  contents: [ "hello", "hello" ],
+  contexts: [ Object {}, Object {} ],
+  names: [ "hello", "hello" ],
+  endTime: 2024-03-03T08:30:06.796196096Z,
+  generators: [ Object {}, Object {} ],
+  icons: [ Image {}, Image {} ],
+  images: [ Image {}, Image {} ],
+  replyTargets: [ Object {}, Object {} ],
+  locations: [ Object {}, Object {} ],
+  previews: [ Link {}, Link {} ],
+  published: 2024-03-03T08:30:06.796196096Z,
+  replies: Collection {},
+  shares: Collection {},
+  likes: Collection {},
+  emojiReactions: Collection {},
+  startTime: 2024-03-03T08:30:06.796196096Z,
+  summaries: [ "hello", "hello" ],
+  tags: [ Object {}, Object {} ],
+  updated: 2024-03-03T08:30:06.796196096Z,
+  urls: [ URL "https://example.com/", URL "https://example.com/" ],
+  tos: [ Object {}, Object {} ],
+  btos: [ Object {}, Object {} ],
+  ccs: [ Object {}, Object {} ],
+  bccs: [ Object {}, Object {} ],
+  mediaType: "hello",
+  duration: PT1H,
+  sensitive: true,
+  source: Source {},
+  proofs: [ DataIntegrityProof {}, DataIntegrityProof {} ],
+  interactionPolicy: InteractionPolicy {},
+  approvedBy: URL "https://example.com/",
+  likeAuthorization: LikeAuthorization {},
+  replyAuthorization: ReplyAuthorization {},
+  announceAuthorization: AnnounceAuthorization {},
+  purpose: "hello",
+  publishes: Intent {},
+  reciprocal: Intent {},
+  unitBased: true
+}'
+`;
+
 snapshot[`Deno.inspect(Accept) [auto] 1`] = `
 'Accept {
   id: URL "https://example.com/",

package/src/intent.yaml

@@ -0,0 +1,72 @@
+$schema: ../../vocab-tools/schema.yaml
+name: Intent
+compactName: Intent
+uri: "https://w3id.org/valueflows/ont/vf#Intent"
+entity: false
+description: |
+  A proposed economic transaction describing what is being offered or requested
+  in a {@link Proposal}.
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- vf: "https://w3id.org/valueflows/ont/vf#"
+  om2: "http://www.ontology-of-units-of-measure.org/resource/om-2/"
+  Intent: "vf:Intent"
+  action: "vf:action"
+  resourceConformsTo:
+    "@id": "vf:resourceConformsTo"
+    "@type": "@id"
+  resourceQuantity: "vf:resourceQuantity"
+  availableQuantity: "vf:availableQuantity"
+  minimumQuantity: "vf:minimumQuantity"
+  hasUnit: "om2:hasUnit"
+  hasNumericalValue: "om2:hasNumericalValue"
+
+properties:
+- singularName: action
+  functional: true
+  compactName: action
+  uri: "https://w3id.org/valueflows/ont/vf#action"
+  description: |
+    The type of economic transaction.  The value of this property should be
+    either `"deliverService"` or `"transfer"`.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
+- singularName: resourceConformsTo
+  functional: true
+  compactName: resourceConformsTo
+  uri: "https://w3id.org/valueflows/ont/vf#resourceConformsTo"
+  description: |
+    The type of an economic resource.  Could be any URI.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#anyURI"
+
+- singularName: resourceQuantity
+  functional: true
+  compactName: resourceQuantity
+  uri: "https://w3id.org/valueflows/ont/vf#resourceQuantity"
+  untyped: true
+  description: |
+    The amount and unit of the economic resource.
+  range:
+  - "http://www.ontology-of-units-of-measure.org/resource/om-2/Measure"
+
+- singularName: availableQuantity
+  functional: true
+  compactName: availableQuantity
+  uri: "https://w3id.org/valueflows/ont/vf#availableQuantity"
+  untyped: true
+  description: |
+    The quantity of the offered resource currently available.
+  range:
+  - "http://www.ontology-of-units-of-measure.org/resource/om-2/Measure"
+
+- singularName: minimumQuantity
+  functional: true
+  compactName: minimumQuantity
+  uri: "https://w3id.org/valueflows/ont/vf#minimumQuantity"
+  untyped: true
+  description: |
+    The minimum possible quantity of the resource.
+  range:
+  - "http://www.ontology-of-units-of-measure.org/resource/om-2/Measure"

package/src/measure.yaml

@@ -0,0 +1,32 @@
+$schema: ../../vocab-tools/schema.yaml
+name: Measure
+compactName: om2:Measure
+uri: "http://www.ontology-of-units-of-measure.org/resource/om-2/Measure"
+entity: false
+description: A quantity with a unit of measure.
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- om2: "http://www.ontology-of-units-of-measure.org/resource/om-2/"
+  hasUnit: "om2:hasUnit"
+  hasNumericalValue: "om2:hasNumericalValue"
+
+properties:
+- singularName: unit
+  functional: true
+  compactName: hasUnit
+  uri: "http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit"
+  description: |
+    The name of the unit, according to the Ontology of units of Measure
+    classification.  The recommended unit for countable items is `"one"`.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
+- 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.  If not specified, arbitrary amounts can be
+    used when responding to the proposal.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#decimal"

package/src/proposal.yaml

@@ -0,0 +1,90 @@
+$schema: ../../vocab-tools/schema.yaml
+name: Proposal
+compactName: Proposal
+uri: "https://w3id.org/valueflows/ont/vf#Proposal"
+extends: "https://www.w3.org/ns/activitystreams#Object"
+entity: true
+description: |
+  A published request or offer, sometimes with what is expected in return.
+
+  Proposals contain a primary {@link Intent} (via `publishes`) describing
+  what is being offered or requested, and optionally a reciprocal
+  {@link Intent} describing what is expected or offered in return.
+
+  Note: This type extends ActivityStreams `Object` for practical
+  interoperability within ActivityPub federation, even though FEP-0837
+  defines `Proposal` as a pure ValueFlows type.  Extending `Object`
+  provides useful inherited properties such as `name`, `content`,
+  `attributedTo`, `published`, `to`, and `location` without needing to
+  redefine them.
+# NOTE: The context includes mappings for Intent and Measure properties
+# (action, resourceConformsTo, hasUnit, etc.) because the code generator
+# does not automatically merge contexts from referenced types.  Proposal
+# must declare all mappings needed for correct JSON-LD serialization of
+# its embedded Intent and Measure objects.
+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"
+  unitBased: "vf:unitBased"
+  publishes: "vf:publishes"
+  reciprocal: "vf:reciprocal"
+  action: "vf:action"
+  resourceConformsTo:
+    "@id": "vf:resourceConformsTo"
+    "@type": "@id"
+  resourceQuantity: "vf:resourceQuantity"
+  availableQuantity: "vf:availableQuantity"
+  minimumQuantity: "vf:minimumQuantity"
+  hasUnit: "om2:hasUnit"
+  hasNumericalValue: "om2:hasNumericalValue"
+
+properties:
+- singularName: purpose
+  functional: true
+  compactName: purpose
+  uri: "https://w3id.org/valueflows/ont/vf#purpose"
+  description: |
+    The type of proposal.  Possible values are `"offer"` and `"request"`.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
+- singularName: publishes
+  functional: true
+  compactName: publishes
+  uri: "https://w3id.org/valueflows/ont/vf#publishes"
+  description: |
+    The primary intent of this proposal, describing what is being offered
+    or requested.
+  range:
+  - "https://w3id.org/valueflows/ont/vf#Intent"
+
+- singularName: reciprocal
+  functional: true
+  compactName: reciprocal
+  uri: "https://w3id.org/valueflows/ont/vf#reciprocal"
+  description: |
+    The reciprocal intent of this proposal, describing what is expected
+    or offered in return.
+  range:
+  - "https://w3id.org/valueflows/ont/vf#Intent"
+
+- singularName: unitBased
+  functional: true
+  compactName: unitBased
+  uri: "https://w3id.org/valueflows/ont/vf#unitBased"
+  description: |
+    Indicates whether the quantities expressed in the proposal can be
+    multiplied or not.  The default is `false`.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#boolean"

package/src/vocab.test.ts

@@ -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(