Wrapper → TermWrapper

Author: langsamu

src/TermMapping.ts

@@ -1,6 +1,6 @@
-import type { Wrapper } from "./Wrapper.js"
+import type { TermWrapper } from "./TermWrapper.js"
 import type { DataFactory, DatasetCore } from "@rdfjs/types"
 
 export interface TermMapping<T> {
-    (v: T, d: DatasetCore, f: DataFactory): Wrapper | undefined
+    (v: T, d: DatasetCore, f: DataFactory): TermWrapper | undefined
 }

src/TermMappings.ts

@@ -1,28 +1,28 @@
-import { Wrapper } from "./Wrapper.js"
+import { TermWrapper } from "./TermWrapper.js"
 import type { DataFactory, DatasetCore } from "@rdfjs/types"
 
 export namespace TermMappings {
-    export function stringToLiteral(v: string | undefined, d: DatasetCore, f: DataFactory): Wrapper | undefined {
+    export function stringToLiteral(v: string | undefined, d: DatasetCore, f: DataFactory): TermWrapper | undefined {
         if (v === undefined) {
             return undefined
         }
 
-        return new Wrapper(f.literal(v), d, f)
+        return new TermWrapper(f.literal(v), d, f)
     }
 
-    export function dateToLiteral(v: Date | undefined, d: DatasetCore, f: DataFactory): Wrapper | undefined {
+    export function dateToLiteral(v: Date | undefined, d: DatasetCore, f: DataFactory): TermWrapper | undefined {
         if (v === undefined) {
             return undefined
         }
 
-        return new Wrapper(f.literal(v.toISOString(), f.namedNode("http://www.w3.org/2001/XMLSchema#date")), d, f)
+        return new TermWrapper(f.literal(v.toISOString(), f.namedNode("http://www.w3.org/2001/XMLSchema#date")), d, f)
     }
 
-    export function stringToIri(v: string | undefined, d: DatasetCore, f: DataFactory): Wrapper | undefined {
+    export function stringToIri(v: string | undefined, d: DatasetCore, f: DataFactory): TermWrapper | undefined {
         if (v === undefined) {
             return undefined
         }
 
-        return new Wrapper(f.namedNode(v), d, f)
+        return new TermWrapper(f.namedNode(v), d, f)
     }
 }

src/Wrapper.ts src/TermWrapper.tssrc/Wrapper.ts renamed to src/TermWrapper.ts

@@ -3,7 +3,7 @@ import type { TermMapping } from "./TermMapping.js"
 import { WrappingSet } from "./WrappingSet.js"
 import type { DataFactory, DatasetCore, Quad_Object, Quad_Predicate, Quad_Subject, Term } from "@rdfjs/types"
 
-export class Wrapper {
+export class TermWrapper {
     readonly #term: Term
     readonly #dataset: DatasetCore
     readonly #factory: DataFactory
@@ -15,7 +15,7 @@ export class Wrapper {
     }
 
     public static as<T>(constructor: new (term: Term, dataset: DatasetCore, factory: DataFactory) => T): ValueMapping<T> {
-        return (n: Wrapper) => new constructor(n.term, n.dataset, n.factory)
+        return (n: TermWrapper) => new constructor(n.term, n.dataset, n.factory)
     }
 
     get dataset(): DatasetCore {
@@ -32,7 +32,7 @@ export class Wrapper {
 
     protected singular<T>(p: Quad_Predicate, valueMapping: ValueMapping<T>): T {
         return valueMapping(
-            new Wrapper(
+            new TermWrapper(
                 [...this.dataset.match(this.term, p)][0]!.object,
                 this.dataset,
                 this.factory
@@ -42,7 +42,7 @@ export class Wrapper {
 
     protected singularNullable<T>(p: Quad_Predicate, valueMapping: ValueMapping<T>): T | undefined {
         for (const q of this.dataset.match(this.term, p)) {
-            return valueMapping(new Wrapper(q.object, this.dataset, this.factory))
+            return valueMapping(new TermWrapper(q.object, this.dataset, this.factory))
         }
 
         return
@@ -61,7 +61,7 @@ export class Wrapper {
             return
         }
 
-        if (!Wrapper.isQuadSubject(this.term)) {
+        if (!TermWrapper.isQuadSubject(this.term)) {
             return // TODO: throw error?
         }
 
@@ -71,7 +71,7 @@ export class Wrapper {
             return // TODO: throw error?
         }
 
-        if (!Wrapper.isQuadObject(o.term)) {
+        if (!TermWrapper.isQuadObject(o.term)) {
             return // TODO: throw error?
         }
 

src/ValueMapping.ts

@@ -1,5 +1,5 @@
-import type { Wrapper } from "./Wrapper.js"
+import type { TermWrapper } from "./TermWrapper.js"
 
 export interface ValueMapping<T> {
-    (n: Wrapper): T
+    (n: TermWrapper): T
 }

src/ValueMappings.ts

@@ -1,19 +1,19 @@
-import type { Wrapper } from "./Wrapper.js"
+import type { TermWrapper } from "./TermWrapper.js"
 
 export namespace ValueMappings {
-    export function literalToString(n: Wrapper): string {
+    export function literalToString(n: TermWrapper): string {
         return n.term.value
     }
 
-    export function literalToDate(n: Wrapper): Date {
+    export function literalToDate(n: TermWrapper): Date {
         return new Date(n.term.value)
     }
 
-    export function literalToNumber(n: Wrapper): number {
+    export function literalToNumber(n: TermWrapper): number {
         return Number(n.term.value)
     }
 
-    export function iriToString(n: Wrapper): string {
+    export function iriToString(n: TermWrapper): string {
         return n.term.value
     }
 }

src/WrappingSet.ts

@@ -1,17 +1,17 @@
-import { Wrapper } from "./Wrapper.js"
+import { TermWrapper } from "./TermWrapper.js"
 import type { TermMapping } from "./TermMapping.js"
 import type { ValueMapping } from "./ValueMapping.js"
 import type { DatasetCore, Quad, Quad_Object, Quad_Predicate, Quad_Subject } from "@rdfjs/types"
 
 export class WrappingSet<T> implements Set<T> {
     // TODO: Private identifiers instead?
-    private subject: Wrapper
+    private subject: TermWrapper
     private predicate: Quad_Predicate
     private valueMapping: ValueMapping<T>
     private termMapping: TermMapping<T>
 
     // TODO: Direction
-    constructor(subject: Wrapper, predicate: Quad_Predicate, valueMapping: ValueMapping<T>, termMapping: TermMapping<T>) {
+    constructor(subject: TermWrapper, predicate: Quad_Predicate, valueMapping: ValueMapping<T>, termMapping: TermMapping<T>) {
         this.subject = subject
         this.predicate = predicate
         this.valueMapping = valueMapping
@@ -73,7 +73,7 @@ export class WrappingSet<T> implements Set<T> {
 
     * values(): SetIterator<T> {
         for (const q of this.matches) {
-            yield this.valueMapping(new Wrapper(q.object, this.subject.dataset, this.subject.factory))
+            yield this.valueMapping(new TermWrapper(q.object, this.subject.dataset, this.subject.factory))
         }
     }
 

src/decorators/getter.ts

@@ -2,11 +2,11 @@ import {GetterArity} from "./GetterArity.js"
 import type {ValueMapping} from "../ValueMapping.js"
 import type {TermMapping} from "../TermMapping.js"
 import {TermMappings} from "../TermMappings.js"
-import {Wrapper} from "../Wrapper.js"
+import {TermWrapper} from "../TermWrapper.js"
 
 export function getter(predicate: string, getterArity: GetterArity, valueMapping: ValueMapping<any>, termMapping: TermMapping<any> = TermMappings.stringToLiteral): any {
     return function (target: any, context: ClassGetterDecoratorContext): any {
-        return function (this: Wrapper): any {
+        return function (this: TermWrapper): any {
             const p = this.factory.namedNode(predicate)
 
             switch (getterArity) {

src/decorators/setter.ts

@@ -1,10 +1,10 @@
 import {SetterArity} from "./setterArity.js"
 import type {TermMapping} from "../TermMapping.js"
-import {Wrapper} from "../Wrapper.js"
+import {TermWrapper} from "../TermWrapper.js"
 
 export function setter(predicate: string, setterArity: SetterArity, termMapping: TermMapping<any>): any {
     return function (target: any, context: ClassSetterDecoratorContext): any {
-        return function (this: Wrapper, value: any): void {
+        return function (this: TermWrapper, value: any): void {
             const p = this.factory.namedNode(predicate)
 
             switch (setterArity) {

src/mod.ts

@@ -2,7 +2,7 @@ export * from "./TermMapping.js"
 export * from "./TermMappings.js"
 export * from "./ValueMapping.js"
 export * from "./ValueMappings.js"
-export * from "./Wrapper.js"
+export * from "./TermWrapper.js"
 export * from "./WrappingSet.js"
 export * from "./decorators/GetterArity.js"
 export * from "./decorators/setterArity.js"

test/unit/model/Child.ts

@@ -1,7 +1,7 @@
-import { TermMappings, ValueMappings, Wrapper } from "rdfjs-wrapper"
+import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
 import { Vocabulary } from "../Vocabulary.js"
 
-export class Child extends Wrapper {
+export class Child extends TermWrapper {
     public get hasName(): string | undefined {
         return this.singular(Vocabulary.hasName, ValueMappings.literalToString)
     }