Skip to content

Commit 588445b

Browse files
Copilotjeswr
andauthored
BREAKING CHANGE: Replace deprecated dependency rdfjs-wrapper with @rdfjs/wrapper (#16)
* Initial plan * Replace rdfjs-wrapper with @rdfjs/wrapper Migrate from the deprecated `rdfjs-wrapper` package to the new `@rdfjs/wrapper` namespace. Update all import statements and adapt to the new API: - ValueMappings.literalToString → LiteralAs.string - ValueMappings.iriToString → NamedNodeAs.string - ValueMappings.literalToDate → LiteralAs.date - ValueMappings.literalToNumber → LiteralAs.number - TermMappings.stringToLiteral → LiteralFrom.string - TermMappings.stringToIri → NamedNodeFrom.string - TermWrapper.as(Class) → TermAs.instance(Class) - TermFrom.instance for "from" mappings in objects() - this.term.value → this.value (inherited from AnyTerm) Agent-Logs-Url: https://github.com/solid/object/sessions/d7aba86d-a254-4824-9e3d-05deaee579b9 Co-authored-by: jeswr <63333554+jeswr@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jeswr <63333554+jeswr@users.noreply.github.com>
1 parent 136b61d commit 588445b

17 files changed

Lines changed: 58 additions & 58 deletions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
],
3838
"license": "MIT",
3939
"dependencies": {
40-
"rdfjs-wrapper": "^0.15.0"
40+
"@rdfjs/wrapper": "^0.32.0"
4141
},
4242
"devDependencies": {
4343
"@rdfjs/types": "^2",

src/acp/AccessControl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { TermWrapper } from "rdfjs-wrapper"
1+
import { TermAs, TermFrom } from "@rdfjs/wrapper"
22
import { Policy } from "./Policy.js"
33
import { ACP } from "../vocabulary/mod.js"
44
import { Typed } from "./Typed.js";
55

66
export class AccessControl extends Typed {
77
get apply(): Set<Policy> {
8-
return this.objects(ACP.apply, TermWrapper.as(Policy), TermWrapper.as(Policy))
8+
return this.objects(ACP.apply, TermAs.instance(Policy), TermFrom.instance)
99
}
1010
}

src/acp/AccessControlResource.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { ValueMappings, TermMappings, TermWrapper } from "rdfjs-wrapper"
1+
import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
22
import { AccessControl } from "./AccessControl.js"
33
import { ACP } from "../vocabulary/mod.js"
44
import { Typed } from "./Typed.js";
55

66
export class AccessControlResource extends Typed {
77
get accessControl(): Set<AccessControl> {
8-
return this.objects(ACP.accessControl, TermWrapper.as(AccessControl), TermWrapper.as(AccessControl))
8+
return this.objects(ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)
99
}
1010

1111
get resource(): string | undefined {
12-
return this.singularNullable(ACP.resource, ValueMappings.iriToString)
12+
return this.singularNullable(ACP.resource, NamedNodeAs.string)
1313
}
1414

1515
set resource(v: string) {
16-
this.overwriteNullable(ACP.resource, v, TermMappings.stringToIri)
16+
this.overwriteNullable(ACP.resource, v, NamedNodeFrom.string)
1717
}
1818
}

src/acp/AcrDataset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DatasetWrapper } from "rdfjs-wrapper"
1+
import { DatasetWrapper } from "@rdfjs/wrapper"
22
import { AccessControlResource } from "./AccessControlResource.js";
33
import { ACP } from "../vocabulary/mod.js";
44

src/acp/Matcher.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { TermMappings, ValueMappings } from "rdfjs-wrapper"
1+
import { NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
22
import { ACP } from "../vocabulary/mod.js"
33
import { Typed } from "./Typed.js";
44

55
export class Matcher extends Typed {
66
get agent(): Set<string> {
7-
return this.objects(ACP.agent, ValueMappings.iriToString, TermMappings.stringToIri)
7+
return this.objects(ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
88
}
99
}

src/acp/Policy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
1+
import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
22
import { Matcher } from "./Matcher.js"
33
import { ACP } from "../vocabulary/mod.js"
44
import { Typed } from "./Typed.js";
55

66
export class Policy extends Typed {
77
get allow(): Set<string> {
8-
return this.objects(ACP.allow, ValueMappings.iriToString, TermMappings.stringToIri)
8+
return this.objects(ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)
99
}
1010

1111
get anyOf(): Set<Matcher> {
12-
return this.objects(ACP.anyOf, TermWrapper.as(Matcher), TermWrapper.as(Matcher))
12+
return this.objects(ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)
1313
}
1414
}

src/acp/Typed.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
1+
import { TermWrapper, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
22
import { RDF } from "../vocabulary/mod.js"
33

44
export class Typed extends TermWrapper {
55
get type(): Set<string> {
6-
return this.objects(RDF.type, ValueMappings.iriToString, TermMappings.stringToIri)
6+
return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
77
}
88
}

src/solid/Container.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { TermWrapper } from "rdfjs-wrapper"
1+
import { TermAs, TermFrom } from "@rdfjs/wrapper"
22
import { Resource } from "./Resource.js"
33
import { LDP } from "../vocabulary/mod.js"
44

55
export class Container extends Resource {
66
public get contains(): Set<Resource> {
7-
return this.objects(LDP.contains, TermWrapper.as(Resource), TermWrapper.as(Resource))
7+
return this.objects(LDP.contains, TermAs.instance(Resource), TermFrom.instance)
88
}
99
}

src/solid/ContainerDataset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DatasetWrapper } from "rdfjs-wrapper"
1+
import { DatasetWrapper } from "@rdfjs/wrapper"
22
import { Container } from "./Container.js"
33
import { LDP } from "../vocabulary/mod.js"
44

src/solid/Email.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import { TermWrapper, ValueMappings, TermMappings } from 'rdfjs-wrapper';
1+
import { TermWrapper, LiteralAs, LiteralFrom, NamedNodeAs, NamedNodeFrom } from '@rdfjs/wrapper';
22
import { VCARD, RDF } from '../vocabulary/mod.js';
33

44
export class Email extends TermWrapper {
55
get emailAddress(): string {
6-
return this.singular(VCARD.value, ValueMappings.literalToString);
6+
return this.singular(VCARD.value, LiteralAs.string);
77
}
88

99
set emailAddress(value: string) {
10-
this.overwrite(VCARD.value, value, TermMappings.stringToLiteral);
10+
this.overwrite(VCARD.value, value, LiteralFrom.string);
1111
}
1212

1313
get emailType(): string | undefined {
14-
return this.singularNullable(RDF.type, ValueMappings.iriToString);
14+
return this.singularNullable(RDF.type, NamedNodeAs.string);
1515
}
1616

1717
set emailType(value: string | undefined) {
18-
this.overwriteNullable(RDF.type, value, TermMappings.stringToIri);
18+
this.overwriteNullable(RDF.type, value, NamedNodeFrom.string);
1919
}
2020
}

0 commit comments

Comments
 (0)