From 857bcc8491c27f2ea44d30f44816df5a1781d960 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 15:22:06 +1000 Subject: [PATCH 001/114] feat(pos-switch): if-property filters by some-value-eq --- .../components/pos-switch/pos-switch.spec.tsx | 33 ++++++++++++++++++- .../src/components/pos-switch/pos-switch.tsx | 16 ++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 685e1d62..9d54e246 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -1,6 +1,5 @@ import { newSpecPage } from '@stencil/core/testing'; import { PosSwitch } from './pos-switch'; -import { when } from 'jest-when'; import { RdfType, Relation, Thing } from '@pod-os/core'; import { Subject } from 'rxjs'; @@ -306,6 +305,38 @@ describe('pos-switch', () => { `); }); + it('renders templates if forward link value condition is met', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedRelations$.next([ + { predicate: 'https://schema.org/video', label: 'video', uris: ['https://video.test/video-1'] }, + ]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
Resource has video
+ `); + }); + it('resets and updates when resource is changed', async () => { const page = await newSpecPage({ components: [PosSwitch], diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index 79f7597c..82698e89 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -38,11 +38,22 @@ export class PosSwitch implements ResourceAware { test(caseElement): boolean { let state = null; + let values = null; + + const compareValue = function (values: string[]): boolean { + if (!caseElement.hasAttribute('some-value-eq')) return true; + return values.some(val => val === caseElement.getAttribute('some-value-eq')); + }; + if (caseElement.getAttribute('if-typeof') !== null) { state = this.types.map(x => x.uri).includes(caseElement.getAttribute('if-typeof')); } if (caseElement.getAttribute('if-property') !== null) { - state = this.relations.map(x => x.predicate).includes(caseElement.getAttribute('if-property')); + const matchingRelations = this.relations.filter(x => x.predicate == caseElement.getAttribute('if-property')); + if (matchingRelations.length > 0) { + values = matchingRelations[0].uris; + } + state = matchingRelations.length > 0; } if (caseElement.getAttribute('if-rev') !== null) { state = this.reverseRelations.map(x => x.predicate).includes(caseElement.getAttribute('if-rev')); @@ -50,6 +61,9 @@ export class PosSwitch implements ResourceAware { if (caseElement.getAttribute('not') != null) { state = !state; } + if (values) { + state = state && compareValue(values); + } return state; } From 79dcf1c19256f4574462d1c2d58d24b7aaea1701 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 15:25:40 +1000 Subject: [PATCH 002/114] feat(pos-switch): if-rev filters by some-value-eq --- .../components/pos-switch/pos-switch.spec.tsx | 32 +++++++++++++++++++ .../src/components/pos-switch/pos-switch.tsx | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 9d54e246..6e27f65d 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -337,6 +337,38 @@ describe('pos-switch', () => { `); }); + it('renders templates if backward link value condition is met', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + `, + }); + const observedReverseRelations$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeReverseRelations: () => observedReverseRelations$, + }; + page.rootInstance.receiveResource(thing); + observedReverseRelations$.next([ + { predicate: 'https://schema.org/video', label: 'video', uris: ['https://video.test/video-1'] }, + ]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
Resource is video
+ `); + }); + it('resets and updates when resource is changed', async () => { const page = await newSpecPage({ components: [PosSwitch], diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index 82698e89..d7b1bc11 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -56,7 +56,11 @@ export class PosSwitch implements ResourceAware { state = matchingRelations.length > 0; } if (caseElement.getAttribute('if-rev') !== null) { - state = this.reverseRelations.map(x => x.predicate).includes(caseElement.getAttribute('if-rev')); + const matchingRelations = this.reverseRelations.filter(x => x.predicate == caseElement.getAttribute('if-rev')); + if (matchingRelations.length > 0) { + values = matchingRelations[0].uris; + } + state = matchingRelations.length > 0; } if (caseElement.getAttribute('not') != null) { state = !state; From 2fddd40563508842c7e01fb1c0d88531c1abc2f4 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 15:48:19 +1000 Subject: [PATCH 003/114] feat(pos-switch): compareValue supports every-value-eq --- .../components/pos-switch/pos-switch.spec.tsx | 41 +++++++++++++++++++ .../src/components/pos-switch/pos-switch.tsx | 9 +++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 6e27f65d..4b349a1d 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -369,6 +369,47 @@ describe('pos-switch', () => { `); }); + it('does not render templates when compareValue indicates that (some|every)-value-eq is not met', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedRelations$.next([ + { + predicate: 'https://schema.org/video', + label: 'video', + uris: ['https://video.test/video-1', 'https://video.test/video-2'], + }, + ]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
No conditions match
+ `); + }); + it('resets and updates when resource is changed', async () => { const page = await newSpecPage({ components: [PosSwitch], diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index d7b1bc11..c7a855ea 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -41,8 +41,13 @@ export class PosSwitch implements ResourceAware { let values = null; const compareValue = function (values: string[]): boolean { - if (!caseElement.hasAttribute('some-value-eq')) return true; - return values.some(val => val === caseElement.getAttribute('some-value-eq')); + if (caseElement.hasAttribute('some-value-eq')) { + return values.some(val => val === caseElement.getAttribute('some-value-eq')); + } + if (caseElement.hasAttribute('every-value-eq')) { + return values.every(val => val === caseElement.getAttribute('every-value-eq')); + } + return true; }; if (caseElement.getAttribute('if-typeof') !== null) { From 4e3f80ccb164201e5bb6df771f0a8a85704f3e99 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 16:22:11 +1000 Subject: [PATCH 004/114] feat(Thing): add basic observeLiterals --- core/src/thing/Thing.literals.spec.ts | 132 +++++++++++++++++++++++--- core/src/thing/Thing.ts | 7 ++ 2 files changed, 128 insertions(+), 11 deletions(-) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index d1fe3b3e..72c9908e 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -1,20 +1,21 @@ -import { beforeEach, describe, expect, it } from "vitest"; -import { blankNode, graph, IndexedFormula, sym } from "rdflib"; +import { afterEach, beforeEach, describe, expect, it, Mock, vi } from "vitest"; +import { blankNode, graph, IndexedFormula, literal, quad, sym } from "rdflib"; import { PodOsSession } from "../authentication"; -import { Thing } from "./Thing"; +import { Literal, Thing } from "./Thing"; import { Store } from "../Store"; +import { Observable, Subscription } from "rxjs"; describe("Thing", function () { - describe("literals", () => { - let internalStore: IndexedFormula; - const mockSession = {} as unknown as PodOsSession; - let store: Store; + let internalStore: IndexedFormula; + const mockSession = {} as unknown as PodOsSession; + let store: Store; - beforeEach(() => { - internalStore = graph(); - store = new Store(mockSession, undefined, undefined, internalStore); - }); + beforeEach(() => { + internalStore = graph(); + store = new Store(mockSession, undefined, undefined, internalStore); + }); + describe("literals", () => { it("are empty, if store is empty", () => { const it = new Thing( "https://jane.doe.example/container/file.ttl#fragment", @@ -162,4 +163,113 @@ describe("Thing", function () { ]); }); }); + + describe("observeLiterals", () => { + beforeEach(() => { + vi.useFakeTimers(); + }); + + afterEach(() => { + vi.useRealTimers(); + }); + + let uri: string, + subscriber: Mock, + thing: Thing, + literalsSpy: Mock, + observable: Observable, + subscription: Subscription; + + beforeEach(() => { + // Given a store with statements about a URI + uri = "https://jane.doe.example/container/file.ttl#fragment"; + internalStore.add( + sym(uri), + sym("http://vocab.test/first"), + "value 1-1", + sym(uri), + ); + internalStore.add( + sym(uri), + sym("http://vocab.test/second"), + "value 2-1", + sym(uri), + ); + internalStore.add( + sym(uri), + sym("http://vocab.test/second"), + "value 2-2", + sym(uri), + ); + internalStore.add( + sym(uri), + sym("http://vocab.test/third"), + "value 3-1", + sym(uri), + ); + + // and a Thing with a literals method + subscriber = vi.fn(); + thing = new Thing(uri, store); + literalsSpy = vi.spyOn(thing, "literals"); + + // and a subscription to changes in relations + observable = thing.observeLiterals(); + subscription = observable.subscribe(subscriber); + }); + + it("pushes existing literals immediately", () => { + expect(subscriber).toHaveBeenCalledTimes(1); + expect(literalsSpy).toHaveBeenCalledTimes(1); + expect(subscriber.mock.calls).toEqual([ + [ + [ + { + predicate: "http://vocab.test/first", + label: "first", + values: ["value 1-1"], + }, + { + predicate: "http://vocab.test/second", + label: "second", + values: ["value 2-1", "value 2-2"], + }, + { + predicate: "http://vocab.test/third", + label: "third", + values: ["value 3-1"], + }, + ], + ], + ]); + }); + + it("updates after removals", () => { + internalStore.removeStatement( + quad( + sym(uri), + sym("http://vocab.test/first"), + literal("value 1-1"), + sym(uri), + ), + ); + vi.advanceTimersByTime(250); + expect(subscriber).toHaveBeenCalledTimes(2); + expect(literalsSpy).toHaveBeenCalledTimes(2); + expect(subscriber.mock.lastCall).toEqual([ + [ + { + predicate: "http://vocab.test/second", + label: "second", + values: ["value 2-1", "value 2-2"], + }, + { + predicate: "http://vocab.test/third", + label: "third", + values: ["value 3-1"], + }, + ], + ]); + }); + }); }); diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index 56f7bdc5..46ce723f 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -127,6 +127,13 @@ export class Thing { })); } + observeLiterals(): Observable { + return this.store.removals$.pipe( + map(() => this.literals()), + startWith(this.literals()), + ); + } + /** * Returns all the unique links from this thing to other resources. This only includes named nodes and excludes rdf:type relations. */ From b3408e87fa961d942718eec46957d7356ef62fd4 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 17:29:12 +1000 Subject: [PATCH 005/114] feat(Thing): observeLiterals updates after additions --- core/src/thing/Thing.literals.spec.ts | 26 ++++++++++++++++++++++++++ core/src/thing/Thing.ts | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index 72c9908e..ba48daea 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -271,5 +271,31 @@ describe("Thing", function () { ], ]); }); + + it("updates after additions", () => { + internalStore.add(sym(uri), sym("http://vocab.test/first"), "value 1-2"); + jest.advanceTimersByTime(250); + expect(subscriber).toHaveBeenCalledTimes(2); + expect(literalsSpy).toHaveBeenCalledTimes(2); + expect(subscriber.mock.lastCall).toEqual([ + [ + { + predicate: "http://vocab.test/first", + label: "first", + values: ["value 1-1", "value 1-2"], + }, + { + predicate: "http://vocab.test/second", + label: "second", + values: ["value 2-1", "value 2-2"], + }, + { + predicate: "http://vocab.test/third", + label: "third", + values: ["value 3-1"], + }, + ], + ]); + }); }); }); diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index 46ce723f..03c278ab 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -128,7 +128,7 @@ export class Thing { } observeLiterals(): Observable { - return this.store.removals$.pipe( + return merge(this.store.additions$, this.store.removals$).pipe( map(() => this.literals()), startWith(this.literals()), ); From 6317ee68c7cd17d9ffa2d8ae4e45ae9c60425e63 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 17:31:30 +1000 Subject: [PATCH 006/114] feat(Thing): observeLiterals pushes updates in groups --- core/src/thing/Thing.literals.spec.ts | 35 +++++++++++++++++++++++++++ core/src/thing/Thing.ts | 1 + 2 files changed, 36 insertions(+) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index ba48daea..9c1eeaa8 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -297,5 +297,40 @@ describe("Thing", function () { ], ]); }); + + it("pushes update in groups", () => { + internalStore.removeStatement( + quad( + sym(uri), + sym("http://vocab.test/first"), + literal("value 1-1"), + sym(uri), + ), + ); + internalStore.add(sym(uri), sym("http://vocab.test/first"), "value 1-2"); + internalStore.add(sym(uri), sym("http://vocab.test/third"), "value 3-2"); + jest.advanceTimersByTime(250); + expect(subscriber).toHaveBeenCalledTimes(2); + expect(literalsSpy).toHaveBeenCalledTimes(2); + expect(subscriber.mock.lastCall).toEqual([ + [ + { + predicate: "http://vocab.test/second", + label: "second", + values: ["value 2-1", "value 2-2"], + }, + { + predicate: "http://vocab.test/third", + label: "third", + values: ["value 3-1", "value 3-2"], + }, + { + predicate: "http://vocab.test/first", + label: "first", + values: ["value 1-2"], + }, + ], + ]); + }); }); }); diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index 03c278ab..17a2d160 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -129,6 +129,7 @@ export class Thing { observeLiterals(): Observable { return merge(this.store.additions$, this.store.removals$).pipe( + debounceTime(250), map(() => this.literals()), startWith(this.literals()), ); From 9c2e43deea98e13eeee4b81c05717e294de80998 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 17:34:16 +1000 Subject: [PATCH 007/114] feat(Thing): observeLiterals ignores statements about other resources --- core/src/thing/Thing.literals.spec.ts | 11 +++++++++++ core/src/thing/Thing.ts | 1 + 2 files changed, 12 insertions(+) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index 9c1eeaa8..37c35263 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -332,5 +332,16 @@ describe("Thing", function () { ], ]); }); + + it("ignores irrelevant statements about other resources", () => { + internalStore.add( + sym("https://other.uri/"), + sym("http://vocab.test/first"), + "value", + ); + jest.advanceTimersByTime(250); + expect(subscriber).toHaveBeenCalledTimes(1); + expect(literalsSpy).toHaveBeenCalledTimes(1); + }); }); }); diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index 17a2d160..42ddeab7 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -129,6 +129,7 @@ export class Thing { observeLiterals(): Observable { return merge(this.store.additions$, this.store.removals$).pipe( + filter((quad) => quad.subject.value === this.uri), debounceTime(250), map(() => this.literals()), startWith(this.literals()), From d6739515e21047b38811587e771e46c429cf20ac Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 17:39:57 +1000 Subject: [PATCH 008/114] feat(Thing): observeLiterals does not push if literals have not changed --- core/src/thing/Thing.literals.spec.ts | 11 +++++++++++ core/src/thing/Thing.ts | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index 37c35263..aa0455cc 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -343,5 +343,16 @@ describe("Thing", function () { expect(subscriber).toHaveBeenCalledTimes(1); expect(literalsSpy).toHaveBeenCalledTimes(1); }); + + it("does not push if literals have not changed", () => { + internalStore.add( + sym(uri), + sym("http://vocab.test/first"), + sym("http://not.a.literal/"), + ); + jest.advanceTimersByTime(250); + expect(literalsSpy).toHaveBeenCalledTimes(2); + expect(subscriber).toHaveBeenCalledTimes(1); + }); }); }); diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index 42ddeab7..cfa05294 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -133,6 +133,16 @@ export class Thing { debounceTime(250), map(() => this.literals()), startWith(this.literals()), + distinctUntilChanged( + (prev, curr) => + prev.length === curr.length && + prev.every( + (rel, i) => + rel.predicate === curr[i].predicate && + rel.values.length === curr[i].values.length && + rel.values.every((val, j) => val === curr[i].values[j]), + ), + ), ); } From c6fb23803e8e03e906a10ed1858d7ec08b30a527 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 18:02:21 +1000 Subject: [PATCH 009/114] feat(pos-switch): if-property takes literals into account --- .../pos-switch.integration.spec.tsx | 5 +- .../components/pos-switch/pos-switch.spec.tsx | 77 ++++++++++++++++++- .../src/components/pos-switch/pos-switch.tsx | 17 +++- 3 files changed, 92 insertions(+), 7 deletions(-) diff --git a/elements/src/components/pos-switch/pos-switch.integration.spec.tsx b/elements/src/components/pos-switch/pos-switch.integration.spec.tsx index 41c4ecc7..a5faa678 100644 --- a/elements/src/components/pos-switch/pos-switch.integration.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.integration.spec.tsx @@ -7,12 +7,13 @@ import { PosPicture } from '../pos-picture/pos-picture'; import { PosSwitch } from './pos-switch'; import { PosResource } from '../pos-resource/pos-resource'; import { when } from 'jest-when'; -import { RdfType, Relation, Thing } from '@pod-os/core'; +import { Literal, RdfType, Relation, Thing } from '@pod-os/core'; import { ReplaySubject, Subject } from 'rxjs'; describe('pos-switch', () => { it('renders template based on properties of resource, reactively', async () => { const os = mockPodOS(); + const observedLiterals$ = new Subject(); const observedLabel$ = new ReplaySubject(); observedLabel$.next('Recipe 1'); const observedTypes$ = new Subject(); @@ -25,6 +26,7 @@ describe('pos-switch', () => { // Label is used by pos-picture, and observeLabel by pos-label label: () => 'Recipe 1', observeLabel: () => observedLabel$, + observeLiterals: () => observedLiterals$, observeTypes: () => observedTypes$, observeRelations: () => observedRelations$, observeReverseRelations: () => observedReverseRelations$, @@ -68,6 +70,7 @@ describe('pos-switch', () => { }); expect((os.fetch as jest.Mock).mock.calls).toHaveLength(0); expect(page.root?.innerText).toEqualText(''); + observedLiterals$.next([]); observedTypes$.next([ { label: 'Recipe', diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 4b349a1d..4ef9ad56 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -1,6 +1,6 @@ import { newSpecPage } from '@stencil/core/testing'; import { PosSwitch } from './pos-switch'; -import { RdfType, Relation, Thing } from '@pod-os/core'; +import { Literal, RdfType, Relation, Thing } from '@pod-os/core'; import { Subject } from 'rxjs'; describe('pos-switch', () => { @@ -185,7 +185,7 @@ describe('pos-switch', () => { `); }); - it('renders templates if a forward link is present', async () => { + it('renders templates if a forward link is present (relation)', async () => { const page = await newSpecPage({ components: [PosSwitch], html: ` @@ -203,11 +203,15 @@ describe('pos-switch', () => { `, }); const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { uri: 'https://pod.example/resource', observeRelations: () => observedRelations$, + observeLiterals: () => observedLiterals$, }; page.rootInstance.receiveResource(thing); + observedLiterals$.next([]); observedRelations$.next([ { predicate: 'https://schema.org/video', label: 'video', uris: ['https://video.test/video-1'] }, ]); @@ -217,6 +221,34 @@ describe('pos-switch', () => { `); }); + it('renders templates if a forward link is present (literal)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeRelations: () => observedRelations$, + observeLiterals: () => observedLiterals$, + }; + page.rootInstance.receiveResource(thing); + observedRelations$.next([]); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['name'] }]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
Resource has a name
+ `); + }); + it('renders templates if a backward link is present', async () => { const page = await newSpecPage({ components: [PosSwitch], @@ -274,13 +306,16 @@ describe('pos-switch', () => { const observedTypes$ = new Subject(); const observedRelations$ = new Subject(); const observedReverseRelations$ = new Subject(); + const observedLiterals$ = new Subject(); const thing = { uri: 'https://pod.example/recipe1', + observeLiterals: () => observedLiterals$, observeTypes: () => observedTypes$, observeRelations: () => observedRelations$, observeReverseRelations: () => observedReverseRelations$, }; page.rootInstance.receiveResource(thing); + observedLiterals$.next([]); observedTypes$.next([ { label: 'Recipe', @@ -305,7 +340,7 @@ describe('pos-switch', () => { `); }); - it('renders templates if forward link value condition is met', async () => { + it('renders templates if forward link value condition is met (relation)', async () => { const page = await newSpecPage({ components: [PosSwitch], html: ` @@ -323,11 +358,14 @@ describe('pos-switch', () => { `, }); const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); const thing = { uri: 'https://pod.example/resource', observeRelations: () => observedRelations$, + observeLiterals: () => observedLiterals$, }; page.rootInstance.receiveResource(thing); + observedLiterals$.next([]); observedRelations$.next([ { predicate: 'https://schema.org/video', label: 'video', uris: ['https://video.test/video-1'] }, ]); @@ -337,6 +375,36 @@ describe('pos-switch', () => { `); }); + it('renders templates if forward link value condition is met (literal)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeRelations: () => observedRelations$, + observeLiterals: () => observedLiterals$, + }; + page.rootInstance.receiveResource(thing); + observedRelations$.next([ + { predicate: 'https://schema.org/video', label: 'video', uris: ['https://video.test/video-1'] }, + ]); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['Video 1'] }]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
Resource has name
+ `); + }); + it('renders templates if backward link value condition is met', async () => { const page = await newSpecPage({ components: [PosSwitch], @@ -392,11 +460,14 @@ describe('pos-switch', () => { `, }); const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); const thing = { uri: 'https://pod.example/resource', + observeLiterals: () => observedLiterals$, observeRelations: () => observedRelations$, }; page.rootInstance.receiveResource(thing); + observedLiterals$.next([]); observedRelations$.next([ { predicate: 'https://schema.org/video', diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index c7a855ea..ad9563cc 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -1,4 +1,4 @@ -import { RdfType, Relation, Thing } from '@pod-os/core'; +import { Literal, RdfType, Relation, Thing } from '@pod-os/core'; import { Component, Element, Event, h, Host, State } from '@stencil/core'; import { ResourceAware, ResourceEventEmitter, subscribeResource } from '../events/ResourceAware'; import { combineLatest, firstValueFrom, Observable, Subject, takeUntil } from 'rxjs'; @@ -20,6 +20,7 @@ export class PosSwitch implements ResourceAware { @State() types: RdfType[]; @State() relations: Relation[]; @State() reverseRelations: Relation[]; + @State() literals: Literal[]; private readonly disconnected$ = new Subject(); @@ -55,10 +56,15 @@ export class PosSwitch implements ResourceAware { } if (caseElement.getAttribute('if-property') !== null) { const matchingRelations = this.relations.filter(x => x.predicate == caseElement.getAttribute('if-property')); + const matchingLiterals = this.literals.filter(x => x.predicate == caseElement.getAttribute('if-property')); + values = []; if (matchingRelations.length > 0) { - values = matchingRelations[0].uris; + values.push(...matchingRelations[0].uris); } - state = matchingRelations.length > 0; + if (matchingLiterals.length > 0) { + values.push(...matchingLiterals[0].values); + } + state = matchingRelations.length > 0 || matchingLiterals.length > 0; } if (caseElement.getAttribute('if-rev') !== null) { const matchingRelations = this.reverseRelations.filter(x => x.predicate == caseElement.getAttribute('if-rev')); @@ -94,6 +100,11 @@ export class PosSwitch implements ResourceAware { this.relations = relations; }); observables.push(observeRelations); + const observeLiterals = resource.observeLiterals().pipe(takeUntil(this.disconnected$)); + observeLiterals.subscribe(literals => { + this.literals = literals; + }); + observables.push(observeLiterals); } if (this.caseElements.some(caseElement => caseElement.hasAttribute('if-rev'))) { const observeReverseRelations = resource.observeReverseRelations().pipe(takeUntil(this.disconnected$)); From 59e3274a2cf2d5f756757c6b14f0df0f55b85c38 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 18:09:21 +1000 Subject: [PATCH 010/114] chore(Thing): lint and typecheck --- core/src/thing/Thing.literals.spec.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/thing/Thing.literals.spec.ts b/core/src/thing/Thing.literals.spec.ts index aa0455cc..aa534e1c 100644 --- a/core/src/thing/Thing.literals.spec.ts +++ b/core/src/thing/Thing.literals.spec.ts @@ -3,7 +3,7 @@ import { blankNode, graph, IndexedFormula, literal, quad, sym } from "rdflib"; import { PodOsSession } from "../authentication"; import { Literal, Thing } from "./Thing"; import { Store } from "../Store"; -import { Observable, Subscription } from "rxjs"; +import { Observable } from "rxjs"; describe("Thing", function () { let internalStore: IndexedFormula; @@ -177,8 +177,7 @@ describe("Thing", function () { subscriber: Mock, thing: Thing, literalsSpy: Mock, - observable: Observable, - subscription: Subscription; + observable: Observable; beforeEach(() => { // Given a store with statements about a URI @@ -215,7 +214,7 @@ describe("Thing", function () { // and a subscription to changes in relations observable = thing.observeLiterals(); - subscription = observable.subscribe(subscriber); + observable.subscribe(subscriber); }); it("pushes existing literals immediately", () => { @@ -274,7 +273,7 @@ describe("Thing", function () { it("updates after additions", () => { internalStore.add(sym(uri), sym("http://vocab.test/first"), "value 1-2"); - jest.advanceTimersByTime(250); + vi.advanceTimersByTime(250); expect(subscriber).toHaveBeenCalledTimes(2); expect(literalsSpy).toHaveBeenCalledTimes(2); expect(subscriber.mock.lastCall).toEqual([ @@ -309,7 +308,7 @@ describe("Thing", function () { ); internalStore.add(sym(uri), sym("http://vocab.test/first"), "value 1-2"); internalStore.add(sym(uri), sym("http://vocab.test/third"), "value 3-2"); - jest.advanceTimersByTime(250); + vi.advanceTimersByTime(250); expect(subscriber).toHaveBeenCalledTimes(2); expect(literalsSpy).toHaveBeenCalledTimes(2); expect(subscriber.mock.lastCall).toEqual([ @@ -339,7 +338,7 @@ describe("Thing", function () { sym("http://vocab.test/first"), "value", ); - jest.advanceTimersByTime(250); + vi.advanceTimersByTime(250); expect(subscriber).toHaveBeenCalledTimes(1); expect(literalsSpy).toHaveBeenCalledTimes(1); }); @@ -350,7 +349,7 @@ describe("Thing", function () { sym("http://vocab.test/first"), sym("http://not.a.literal/"), ); - jest.advanceTimersByTime(250); + vi.advanceTimersByTime(250); expect(literalsSpy).toHaveBeenCalledTimes(2); expect(subscriber).toHaveBeenCalledTimes(1); }); From 96148558f6b4d3ac565bebb44ccaa5e486787fb6 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 21:46:07 +1000 Subject: [PATCH 011/114] feat(pos-switch): compareValue supports (some|every)-value-(eq|gt|gte|lt|lte) --- .../components/pos-switch/pos-switch.spec.tsx | 96 +++++++++++++++++++ .../src/components/pos-switch/pos-switch.tsx | 35 +++++-- 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 4ef9ad56..701dc03f 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -481,6 +481,102 @@ describe('pos-switch', () => { `); }); + it('does not render templates when compareValue indicates that some-value-(lt|lte|gt|gte) is not met (string)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + + + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeLiterals: () => observedLiterals$, + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['bravo'] }]); + observedRelations$.next([]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
No conditions match
+ `); + }); + + it('does not render templates when compareValue indicates that every-value-(lt|lte|gt|gte) is not met (string)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + + + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeLiterals: () => observedLiterals$, + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['bravo', 'charlie'] }]); + observedRelations$.next([]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
No conditions match
+ `); + }); + it('resets and updates when resource is changed', async () => { const page = await newSpecPage({ components: [PosSwitch], diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index ad9563cc..4b3889d4 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -42,13 +42,36 @@ export class PosSwitch implements ResourceAware { let values = null; const compareValue = function (values: string[]): boolean { - if (caseElement.hasAttribute('some-value-eq')) { - return values.some(val => val === caseElement.getAttribute('some-value-eq')); + let state = true; + for (let semantics of ['some', 'every']) { + for (let operator of ['eq', 'gt', 'gte', 'lt', 'lte']) { + const attr = `${semantics}-value-${operator}`; + if (caseElement.hasAttribute(attr)) { + const target = caseElement.getAttribute(attr); + const matches = values.map(val => { + const cmp = String(val).localeCompare(String(target)); + switch (operator) { + case 'eq': + return cmp === 0; + case 'gt': + return cmp > 0; + case 'gte': + return cmp >= 0; + case 'lt': + return cmp < 0; + case 'lte': + return cmp <= 0; + } + }); + if (semantics == 'some') { + state = state && matches.some(val => val); + } else if (semantics == 'every') { + state = state && matches.every(val => val); + } + } + } } - if (caseElement.hasAttribute('every-value-eq')) { - return values.every(val => val === caseElement.getAttribute('every-value-eq')); - } - return true; + return state; }; if (caseElement.getAttribute('if-typeof') !== null) { From 44c88834a0c86336a9770af5e9835e9f0a4ba4d5 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Sat, 18 Apr 2026 22:21:46 +1000 Subject: [PATCH 012/114] feat(pos-switch): compareValue supports numbers --- .../components/pos-switch/pos-switch.spec.tsx | 98 ++++++++++++++++++- .../src/components/pos-switch/pos-switch.tsx | 9 +- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/elements/src/components/pos-switch/pos-switch.spec.tsx b/elements/src/components/pos-switch/pos-switch.spec.tsx index 701dc03f..5960c81f 100644 --- a/elements/src/components/pos-switch/pos-switch.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.spec.tsx @@ -551,7 +551,7 @@ describe('pos-switch', () => { @@ -577,6 +577,102 @@ describe('pos-switch', () => { `); }); + it('does not render templates when compareValue indicates that some-value-(lt|lte|gt|gte) is not met (numeric)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + + + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeLiterals: () => observedLiterals$, + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['20'] }]); + observedRelations$.next([]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
No conditions match
+ `); + }); + + it('does not render templates when compareValue indicates that every-value-(lt|lte|gt|gte) is not met (numeric)', async () => { + const page = await newSpecPage({ + components: [PosSwitch], + html: ` + + + + + + + + + + + + + + + + + `, + }); + const observedRelations$ = new Subject(); + const observedLiterals$ = new Subject(); + const thing = { + uri: 'https://pod.example/resource', + observeLiterals: () => observedLiterals$, + observeRelations: () => observedRelations$, + }; + page.rootInstance.receiveResource(thing); + observedLiterals$.next([{ predicate: 'https://schema.org/name', label: 'name', values: ['20', '30'] }]); + observedRelations$.next([]); + await page.waitForChanges(); + expect(page.root?.innerHTML).toEqualHtml(` +
No conditions match
+ `); + }); + it('resets and updates when resource is changed', async () => { const page = await newSpecPage({ components: [PosSwitch], diff --git a/elements/src/components/pos-switch/pos-switch.tsx b/elements/src/components/pos-switch/pos-switch.tsx index 4b3889d4..ae794951 100644 --- a/elements/src/components/pos-switch/pos-switch.tsx +++ b/elements/src/components/pos-switch/pos-switch.tsx @@ -49,7 +49,14 @@ export class PosSwitch implements ResourceAware { if (caseElement.hasAttribute(attr)) { const target = caseElement.getAttribute(attr); const matches = values.map(val => { - const cmp = String(val).localeCompare(String(target)); + let cmp; + const numVal = Number(val); + const numTarget = Number(target); + if (!isNaN(numVal) && !isNaN(numTarget)) { + cmp = numVal - numTarget; + } else { + cmp = String(val).localeCompare(String(target)); + } switch (operator) { case 'eq': return cmp === 0; From 453edf9c35b6c7d2afacf12e83bbc72c9c7e2fc9 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 09:52:58 +1000 Subject: [PATCH 013/114] test(pos-switch): add value-based example to integration test --- .../pos-switch.integration.spec.tsx | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/elements/src/components/pos-switch/pos-switch.integration.spec.tsx b/elements/src/components/pos-switch/pos-switch.integration.spec.tsx index a5faa678..8b375042 100644 --- a/elements/src/components/pos-switch/pos-switch.integration.spec.tsx +++ b/elements/src/components/pos-switch/pos-switch.integration.spec.tsx @@ -61,6 +61,9 @@ describe('pos-switch', () => { + + + @@ -127,5 +130,26 @@ describe('pos-switch', () => {
Also a Thing
`); + observedLiterals$.next([ + { + predicate: 'http://schema.org/name', + label: 'name', + values: ['Recipe 1', 'Another recipe name'], + }, + ]); + await page.waitForChanges(); + expect(switchElement?.innerHTML).toEqualHtml(` +
Part of list
+ + + Recipe 1 + + + + + +
Also a Thing
+
This is Recipe 1
+ `); }); }); From 146d08db092b689d7ea8866acc951365d4a82193 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:06:10 +1000 Subject: [PATCH 014/114] doc(pos-case): add value testing attributes --- .../components/pos-switch/pos-case/readme.md | 24 +++-- elements/src/components.d.ts | 90 +++++++++++++++++++ .../pos-switch/pos-case/pos-case.tsx | 40 +++++++++ 3 files changed, 147 insertions(+), 7 deletions(-) diff --git a/docs/elements/components/pos-switch/pos-case/readme.md b/docs/elements/components/pos-switch/pos-case/readme.md index 96b7f34e..ecd999e5 100644 --- a/docs/elements/components/pos-switch/pos-case/readme.md +++ b/docs/elements/components/pos-switch/pos-case/readme.md @@ -10,13 +10,23 @@ See [storybook](https://pod-os.github.io/PodOS/storybook/?path=/story/basics--po ## Properties -| Property | Attribute | Description | Type | Default | -| ------------ | ------------- | ----------------------------------------------------------------------------- | --------- | ----------- | -| `else` | `else` | The test only evaluates to true if tests for preceding cases have failed | `boolean` | `undefined` | -| `ifProperty` | `if-property` | Test if the resource has the specified property (forward link) | `string` | `undefined` | -| `ifRev` | `if-rev` | Test if the resource is the subject of the specified property (backward link) | `string` | `undefined` | -| `ifTypeof` | `if-typeof` | Test if the resource is of the specified type | `string` | `undefined` | -| `not` | `not` | Negates the result of the test | `boolean` | `undefined` | +| Property | Attribute | Description | Type | Default | +| --------------- | ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | ----------- | +| `else` | `else` | The test only evaluates to true if tests for preceding cases have failed | `boolean` | `undefined` | +| `everyValueEq` | `every-value-eq` | Test if every value linked by if-property or if-rev is equal to the attribute | `string` | `undefined` | +| `everyValueGt` | `every-value-gt` | Test if every value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `everyValueGte` | `every-value-gte` | Test if every value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `everyValueLt` | `every-value-lt` | Test if every value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `everyValueLte` | `every-value-lte` | Test if every value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `ifProperty` | `if-property` | Test if the resource has the specified property (forward link) | `string` | `undefined` | +| `ifRev` | `if-rev` | Test if the resource is the subject of the specified property (backward link) | `string` | `undefined` | +| `ifTypeof` | `if-typeof` | Test if the resource is of the specified type | `string` | `undefined` | +| `not` | `not` | Negates the result of the test | `boolean` | `undefined` | +| `someValueEq` | `some-value-eq` | Test if some value linked by if-property or if-rev is equal to the attribute | `string` | `undefined` | +| `someValueGt` | `some-value-gt` | Test if some value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `someValueGte` | `some-value-gte` | Test if some value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `someValueLt` | `some-value-lt` | Test if some value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | +| `someValueLte` | `some-value-lte` | Test if some value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. | `string` | `undefined` | ---------------------------------------------- diff --git a/elements/src/components.d.ts b/elements/src/components.d.ts index 53c8e770..8459d4e7 100644 --- a/elements/src/components.d.ts +++ b/elements/src/components.d.ts @@ -72,6 +72,26 @@ export namespace Components { * The test only evaluates to true if tests for preceding cases have failed */ "else"?: boolean; + /** + * Test if every value linked by if-property or if-rev is equal to the attribute + */ + "everyValueEq"?: string; + /** + * Test if every value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + "everyValueGt"?: string; + /** + * Test if every value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + "everyValueGte"?: string; + /** + * Test if every value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + "everyValueLt"?: string; + /** + * Test if every value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + "everyValueLte"?: string; /** * Test if the resource has the specified property (forward link) */ @@ -88,6 +108,26 @@ export namespace Components { * Negates the result of the test */ "not"?: boolean; + /** + * Test if some value linked by if-property or if-rev is equal to the attribute + */ + "someValueEq"?: string; + /** + * Test if some value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + "someValueGt"?: string; + /** + * Test if some value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + "someValueGte"?: string; + /** + * Test if some value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + "someValueLt"?: string; + /** + * Test if some value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + "someValueLte"?: string; } interface PosContainerContents { } @@ -1516,6 +1556,26 @@ declare namespace LocalJSX { * The test only evaluates to true if tests for preceding cases have failed */ "else"?: boolean; + /** + * Test if every value linked by if-property or if-rev is equal to the attribute + */ + "everyValueEq"?: string; + /** + * Test if every value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + "everyValueGt"?: string; + /** + * Test if every value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + "everyValueGte"?: string; + /** + * Test if every value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + "everyValueLt"?: string; + /** + * Test if every value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + "everyValueLte"?: string; /** * Test if the resource has the specified property (forward link) */ @@ -1532,6 +1592,26 @@ declare namespace LocalJSX { * Negates the result of the test */ "not"?: boolean; + /** + * Test if some value linked by if-property or if-rev is equal to the attribute + */ + "someValueEq"?: string; + /** + * Test if some value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + "someValueGt"?: string; + /** + * Test if some value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + "someValueGte"?: string; + /** + * Test if some value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + "someValueLt"?: string; + /** + * Test if some value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + "someValueLte"?: string; } interface PosContainerContents { "onPod-os:resource"?: (event: PosContainerContentsCustomEvent) => void; @@ -1897,6 +1977,16 @@ declare namespace LocalJSX { "ifRev": string; "not": boolean; "else": boolean; + "someValueEq": string; + "everyValueEq": string; + "someValueGt": string; + "everyValueGt": string; + "someValueGte": string; + "everyValueGte": string; + "someValueLt": string; + "everyValueLt": string; + "someValueLte": string; + "everyValueLte": string; } interface PosCreateNewContainerItemAttributes { "type": 'file' | 'folder'; diff --git a/elements/src/components/pos-switch/pos-case/pos-case.tsx b/elements/src/components/pos-switch/pos-case/pos-case.tsx index 83af2b0e..ac3c2de4 100644 --- a/elements/src/components/pos-switch/pos-case/pos-case.tsx +++ b/elements/src/components/pos-switch/pos-case/pos-case.tsx @@ -32,6 +32,46 @@ export class PosCase { * The test only evaluates to true if tests for preceding cases have failed */ @Prop() else?: boolean; + /** + * Test if some value linked by if-property or if-rev is equal to the attribute + */ + @Prop() someValueEq?: string; + /** + * Test if every value linked by if-property or if-rev is equal to the attribute + */ + @Prop() everyValueEq?: string; + /** + * Test if some value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + @Prop() someValueGt?: string; + /** + * Test if every value linked by if-property or if-rev is strictly greater than the attribute. First a number comparison is attempted, then string. + */ + @Prop() everyValueGt?: string; + /** + * Test if some value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + @Prop() someValueGte?: string; + /** + * Test if every value linked by if-property or if-rev is greater than or equal to the attribute. First a number comparison is attempted, then string. + */ + @Prop() everyValueGte?: string; + /** + * Test if some value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + @Prop() someValueLt?: string; + /** + * Test if every value linked by if-property or if-rev is strictly less than the attribute. First a number comparison is attempted, then string. + */ + @Prop() everyValueLt?: string; + /** + * Test if some value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + @Prop() someValueLte?: string; + /** + * Test if every value linked by if-property or if-rev is less than or equal to the attribute. First a number comparison is attempted, then string. + */ + @Prop() everyValueLte?: string; componentWillLoad() { const templateElement = this.host.querySelector('template'); From af1d7e8092ac50b04f0cc5deb89b997f839b8f33 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:07:49 +1000 Subject: [PATCH 015/114] doc(Thing): add doc string for observeLiterals --- core/src/thing/Thing.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/thing/Thing.ts b/core/src/thing/Thing.ts index cfa05294..320ff28e 100644 --- a/core/src/thing/Thing.ts +++ b/core/src/thing/Thing.ts @@ -127,6 +127,9 @@ export class Thing { })); } + /** + * Observe changes in literal values linked to this thing + */ observeLiterals(): Observable { return merge(this.store.additions$, this.store.removals$).pipe( filter((quad) => quad.subject.value === this.uri), From d72782601f9c49320a7158a355e337cd07645f76 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:10:35 +1000 Subject: [PATCH 016/114] doc(core): add observeLiterals to changelog --- core/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index b816632b..f5f732fa 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.32.0 + +### Added + +- [`Thing.observeLiterals`](https://pod-os.org/reference/core/classes/thing/#observeliterals) pushes changes to literals + ## 0.31.0 ### Breaking changes From 85bd2a7101af597b861c368c9afc64edceb17ecb Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:17:41 +1000 Subject: [PATCH 017/114] doc(elements): add pos-switch value testing to changelog --- elements/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/elements/CHANGELOG.md b/elements/CHANGELOG.md index 4631ef0a..c30f2f8f 100644 --- a/elements/CHANGELOG.md +++ b/elements/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.43.0 + +### Changed + +- [pos-switch](https://pod-os.org/reference/elements/components/pos-switch/) and [pos-case](https://pod-os.org/reference/elements/components/pos-case/): Added attributes `(some|every)-value-(eq|gt|gte|lt|lte)` to test if some/every value linked by `if-property` or `if-rev` is equal to/greater than/less than the attribute. + ## 0.42.0 ### Changed From 60b286532433aa4433e242864d18dcb38bc19e35 Mon Sep 17 00:00:00 2001 From: jg10 <181532694+jg10-mastodon-social@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:50:22 +1000 Subject: [PATCH 018/114] doc: add pos-switch value testing to storybook --- storybook/stories/11_pos-switch.stories.mdx | 21 ++++++++++++++++++- .../3_pos-switch-composition.stories.mdx | 5 +++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/storybook/stories/11_pos-switch.stories.mdx b/storybook/stories/11_pos-switch.stories.mdx index 512f35b9..36191e1d 100644 --- a/storybook/stories/11_pos-switch.stories.mdx +++ b/storybook/stories/11_pos-switch.stories.mdx @@ -13,7 +13,11 @@ import { ## pos-switch -Selects templates to render based on properties of the subject uri +Selects templates to render based on properties of the subject uri. + +See [pos-case](https://pod-os.org/reference/elements/components/pos-switch/pos-case/) for filter conditions. +Conditions including testing based on type, if/else logic, presence of forward (`if-property`) and backward (`if-rev`) links, +and whether some/every value linked by `if-property` or `if-rev` is equal to/greater than/less than the given attribute. @@ -39,6 +43,21 @@ Selects templates to render based on properties of the subject uri Primary topic of: + + + + + + + + + `} diff --git a/storybook/stories/composition/3_pos-switch-composition.stories.mdx b/storybook/stories/composition/3_pos-switch-composition.stories.mdx index 1522e19b..c49fa3a0 100644 --- a/storybook/stories/composition/3_pos-switch-composition.stories.mdx +++ b/storybook/stories/composition/3_pos-switch-composition.stories.mdx @@ -36,6 +36,11 @@ import { + + +