From e533e230f43f35db7a4b2157571860e2b0704318 Mon Sep 17 00:00:00 2001 From: tpluscode Date: Fri, 16 Oct 2020 09:06:56 +0200 Subject: [PATCH 1/3] fix: have sparql client parameter reflect base --- demos/lit-html/src/menu/resource.ts | 2 +- demos/lit-html/webpack.config.js | 4 ---- packages/core/models/editors/index.ts | 5 ++--- packages/core/models/forms/lib/stateBuilder.ts | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/demos/lit-html/src/menu/resource.ts b/demos/lit-html/src/menu/resource.ts index e24b91a4..682caf78 100644 --- a/demos/lit-html/src/menu/resource.ts +++ b/demos/lit-html/src/menu/resource.ts @@ -1,6 +1,6 @@ import TermSet from '@rdf-esm/term-set' import { MultiselectComboBox } from 'multiselect-combo-box/multiselect-combo-box' -import { prefixes } from '@zazuko/rdf-vocabularies' +import prefixes from '@zazuko/rdf-vocabularies/prefixes' import { State } from '../state/models/resource' import { Menu } from '../menu' diff --git a/demos/lit-html/webpack.config.js b/demos/lit-html/webpack.config.js index 4e0b120a..16bac3ea 100644 --- a/demos/lit-html/webpack.config.js +++ b/demos/lit-html/webpack.config.js @@ -20,10 +20,6 @@ module.exports = merge( }, module: { rules: [ - { - test: /\.nq$/, - use: ['raw-loader'], - }, { test: /\.ttl$/, use: ['raw-loader'], diff --git a/packages/core/models/editors/index.ts b/packages/core/models/editors/index.ts index a53e2357..516bce66 100644 --- a/packages/core/models/editors/index.ts +++ b/packages/core/models/editors/index.ts @@ -2,7 +2,6 @@ import { createModel } from '@captaincodeman/rdx' import type { NamedNode, Term } from 'rdf-js' import { PropertyShape } from '@rdfine/shacl' import type * as Rdfs from '@rdfine/rdfs' -import { vocabularies } from '@zazuko/rdf-vocabularies/lib/vocabularies' import cf from 'clownface' import $rdf from 'rdf-ext' import type { AnyPointer, GraphPointer } from 'clownface' @@ -56,10 +55,10 @@ export const editors = createModel(({ return { async loadDash() { - const { dash } = await vocabularies({ only: ['dash'] }) + const dash = (await import('@zazuko/rdf-vocabularies/datasets/dash')).default const DashEditors = await import('../../DashEditors') - dispatch.editors.addMetadata(dash) + dispatch.editors.addMetadata($rdf.dataset(dash($rdf))) dispatch.editors.addMatchers(DashEditors) }, } diff --git a/packages/core/models/forms/lib/stateBuilder.ts b/packages/core/models/forms/lib/stateBuilder.ts index f10c3b36..3fd38d15 100644 --- a/packages/core/models/forms/lib/stateBuilder.ts +++ b/packages/core/models/forms/lib/stateBuilder.ts @@ -1,6 +1,6 @@ import { NodeShape, PropertyShape } from '@rdfine/shacl' import type { MultiPointer, GraphPointer } from 'clownface' -import { shrink } from '@zazuko/rdf-vocabularies' +import { shrink } from '@zazuko/rdf-vocabularies/shrink' import { dash, rdfs } from '@tpluscode/rdf-ns-builders' import { NamedNode } from 'rdf-js' import { ResourceNode } from '@tpluscode/rdfine/RdfResource' From ba5a3bd76cf8238b2b5383c40720026dc9871fef Mon Sep 17 00:00:00 2001 From: tpluscode Date: Mon, 2 Nov 2020 16:02:17 +0100 Subject: [PATCH 2/3] build(deps): update rdf-vocabularies --- packages/core/package.json | 2 +- yarn.lock | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 81fa87f6..94231651 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,7 +19,7 @@ "@rdfine/shacl": "^0.5.2", "@tpluscode/rdf-ns-builders": "^0.4.0", "@tpluscode/rdfine": "^0.5.6", - "@zazuko/rdf-vocabularies": "^2020.7.13", + "@zazuko/rdf-vocabularies": "^2020.11.2", "clownface": "^1.1.0", "immer": "^7.0.9", "rdf-ext": "^1.3.0" diff --git a/yarn.lock b/yarn.lock index 51330342..e3e5d7a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4372,21 +4372,10 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@zazuko/rdf-vocabularies@^2020.6.29": - version "2020.6.29" - resolved "https://registry.yarnpkg.com/@zazuko/rdf-vocabularies/-/rdf-vocabularies-2020.6.29.tgz#2be2daf910e429ac051e280eb361a16398ab8795" - integrity sha512-eu4kqxklCHyA4fYKTp0Kf2SIR2cSR4OlghbAZPl5X/r5lFLuaudWFK0Zg/0l4WF8Tszu9OvkcW9H1DVkUFDT8w== - dependencies: - "@rdfjs/parser-n3" "^1.1.2" - commander "^5.0.0" - rdf-ext "^1.3.0" - readable-stream "^3.6.0" - string-to-stream "^3.0.1" - -"@zazuko/rdf-vocabularies@^2020.7.13": - version "2020.7.13" - resolved "https://registry.yarnpkg.com/@zazuko/rdf-vocabularies/-/rdf-vocabularies-2020.7.13.tgz#2848c62f46856021d732caa8a0f03c58808ef7bd" - integrity sha512-oXjc/K46hWdj2oqr06U5jSKE0ihv4oMNzlz12zYSHHg+1tlyhnZa4VZ4R5mx/7PRsg22sUuZ492ZIJNzIvxCPA== +"@zazuko/rdf-vocabularies@^2020.6.29", "@zazuko/rdf-vocabularies@^2020.7.13", "@zazuko/rdf-vocabularies@^2020.11.2": + version "2020.11.2" + resolved "https://registry.yarnpkg.com/@zazuko/rdf-vocabularies/-/rdf-vocabularies-2020.11.2.tgz#d82190f4556e47213744bd5d35106f4316ef9adf" + integrity sha512-RhTeKHVX0Deb/qHPeoO2JT9uRmN0HTzGUtzUpe7MJQneYA9wHOOROC+lsEmq+YNGJ0oZtiNc0HZofIbMhd6T7g== dependencies: "@rdfjs/parser-n3" "^1.1.2" commander "^5.0.0" From 7c88a8b3dbdd95a24fcf1aaab847eded87e3516f Mon Sep 17 00:00:00 2001 From: tpluscode Date: Mon, 2 Nov 2020 16:36:33 +0100 Subject: [PATCH 3/3] build(deps): update @zazuko.rdf-vocabularies --- .changeset/dry-pants-heal.md | 5 +++++ demos/lit-html/package.json | 3 +-- demos/lit-html/webpack.config.js | 8 -------- yarn.lock | 20 ++++++-------------- 4 files changed, 12 insertions(+), 24 deletions(-) create mode 100644 .changeset/dry-pants-heal.md diff --git a/.changeset/dry-pants-heal.md b/.changeset/dry-pants-heal.md new file mode 100644 index 00000000..79035dbf --- /dev/null +++ b/.changeset/dry-pants-heal.md @@ -0,0 +1,5 @@ +--- +"@hydrofoil/shaperone-core": patch +--- + +Update @zazuko/rdf-vocabularies diff --git a/demos/lit-html/package.json b/demos/lit-html/package.json index 4b839a1f..89e5ba5e 100644 --- a/demos/lit-html/package.json +++ b/demos/lit-html/package.json @@ -24,7 +24,7 @@ "@rdfjs-elements/rdf-editor": "^0.3.3", "@rdfjs/fetch-lite": "^2.1.0", "@tpluscode/rdf-ns-builders": "^0.4", - "@tpluscode/rdf-string": "^0.2.15", + "@tpluscode/rdf-string": "^0.2.21", "@vaadin/vaadin-app-layout": "^2.1.0", "@vaadin/vaadin-button": "^2.4.0", "@vaadin/vaadin-checkbox": "^2.5.0", @@ -55,7 +55,6 @@ "@types/rdfjs__fetch-lite": "^2.0.2", "@types/rdfjs__term-set": "^1.0.1", "copy-webpack-plugin": "^6.2.1", - "raw-loader": "^4.0.1", "rimraf": "^3.0.2", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", diff --git a/demos/lit-html/webpack.config.js b/demos/lit-html/webpack.config.js index 16bac3ea..d473d062 100644 --- a/demos/lit-html/webpack.config.js +++ b/demos/lit-html/webpack.config.js @@ -18,14 +18,6 @@ module.exports = merge( stream: 'readable-stream', }, }, - module: { - rules: [ - { - test: /\.ttl$/, - use: ['raw-loader'], - }, - ], - }, node: { crypto: true, }, diff --git a/yarn.lock b/yarn.lock index e3e5d7a4..7a10ee22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3201,15 +3201,15 @@ dependencies: "@rdf-esm/namespace" "^0.5.1" -"@tpluscode/rdf-string@^0.2.15": - version "0.2.20" - resolved "https://registry.yarnpkg.com/@tpluscode/rdf-string/-/rdf-string-0.2.20.tgz#f026c67f09d8c7ea67be8b0c4f993874a00894d7" - integrity sha512-3CY/nWge3EwNPoApQRP/HMlWlLyn6G+ePHvb/OOhhBd2/k08cWK4X2tCfMKU0weuLTtsDyBduMu7tsjxfQu9Fw== +"@tpluscode/rdf-string@^0.2.21": + version "0.2.21" + resolved "https://registry.yarnpkg.com/@tpluscode/rdf-string/-/rdf-string-0.2.21.tgz#4c313f2f6b0fa26ebefd1cadfc55977b6fc691b2" + integrity sha512-AXcXoJc1xMrSfM2luWvix25lEoF/LnHnO6cjb3Rx4wzVcs88fvS7joPhkYKdKu0FPhQZnixNvXyoE8AIxz6f+w== dependencies: "@rdf-esm/data-model" "^0.5.3" "@rdf-esm/term-map" "^0.5.0" "@tpluscode/rdf-ns-builders" "^0.4" - "@zazuko/rdf-vocabularies" "^2020.6.29" + "@zazuko/rdf-vocabularies" "^2020.11.2" "@tpluscode/rdfine@^0.5.6", "@tpluscode/rdfine@^0.5.7": version "0.5.10" @@ -4372,7 +4372,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@zazuko/rdf-vocabularies@^2020.6.29", "@zazuko/rdf-vocabularies@^2020.7.13", "@zazuko/rdf-vocabularies@^2020.11.2": +"@zazuko/rdf-vocabularies@^2020.11.2", "@zazuko/rdf-vocabularies@^2020.7.13": version "2020.11.2" resolved "https://registry.yarnpkg.com/@zazuko/rdf-vocabularies/-/rdf-vocabularies-2020.11.2.tgz#d82190f4556e47213744bd5d35106f4316ef9adf" integrity sha512-RhTeKHVX0Deb/qHPeoO2JT9uRmN0HTzGUtzUpe7MJQneYA9wHOOROC+lsEmq+YNGJ0oZtiNc0HZofIbMhd6T7g== @@ -12378,14 +12378,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-loader@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.1.tgz#14e1f726a359b68437e183d5a5b7d33a3eba6933" - integrity sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A== - dependencies: - loader-utils "^2.0.0" - schema-utils "^2.6.5" - rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"