Skip to content

Commit 8d0ba97

Browse files
megothmegoth
committed
Possible fix after the types fix in rdflib
1 parent 3aa7d15 commit 8d0ba97

7 files changed

Lines changed: 19 additions & 26 deletions

File tree

‎package-lock.json‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"@babel/preset-typescript": "^7.6.0",
7777
"@types/jest": "^25.1.1",
7878
"@types/jsdom": "^12.2.4",
79-
"@types/rdflib": "^0.20.1",
8079
"@typescript-eslint/eslint-plugin": "^2.7.0",
8180
"@typescript-eslint/parser": "^2.6.1",
8281
"eslint": "^6.6.0",

‎src/authn/authn.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ export function registrationList (context: AuthenticationContext, options: {
742742
* @returns Resolves with aclDoc uri on successful write
743743
*/
744744
export function setACLUserPublic (
745-
docURI: $rdf.NamedNode,
745+
docURI: string,
746746
me: $rdf.NamedNode,
747747
options: {
748748
defaultForNew?: boolean,
@@ -786,7 +786,7 @@ export function setACLUserPublic (
786786
* @param docURI
787787
* @returns
788788
*/
789-
function fetchACLRel (docURI: $rdf.NamedNode): Promise<$rdf.NamedNode> {
789+
function fetchACLRel (docURI: string): Promise<$rdf.NamedNode> {
790790
const fetcher = kb.fetcher
791791

792792
return fetcher.load(docURI).then(result => {
@@ -816,9 +816,9 @@ function fetchACLRel (docURI: $rdf.NamedNode): Promise<$rdf.NamedNode> {
816816
* @returns Serialized ACL
817817
*/
818818
function genACLText (
819-
docURI: $rdf.NamedNode,
819+
docURI: string,
820820
me: $rdf.NamedNode,
821-
aclURI: $rdf.NamedNode,
821+
aclURI: string,
822822
options: {
823823
defaultForNew?: boolean,
824824
public?: []

‎src/widgets/forms/basic.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export function basicField (
183183
let is = ds.map(statement => st(statement.subject, statement.predicate, result, statement.why)) // can include >1 doc
184184
if (is.length === 0) {
185185
// or none
186-
is = [st(subject, property, result, doc as Node)]
186+
is = [st(subject, property, result, doc)]
187187
}
188188

189189
function updateMany (ds, is: { why: { uri: string } }[], callback) {

‎test/custom-matchers/toContainGraph.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { IndexedFormula, NamedNode } from 'rdflib'
1+
import { IndexedFormula } from 'rdflib'
22

33
export function toContainGraph (received: IndexedFormula, expected: IndexedFormula) {
44
const receivedStatements = received.statements.slice()
55
const expectedStatements = expected.statements.slice()
6-
const diffStatements = expectedStatements.filter(st => !received.holds(st.subject, st.predicate, st.object, st.why as NamedNode))
6+
const diffStatements = expectedStatements.filter(st => !received.holds(st.subject, st.predicate, st.object, st.graph))
77
return {
88
pass: diffStatements.length === 0,
99
message: () => `Statements in expected graph is not contained in received graph\n
1010
Found ${receivedStatements.length} statements in received graph:
11-
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}
11+
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}
1212
The following ${diffStatements.length} statements does not exist in the above graph:
13-
${diffStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}`
13+
${diffStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}`
1414
}
1515
}
1616

‎test/custom-matchers/toEqualGraph.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IndexedFormula, NamedNode } from 'rdflib'
1+
import { IndexedFormula } from 'rdflib'
22

33
export function toEqualGraph (received: IndexedFormula, expected: IndexedFormula) {
44
const receivedStatements = received.statements.slice()
@@ -8,30 +8,30 @@ export function toEqualGraph (received: IndexedFormula, expected: IndexedFormula
88
pass: false,
99
message: () => `Expected graph does not equal to received graph\n
1010
Found ${receivedStatements.length} statements in received graph:
11-
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}
11+
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}
1212
Found ${expectedStatements.length} statements in expected graph:
13-
${expectedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}`
13+
${expectedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}`
1414
}
1515
}
16-
const expDiffRecStatements = expectedStatements.filter(st => !received.holds(st.subject, st.predicate, st.object, st.why as NamedNode))
16+
const expDiffRecStatements = expectedStatements.filter(st => !received.holds(st.subject, st.predicate, st.object, st.graph))
1717
if (expDiffRecStatements.length !== 0) {
1818
return {
1919
pass: false,
2020
message: () => `Expected graph does not equal to received graph\n
2121
Found ${receivedStatements.length} statements in received graph:
22-
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}
22+
${receivedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}
2323
The following ${expDiffRecStatements.length} statements does not exist in the above graph:
24-
${expDiffRecStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}`
24+
${expDiffRecStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}`
2525
}
2626
}
27-
const recDiffExpStatements = receivedStatements.filter(st => !expected.holds(st.subject, st.predicate, st.object, st.why as NamedNode))
27+
const recDiffExpStatements = receivedStatements.filter(st => !expected.holds(st.subject, st.predicate, st.object, st.graph))
2828
return {
2929
pass: recDiffExpStatements.length === 0,
3030
message: () => `Expected graph does not equal to received graph\n
3131
Found ${expectedStatements.length} statements in expected graph:
32-
${expectedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}
32+
${expectedStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}
3333
The following ${recDiffExpStatements.length} statements does not exist in the above graph:
34-
${recDiffExpStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.why} .\n`).join('')}`
34+
${recDiffExpStatements.map(st => `- ${st.subject} ${st.predicate} ${st.object} ${st.graph} .\n`).join('')}`
3535
}
3636
}
3737

‎test/unit/authn/authn.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ describe('setACLUserPublic', () => {
215215
})
216216
it.skip('runs', async () => {
217217
expect(await setACLUserPublic(
218-
sym('https://test.test#'),
218+
'https://test.test#',
219219
sym('https://test.test#'),
220220
{}
221221
)).toEqual({})

0 commit comments

Comments
 (0)