From e4805f5d3423b51cffed4dd7a8e7e190b68b414f Mon Sep 17 00:00:00 2001 From: Tomasz Pluskiewicz Date: Fri, 9 Feb 2024 12:14:35 +0100 Subject: [PATCH] build(deps): remove old rdf-js packages (closes #1482) --- apis/core/bootstrap/lib/query.ts | 2 +- apis/core/lib/ChangelogDataset.ts | 2 +- apis/core/lib/Loader.ts | 2 +- apis/core/lib/ResourceStore.ts | 2 +- apis/core/lib/csvw-builder/index.ts | 2 +- apis/core/lib/domain/Resource.ts | 2 +- .../domain/column-mapping/ColumnMapping.ts | 2 +- apis/core/lib/domain/column-mapping/create.ts | 2 +- apis/core/lib/domain/column-mapping/delete.ts | 2 +- .../lib/domain/column-mapping/lib/index.ts | 2 +- apis/core/lib/domain/column-mapping/update.ts | 2 +- .../core/lib/domain/csv-mapping/CsvMapping.ts | 2 +- apis/core/lib/domain/csv-mapping/delete.ts | 2 +- apis/core/lib/domain/csv-source/CsvSource.ts | 2 +- apis/core/lib/domain/csv-source/delete.ts | 2 +- apis/core/lib/domain/csv-source/replace.ts | 2 +- apis/core/lib/domain/csv-source/update.ts | 2 +- apis/core/lib/domain/csv-source/upload.ts | 2 +- apis/core/lib/domain/cube-projects/Project.ts | 2 +- apis/core/lib/domain/cube-projects/create.ts | 2 +- apis/core/lib/domain/cube-projects/delete.ts | 2 +- apis/core/lib/domain/cube-projects/details.ts | 2 +- .../domain/cube-projects/details/versions.ts | 2 +- apis/core/lib/domain/cube-projects/export.ts | 2 +- apis/core/lib/domain/cube-projects/import.ts | 2 +- apis/core/lib/domain/cube-projects/queries.ts | 2 +- apis/core/lib/domain/cube-projects/update.ts | 2 +- apis/core/lib/domain/dataset/Dataset.ts | 2 +- apis/core/lib/domain/dataset/queries.ts | 2 +- apis/core/lib/domain/dataset/update.ts | 2 +- .../dimension-mapping/DimensionMapping.ts | 2 +- .../lib/domain/dimension-mapping/update.ts | 2 +- .../dimension/DimensionMetadataCollection.ts | 2 +- apis/core/lib/domain/dimension/update.ts | 2 +- apis/core/lib/domain/errors/deleteCurrent.ts | 2 +- apis/core/lib/domain/identifiers.ts | 2 +- apis/core/lib/domain/job/create.ts | 2 +- apis/core/lib/domain/job/update.ts | 2 +- apis/core/lib/domain/observations/index.ts | 2 +- .../core/lib/domain/observations/lib/index.ts | 2 +- .../lib/domain/organization/Organization.ts | 2 +- apis/core/lib/domain/organization/query.ts | 2 +- .../core/lib/domain/queries/column-mapping.ts | 10 ++-- apis/core/lib/domain/queries/csv-source.ts | 2 +- apis/core/lib/domain/queries/cube-data.ts | 2 +- apis/core/lib/domain/queries/cube.ts | 2 +- .../lib/domain/queries/dimension-mappings.ts | 2 +- .../lib/domain/queries/dimension-metadata.ts | 2 +- apis/core/lib/domain/queries/observations.ts | 2 +- .../lib/domain/queries/resources-types.ts | 2 +- apis/core/lib/domain/queries/table.ts | 2 +- apis/core/lib/domain/table/Table.ts | 2 +- apis/core/lib/domain/table/create.ts | 2 +- apis/core/lib/domain/table/csvw.ts | 2 +- apis/core/lib/domain/table/delete.ts | 2 +- apis/core/lib/handlers/dataset.ts | 2 +- apis/core/lib/handlers/dimension-mapping.ts | 2 +- apis/core/lib/handlers/dimension.ts | 2 +- apis/core/lib/handlers/jobs.ts | 2 +- apis/core/lib/middleware/shacl.ts | 2 +- apis/core/lib/pipeline/trigger.ts | 2 +- apis/core/lib/resources/hydraManages.ts | 2 +- apis/core/package.json | 2 +- apis/core/test/csvw-builder/support.ts | 2 +- .../test/domain/column-mapping/create.test.ts | 2 +- .../test/domain/column-mapping/delete.test.ts | 2 +- .../test/domain/column-mapping/update.test.ts | 2 +- .../test/domain/csv-source/replace.test.ts | 2 +- .../test/domain/csv-source/update.test.ts | 2 +- .../test/domain/cube-projects/create.test.ts | 2 +- .../test/domain/cube-projects/export.test.ts | 2 +- .../test/domain/cube-projects/import.test.ts | 2 +- .../test/domain/cube-projects/update.test.ts | 2 +- apis/core/test/domain/dataset/update.test.ts | 2 +- .../DimensionMappings.test.ts | 2 +- .../domain/dimension-mapping/update.test.ts | 2 +- .../core/test/domain/dimension/update.test.ts | 2 +- apis/core/test/domain/job/update.test.ts | 2 +- .../test/domain/observations/index.test.ts | 2 +- .../domain/observations/lib/index.test.ts | 2 +- apis/core/test/domain/queries/tabel.test.ts | 2 +- apis/core/test/domain/table/create.test.ts | 2 +- apis/core/test/domain/table/delete.test.ts | 2 +- apis/core/test/domain/table/update.test.ts | 2 +- .../test/handlers/dimension-mapping.test.ts | 2 +- apis/core/test/handlers/dimension.test.ts | 2 +- apis/core/test/shapes/dimension.test.ts | 2 +- apis/core/test/support/TestResourceStore.ts | 2 +- apis/errors/index.ts | 2 +- apis/shared-dimensions/bootstrap/index.ts | 2 +- .../lib/domain/hierarchies.ts | 2 +- apis/shared-dimensions/lib/domain/resource.ts | 2 +- .../lib/domain/shared-dimension-term.ts | 2 +- .../lib/domain/shared-dimension.ts | 2 +- .../lib/domain/shared-dimension/import.ts | 2 +- .../lib/domain/shared-dimension/queries.ts | 2 +- .../lib/domain/shared-dimensions.ts | 2 +- .../lib/handlers/collection.ts | 2 +- .../lib/handlers/hierarchy.ts | 2 +- .../lib/handlers/shared-dimensions.ts | 2 +- apis/shared-dimensions/lib/loader.ts | 2 +- .../lib/middleware/canonicalRewrite.ts | 2 +- apis/shared-dimensions/lib/query.ts | 2 +- apis/shared-dimensions/lib/rewrite.ts | 2 +- .../lib/shapes/dynamic-properties.ts | 2 +- apis/shared-dimensions/lib/shapes/index.ts | 2 +- apis/shared-dimensions/lib/store.ts | 2 +- apis/shared-dimensions/lib/store/index.ts | 2 +- .../lib/domain/managed-dimension-term.test.ts | 2 +- .../test/lib/domain/managed-dimension.test.ts | 2 +- .../lib/shapes/dynamic-properties.test.ts | 2 +- .../test/lib/shapes/index.test.ts | 2 +- cli/lib/counters.ts | 2 +- cli/lib/csv.ts | 2 +- cli/lib/cube.ts | 2 +- cli/lib/import/cube.ts | 2 +- cli/lib/import/cubeMetadata.ts | 2 +- cli/lib/import/dimensions.ts | 2 +- cli/lib/job.ts | 2 +- cli/lib/metadata.ts | 2 +- cli/lib/output-filter.ts | 2 +- cli/lib/output-mapper.ts | 2 +- cli/lib/publish/patch-stream.ts | 2 +- cli/lib/validation.ts | 2 +- cli/lib/variables.ts | 2 +- cli/package.json | 2 +- cli/test/lib/commands/publish.test.ts | 2 +- cli/test/lib/commands/unlist.test.ts | 2 +- cli/test/lib/metadata.test.ts | 2 +- packages/core/datatypes.ts | 2 +- packages/core/namespaces/shapes.ts | 2 +- packages/core/package.json | 2 +- packages/express-rdf-request/index.ts | 4 +- packages/express/multipart.ts | 2 +- packages/model/ColumnMapping.ts | 2 +- packages/model/Cube.ts | 2 +- packages/model/Dataset.ts | 2 +- packages/model/DimensionMetadata.ts | 2 +- packages/model/ImportJob.ts | 2 +- packages/model/Job.ts | 2 +- packages/model/MediaObject.ts | 2 +- packages/model/Organization.ts | 2 +- packages/model/Project.ts | 2 +- packages/model/Table.ts | 2 +- packages/model/lib/Link.ts | 2 +- packages/model/lib/resourceIdentifiers.ts | 2 +- packages/model/package.json | 2 +- packages/shacl-middleware/index.ts | 2 +- packages/shacl-middleware/package.json | 2 +- packages/shacl-middleware/readme.md | 2 +- .../shacl-middleware/test/support/loader.ts | 2 +- packages/testing/clownface.ts | 2 +- packages/testing/lib/chaiShapeMatcher.ts | 2 +- packages/testing/lib/seedData.ts | 2 +- packages/testing/middleware.ts | 2 +- packages/testing/package.json | 2 +- typings/rdf-cube-view-query/index.d.ts | 6 +-- typings/rdf-parser-px/index.d.ts | 2 +- ui/package.json | 2 +- ui/src/api/common.ts | 2 +- ui/src/api/errors.ts | 2 +- ui/src/api/index.ts | 2 +- ui/src/api/mixins/ApiResource.ts | 2 +- ui/src/api/mixins/Hierarchy.ts | 2 +- ui/src/api/mixins/SharedDimension.ts | 2 +- ui/src/components/CubePreviewDimension.vue | 2 +- ui/src/components/CubePreviewValue.vue | 2 +- ui/src/components/DataKindIcon.vue | 2 +- ui/src/components/ExternalTerm.vue | 2 +- ui/src/components/ExternalTermLink.vue | 2 +- ui/src/components/HierarchyTreeLevel.vue | 2 +- ui/src/components/MapperTable.vue | 2 +- ui/src/components/PropertyDisplay.vue | 2 +- .../components/ReferenceColumnMappingForm.vue | 2 +- ui/src/components/ScaleOfMeasureIcon.vue | 2 +- ui/src/components/TermDisplay.vue | 2 +- ui/src/components/TermWithLanguage.vue | 2 +- ui/src/components/tagged-literal.ts | 2 +- ui/src/customElements/HydraRawRdfForm.ts | 2 +- ui/src/forms/FileLiteral.ts | 2 +- ui/src/forms/editors/AutoCompleteEditor.vue | 2 +- ui/src/forms/editors/CheckboxEditor.vue | 2 +- ui/src/forms/editors/CheckboxListEditor.vue | 2 +- .../forms/editors/DictionaryTableEditor.vue | 2 +- ui/src/forms/editors/FileUploadEditor.vue | 2 +- ui/src/forms/editors/HierarchyPathEditor.vue | 2 +- .../editors/IdentifierTemplateEditor.vue | 2 +- ui/src/forms/editors/PropertyInput.vue | 2 +- ui/src/forms/editors/RadioButtons.vue | 2 +- ui/src/forms/editors/SelectEditor.vue | 2 +- .../forms/editors/TagsWithLanguageEditor.vue | 2 +- .../forms/editors/TextFieldWithLangEditor.vue | 2 +- ui/src/forms/editors/URIInput.vue | 2 +- ui/src/forms/editors/index.ts | 2 +- .../dimensionMetaHierarchySynchronizer.ts | 2 +- ui/src/forms/templates/dynamicXone.ts | 2 +- ui/src/forms/validation.ts | 2 +- ui/src/forms/viewers/index.ts | 2 +- ui/src/graph.ts | 2 +- ui/src/rdf-properties.ts | 2 +- ui/src/store/modules/project.ts | 2 +- ui/src/store/types.ts | 2 +- ui/src/use-hydra-form.ts | 2 +- ui/src/views/Hierarchy.vue | 2 +- ui/src/views/ResourcePreview.vue | 2 +- yarn.lock | 52 ++++++++++--------- 206 files changed, 240 insertions(+), 236 deletions(-) diff --git a/apis/core/bootstrap/lib/query.ts b/apis/core/bootstrap/lib/query.ts index d324fe771..425e7c851 100644 --- a/apis/core/bootstrap/lib/query.ts +++ b/apis/core/bootstrap/lib/query.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import $rdf from 'rdf-ext' import { SparqlTemplateResult } from '@tpluscode/rdf-string' import env from '@cube-creator/core/env' diff --git a/apis/core/lib/ChangelogDataset.ts b/apis/core/lib/ChangelogDataset.ts index cfc91c1fc..4ba43ea5a 100644 --- a/apis/core/lib/ChangelogDataset.ts +++ b/apis/core/lib/ChangelogDataset.ts @@ -1,4 +1,4 @@ -import { DatasetCore, Quad } from 'rdf-js' +import type { DatasetCore, Quad } from '@rdfjs/types' import $rdf from 'rdf-ext' interface Changes { diff --git a/apis/core/lib/Loader.ts b/apis/core/lib/Loader.ts index 65e60741d..53af5611a 100644 --- a/apis/core/lib/Loader.ts +++ b/apis/core/lib/Loader.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { SparqlQueryLoader } from '@hydrofoil/labyrinth/lib/loader' import { PropertyResource, Resource } from 'hydra-box' import ParsingClient from 'sparql-http-client/ParsingClient' diff --git a/apis/core/lib/ResourceStore.ts b/apis/core/lib/ResourceStore.ts index 200730d16..23ff7e005 100644 --- a/apis/core/lib/ResourceStore.ts +++ b/apis/core/lib/ResourceStore.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad, Term } from 'rdf-js' +import type { NamedNode, Quad, Term } from '@rdfjs/types' import type StreamClient from 'sparql-http-client/StreamClient' import cf, { GraphPointer } from 'clownface' import $rdf from 'rdf-ext' diff --git a/apis/core/lib/csvw-builder/index.ts b/apis/core/lib/csvw-builder/index.ts index e4bea22b3..0938adb3b 100644 --- a/apis/core/lib/csvw-builder/index.ts +++ b/apis/core/lib/csvw-builder/index.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import * as Csvw from '@rdfine/csvw' import TermMap from '@rdfjs/term-map' import { diff --git a/apis/core/lib/domain/Resource.ts b/apis/core/lib/domain/Resource.ts index 01cd30181..ff3761d97 100644 --- a/apis/core/lib/domain/Resource.ts +++ b/apis/core/lib/domain/Resource.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import { Constructor } from '@tpluscode/rdfine' import { RdfResourceCore } from '@tpluscode/rdfine/RdfResource' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/domain/column-mapping/ColumnMapping.ts b/apis/core/lib/domain/column-mapping/ColumnMapping.ts index da14c2976..56fd8e3b9 100644 --- a/apis/core/lib/domain/column-mapping/ColumnMapping.ts +++ b/apis/core/lib/domain/column-mapping/ColumnMapping.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Constructor } from '@tpluscode/rdfine' import { Initializer, RdfResourceCore } from '@tpluscode/rdfine/RdfResource' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/column-mapping/create.ts b/apis/core/lib/domain/column-mapping/create.ts index 3b57ec0fb..844fe3048 100644 --- a/apis/core/lib/domain/column-mapping/create.ts +++ b/apis/core/lib/domain/column-mapping/create.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { GraphPointer } from 'clownface' import { diff --git a/apis/core/lib/domain/column-mapping/delete.ts b/apis/core/lib/domain/column-mapping/delete.ts index d4ddd7c21..c5eadf753 100644 --- a/apis/core/lib/domain/column-mapping/delete.ts +++ b/apis/core/lib/domain/column-mapping/delete.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import $rdf from 'rdf-ext' import { cc } from '@cube-creator/core/namespace' import type { Organization } from '@rdfine/schema' diff --git a/apis/core/lib/domain/column-mapping/lib/index.ts b/apis/core/lib/domain/column-mapping/lib/index.ts index 8431d5288..f82312de2 100644 --- a/apis/core/lib/domain/column-mapping/lib/index.ts +++ b/apis/core/lib/domain/column-mapping/lib/index.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { ColumnMapping, CsvProject, Table } from '@cube-creator/model' import type { Organization } from '@rdfine/schema' import { ResourceStore } from '../../../ResourceStore' diff --git a/apis/core/lib/domain/column-mapping/update.ts b/apis/core/lib/domain/column-mapping/update.ts index 4b65f5b51..9fc12ff21 100644 --- a/apis/core/lib/domain/column-mapping/update.ts +++ b/apis/core/lib/domain/column-mapping/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { cc } from '@cube-creator/core/namespace' import { diff --git a/apis/core/lib/domain/csv-mapping/CsvMapping.ts b/apis/core/lib/domain/csv-mapping/CsvMapping.ts index 06ca80a35..e961f59a5 100644 --- a/apis/core/lib/domain/csv-mapping/CsvMapping.ts +++ b/apis/core/lib/domain/csv-mapping/CsvMapping.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Constructor } from '@tpluscode/rdfine' import { rdf } from '@tpluscode/rdf-ns-builders' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/csv-mapping/delete.ts b/apis/core/lib/domain/csv-mapping/delete.ts index 6b45c4efa..a5747ff36 100644 --- a/apis/core/lib/domain/csv-mapping/delete.ts +++ b/apis/core/lib/domain/csv-mapping/delete.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { ResourceStore } from '../../ResourceStore' import { deleteSource } from '../csv-source/delete' diff --git a/apis/core/lib/domain/csv-source/CsvSource.ts b/apis/core/lib/domain/csv-source/CsvSource.ts index 04bbbb30b..3a4da3854 100644 --- a/apis/core/lib/domain/csv-source/CsvSource.ts +++ b/apis/core/lib/domain/csv-source/CsvSource.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { CsvSource } from '@cube-creator/model' import * as CsvColumn from '@cube-creator/model/CsvColumn' diff --git a/apis/core/lib/domain/csv-source/delete.ts b/apis/core/lib/domain/csv-source/delete.ts index fc967d362..9f2d39464 100644 --- a/apis/core/lib/domain/csv-source/delete.ts +++ b/apis/core/lib/domain/csv-source/delete.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import $rdf from 'rdf-ext' import { CsvSource } from '@cube-creator/model' diff --git a/apis/core/lib/domain/csv-source/replace.ts b/apis/core/lib/domain/csv-source/replace.ts index 10e17621b..684330718 100644 --- a/apis/core/lib/domain/csv-source/replace.ts +++ b/apis/core/lib/domain/csv-source/replace.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import type { MediaObject } from '@rdfine/schema' import { CsvSource } from '@cube-creator/model' diff --git a/apis/core/lib/domain/csv-source/update.ts b/apis/core/lib/domain/csv-source/update.ts index fbd6c5e51..34ffb8d15 100644 --- a/apis/core/lib/domain/csv-source/update.ts +++ b/apis/core/lib/domain/csv-source/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { CsvSource } from '@cube-creator/model' import RdfResource from '@tpluscode/rdfine' diff --git a/apis/core/lib/domain/csv-source/upload.ts b/apis/core/lib/domain/csv-source/upload.ts index d60c6ade7..01a00aa02 100644 --- a/apis/core/lib/domain/csv-source/upload.ts +++ b/apis/core/lib/domain/csv-source/upload.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { schema } from '@tpluscode/rdf-ns-builders' import { Conflict } from 'http-errors' diff --git a/apis/core/lib/domain/cube-projects/Project.ts b/apis/core/lib/domain/cube-projects/Project.ts index 0f1d30a36..5986a071a 100644 --- a/apis/core/lib/domain/cube-projects/Project.ts +++ b/apis/core/lib/domain/cube-projects/Project.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { CsvProject, Project, CsvMapping, ImportProject } from '@cube-creator/model' import { Constructor } from '@tpluscode/rdfine' import { create as createMapping } from '@cube-creator/model/CsvMapping' diff --git a/apis/core/lib/domain/cube-projects/create.ts b/apis/core/lib/domain/cube-projects/create.ts index 7b0d04602..ded7dccd9 100644 --- a/apis/core/lib/domain/cube-projects/create.ts +++ b/apis/core/lib/domain/cube-projects/create.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { dcterms, rdfs, schema } from '@tpluscode/rdf-ns-builders' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/cube-projects/delete.ts b/apis/core/lib/domain/cube-projects/delete.ts index a3d5f2444..c1bcba509 100644 --- a/apis/core/lib/domain/cube-projects/delete.ts +++ b/apis/core/lib/domain/cube-projects/delete.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Project } from '@cube-creator/model' import { ParsingClient } from 'sparql-http-client/ParsingClient' import { SELECT } from '@tpluscode/sparql-builder' diff --git a/apis/core/lib/domain/cube-projects/details.ts b/apis/core/lib/domain/cube-projects/details.ts index 05724bd9f..9567f55a8 100644 --- a/apis/core/lib/domain/cube-projects/details.ts +++ b/apis/core/lib/domain/cube-projects/details.ts @@ -1,4 +1,4 @@ -import { Variable, Literal, NamedNode } from 'rdf-js' +import type { Variable, Literal, NamedNode } from '@rdfjs/types' import $rdf from 'rdf-ext' import { CONSTRUCT, sparql } from '@tpluscode/sparql-builder' import { SparqlGraphQueryExecutable, SparqlQuery, SparqlQueryExecutable } from '@tpluscode/sparql-builder/lib' diff --git a/apis/core/lib/domain/cube-projects/details/versions.ts b/apis/core/lib/domain/cube-projects/details/versions.ts index 1f0c3b065..c1c36e3e4 100644 --- a/apis/core/lib/domain/cube-projects/details/versions.ts +++ b/apis/core/lib/domain/cube-projects/details/versions.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { SELECT } from '@tpluscode/sparql-builder' import { Draft, Published } from '@cube-creator/model/Cube' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/cube-projects/export.ts b/apis/core/lib/domain/cube-projects/export.ts index 37007cb45..5039842c5 100644 --- a/apis/core/lib/domain/cube-projects/export.ts +++ b/apis/core/lib/domain/cube-projects/export.ts @@ -1,4 +1,4 @@ -import type { NamedNode, Stream, Term } from 'rdf-js' +import type { NamedNode, Stream, Term } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { Project } from '@cube-creator/model/Project' import { SELECT } from '@tpluscode/sparql-builder' diff --git a/apis/core/lib/domain/cube-projects/import.ts b/apis/core/lib/domain/cube-projects/import.ts index 92ed9cc71..0c20f319d 100644 --- a/apis/core/lib/domain/cube-projects/import.ts +++ b/apis/core/lib/domain/cube-projects/import.ts @@ -1,5 +1,5 @@ -import { DatasetCore, NamedNode, Quad, Term } from 'rdf-js' import { Transform } from 'stream' +import type { DatasetCore, NamedNode, Quad, Term } from '@rdfjs/types' import { BadRequest } from 'http-errors' import $rdf from 'rdf-ext' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/cube-projects/queries.ts b/apis/core/lib/domain/cube-projects/queries.ts index 568af9556..8c44267a1 100644 --- a/apis/core/lib/domain/cube-projects/queries.ts +++ b/apis/core/lib/domain/cube-projects/queries.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { ASK, SELECT } from '@tpluscode/sparql-builder' import { dcterms, schema } from '@tpluscode/rdf-ns-builders' import $rdf from 'rdf-ext' diff --git a/apis/core/lib/domain/cube-projects/update.ts b/apis/core/lib/domain/cube-projects/update.ts index 23d07a8f1..0fcf5f474 100644 --- a/apis/core/lib/domain/cube-projects/update.ts +++ b/apis/core/lib/domain/cube-projects/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { DomainError } from '@cube-creator/api-errors' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/dataset/Dataset.ts b/apis/core/lib/domain/dataset/Dataset.ts index 619a3db0f..4c9d20e40 100644 --- a/apis/core/lib/domain/dataset/Dataset.ts +++ b/apis/core/lib/domain/dataset/Dataset.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import $rdf from 'rdf-ext' import { Constructor } from '@tpluscode/rdfine' import { _void, schema } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/dataset/queries.ts b/apis/core/lib/domain/dataset/queries.ts index 0982396db..9c7eee7d0 100644 --- a/apis/core/lib/domain/dataset/queries.ts +++ b/apis/core/lib/domain/dataset/queries.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { schema } from '@tpluscode/rdf-ns-builders' import { cc } from '@cube-creator/core/namespace' import { SELECT } from '@tpluscode/sparql-builder' diff --git a/apis/core/lib/domain/dataset/update.ts b/apis/core/lib/domain/dataset/update.ts index c53304f55..04e9b16f0 100644 --- a/apis/core/lib/domain/dataset/update.ts +++ b/apis/core/lib/domain/dataset/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { cc, lindasSchema } from '@cube-creator/core/namespace' import { dcat, hydra, rdf, schema, vcard, _void } from '@tpluscode/rdf-ns-builders' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/domain/dimension-mapping/DimensionMapping.ts b/apis/core/lib/domain/dimension-mapping/DimensionMapping.ts index 66cdf2f7f..bbe62aef1 100644 --- a/apis/core/lib/domain/dimension-mapping/DimensionMapping.ts +++ b/apis/core/lib/domain/dimension-mapping/DimensionMapping.ts @@ -1,4 +1,4 @@ -import { Literal, NamedNode, Term } from 'rdf-js' +import type { Literal, NamedNode, Term } from '@rdfjs/types' import { Constructor, property } from '@tpluscode/rdfine' import { prov, rdf, schema } from '@tpluscode/rdf-ns-builders' import { Dictionary } from '@rdfine/prov' diff --git a/apis/core/lib/domain/dimension-mapping/update.ts b/apis/core/lib/domain/dimension-mapping/update.ts index 1583596d4..5c7a0eccb 100644 --- a/apis/core/lib/domain/dimension-mapping/update.ts +++ b/apis/core/lib/domain/dimension-mapping/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import error from 'http-errors' import { Dictionary } from '@rdfine/prov' diff --git a/apis/core/lib/domain/dimension/DimensionMetadataCollection.ts b/apis/core/lib/domain/dimension/DimensionMetadataCollection.ts index 70355c1c4..21575f001 100644 --- a/apis/core/lib/domain/dimension/DimensionMetadataCollection.ts +++ b/apis/core/lib/domain/dimension/DimensionMetadataCollection.ts @@ -1,4 +1,4 @@ -import { BlankNode, DatasetCore, NamedNode, Term } from 'rdf-js' +import type { BlankNode, DatasetCore, NamedNode, Term } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { Constructor } from '@tpluscode/rdfine' import type { Organization } from '@rdfine/schema' diff --git a/apis/core/lib/domain/dimension/update.ts b/apis/core/lib/domain/dimension/update.ts index 1dd4a08db..4cd1869cb 100644 --- a/apis/core/lib/domain/dimension/update.ts +++ b/apis/core/lib/domain/dimension/update.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad, Term } from 'rdf-js' +import type { NamedNode, Quad, Term } from '@rdfjs/types' import clownface, { GraphPointer } from 'clownface' import TermSet from '@rdfjs/term-set' import $rdf from 'rdf-ext' diff --git a/apis/core/lib/domain/errors/deleteCurrent.ts b/apis/core/lib/domain/errors/deleteCurrent.ts index f9794a1a2..07edee29d 100644 --- a/apis/core/lib/domain/errors/deleteCurrent.ts +++ b/apis/core/lib/domain/errors/deleteCurrent.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { DELETE } from '@tpluscode/sparql-builder' import { cc } from '@cube-creator/core/namespace' import { schema } from '@tpluscode/rdf-ns-builders/strict' diff --git a/apis/core/lib/domain/identifiers.ts b/apis/core/lib/domain/identifiers.ts index 301e716d6..963c16c16 100644 --- a/apis/core/lib/domain/identifiers.ts +++ b/apis/core/lib/domain/identifiers.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import UrlSlugify from 'url-slugify' import $rdf from 'rdf-ext' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/domain/job/create.ts b/apis/core/lib/domain/job/create.ts index e27527e35..4f352947b 100644 --- a/apis/core/lib/domain/job/create.ts +++ b/apis/core/lib/domain/job/create.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import $rdf from 'rdf-ext' import { cc } from '@cube-creator/core/namespace' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/domain/job/update.ts b/apis/core/lib/domain/job/update.ts index 258ab7bd7..e257fcfef 100644 --- a/apis/core/lib/domain/job/update.ts +++ b/apis/core/lib/domain/job/update.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { Job, JobMixin, ImportProject, Dataset, CsvProject } from '@cube-creator/model' import { isPublishJob, isTransformJob, JobErrorMixin } from '@cube-creator/model/Job' diff --git a/apis/core/lib/domain/observations/index.ts b/apis/core/lib/domain/observations/index.ts index da4d27fd0..c059bb479 100644 --- a/apis/core/lib/domain/observations/index.ts +++ b/apis/core/lib/domain/observations/index.ts @@ -1,4 +1,4 @@ -import { Quad, Term } from 'rdf-js' +import type { Quad, Term } from '@rdfjs/types' import { Collection, IriTemplate } from '@rdfine/hydra' import { AnyPointer, GraphPointer } from 'clownface' import { rdf } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/observations/lib/index.ts b/apis/core/lib/domain/observations/lib/index.ts index b742e4534..47a10bfd5 100644 --- a/apis/core/lib/domain/observations/lib/index.ts +++ b/apis/core/lib/domain/observations/lib/index.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import CubeQuery from 'rdf-cube-view-query' import { Source } from 'rdf-cube-view-query/lib/Source' import { View } from 'rdf-cube-view-query/lib/View' diff --git a/apis/core/lib/domain/organization/Organization.ts b/apis/core/lib/domain/organization/Organization.ts index e5f7fc5ca..328654189 100644 --- a/apis/core/lib/domain/organization/Organization.ts +++ b/apis/core/lib/domain/organization/Organization.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { Constructor } from '@tpluscode/rdfine' import { Organization } from '@rdfine/schema' import { schema } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/organization/query.ts b/apis/core/lib/domain/organization/query.ts index 4e94b6787..77482c728 100644 --- a/apis/core/lib/domain/organization/query.ts +++ b/apis/core/lib/domain/organization/query.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { CsvMapping, Table } from '@cube-creator/model' import { ASK, SELECT } from '@tpluscode/sparql-builder' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/queries/column-mapping.ts b/apis/core/lib/domain/queries/column-mapping.ts index dabbfc482..63803b9ff 100644 --- a/apis/core/lib/domain/queries/column-mapping.ts +++ b/apis/core/lib/domain/queries/column-mapping.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { ASK, SELECT } from '@tpluscode/sparql-builder' import { cc } from '@cube-creator/core/namespace' import { streamClient, parsingClient } from '../../query-client' @@ -13,23 +13,23 @@ export async function dimensionIsUsedByOtherMapping(columnMapping: Term, client ?deletedMapping a ${cc.ColumnMapping} ; ${cc.targetProperty} ?deletedTargetProperty . } - + graph ?table { ?table a ${cc.ObservationTable} ; ${cc.columnMapping} ?deletedMapping ; ${cc.csvMapping} ?csvMapping ; } - + graph ?otherTable { ?otherTable a ${cc.ObservationTable} ; ${cc.csvMapping} ?csvMapping ; ${cc.columnMapping} ?otherMapping ; } - + graph ?otherMapping { ?otherMapping ${cc.targetProperty} ?targetProperty . } - + filter ( ?deletedTargetProperty = ?targetProperty ) filter ( ?otherMapping != ?deletedMapping ) ` diff --git a/apis/core/lib/domain/queries/csv-source.ts b/apis/core/lib/domain/queries/csv-source.ts index b9ece9bcd..137afc524 100644 --- a/apis/core/lib/domain/queries/csv-source.ts +++ b/apis/core/lib/domain/queries/csv-source.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { ASK } from '@tpluscode/sparql-builder' import { cc } from '@cube-creator/core/namespace' import { schema } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/queries/cube-data.ts b/apis/core/lib/domain/queries/cube-data.ts index c5fa09568..e307397a9 100644 --- a/apis/core/lib/domain/queries/cube-data.ts +++ b/apis/core/lib/domain/queries/cube-data.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import { DESCRIBE } from '@tpluscode/sparql-builder' import { ParsingClient } from 'sparql-http-client/ParsingClient' diff --git a/apis/core/lib/domain/queries/cube.ts b/apis/core/lib/domain/queries/cube.ts index 42b81eca5..0d48306ce 100644 --- a/apis/core/lib/domain/queries/cube.ts +++ b/apis/core/lib/domain/queries/cube.ts @@ -1,5 +1,5 @@ -import { NamedNode, Stream, Term } from 'rdf-js' import { Readable } from 'stream' +import type { NamedNode, Stream, Term } from '@rdfjs/types' import { CONSTRUCT, SELECT, sparql } from '@tpluscode/sparql-builder' import StreamClient from 'sparql-http-client/StreamClient' import * as ns from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/queries/dimension-mappings.ts b/apis/core/lib/domain/queries/dimension-mappings.ts index 2166bbf5d..3abb17657 100644 --- a/apis/core/lib/domain/queries/dimension-mappings.ts +++ b/apis/core/lib/domain/queries/dimension-mappings.ts @@ -1,5 +1,5 @@ -import { Literal, NamedNode, Term } from 'rdf-js' import { Readable } from 'stream' +import type { Literal, NamedNode, Term } from '@rdfjs/types' import { SELECT } from '@tpluscode/sparql-builder' import { sparql, SparqlTemplateResult } from '@tpluscode/rdf-string' import { rdf, schema, sh } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/queries/dimension-metadata.ts b/apis/core/lib/domain/queries/dimension-metadata.ts index 7b3440d6a..410adf4bc 100644 --- a/apis/core/lib/domain/queries/dimension-metadata.ts +++ b/apis/core/lib/domain/queries/dimension-metadata.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { CONSTRUCT, SELECT } from '@tpluscode/sparql-builder' import { dcterms, rdfs, schema } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/lib/domain/queries/observations.ts b/apis/core/lib/domain/queries/observations.ts index 20d7d17f9..052d83155 100644 --- a/apis/core/lib/domain/queries/observations.ts +++ b/apis/core/lib/domain/queries/observations.ts @@ -1,4 +1,4 @@ -import { Term, Quad } from 'rdf-js' +import type { Term, Quad } from '@rdfjs/types' import { CONSTRUCT } from '@tpluscode/sparql-builder' import { schema } from '@tpluscode/rdf-ns-builders' import { parsingClient } from '../../query-client' diff --git a/apis/core/lib/domain/queries/resources-types.ts b/apis/core/lib/domain/queries/resources-types.ts index f51d0062b..a91bcf047 100644 --- a/apis/core/lib/domain/queries/resources-types.ts +++ b/apis/core/lib/domain/queries/resources-types.ts @@ -1,4 +1,4 @@ -import { Term, Quad } from 'rdf-js' +import type { Term, Quad } from '@rdfjs/types' import { CONSTRUCT } from '@tpluscode/sparql-builder' import { rdf } from '@tpluscode/rdf-ns-builders' import env from '@cube-creator/core/env' diff --git a/apis/core/lib/domain/queries/table.ts b/apis/core/lib/domain/queries/table.ts index 05e7e7907..672e2db43 100644 --- a/apis/core/lib/domain/queries/table.ts +++ b/apis/core/lib/domain/queries/table.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { SELECT } from '@tpluscode/sparql-builder' import { CsvMapping, Table } from '@cube-creator/model' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/table/Table.ts b/apis/core/lib/domain/table/Table.ts index c91689903..e60be428c 100644 --- a/apis/core/lib/domain/table/Table.ts +++ b/apis/core/lib/domain/table/Table.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { Constructor, property } from '@tpluscode/rdfine' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import { CsvColumn, Table } from '@cube-creator/model' diff --git a/apis/core/lib/domain/table/create.ts b/apis/core/lib/domain/table/create.ts index 8a8756590..64ba02876 100644 --- a/apis/core/lib/domain/table/create.ts +++ b/apis/core/lib/domain/table/create.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { csvw, schema, xsd } from '@tpluscode/rdf-ns-builders' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/lib/domain/table/csvw.ts b/apis/core/lib/domain/table/csvw.ts index 886fcaa90..ea2753da4 100644 --- a/apis/core/lib/domain/table/csvw.ts +++ b/apis/core/lib/domain/table/csvw.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import * as Table from '@cube-creator/model/Table' import * as Csvw from '@rdfine/csvw' import { NotFoundError } from '@cube-creator/api-errors' diff --git a/apis/core/lib/domain/table/delete.ts b/apis/core/lib/domain/table/delete.ts index d2ccc6c65..e96b307a9 100644 --- a/apis/core/lib/domain/table/delete.ts +++ b/apis/core/lib/domain/table/delete.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import { ResourceStore } from '../../ResourceStore' import * as TableQueries from '../queries/table' diff --git a/apis/core/lib/handlers/dataset.ts b/apis/core/lib/handlers/dataset.ts index 4661d43e3..7823cf606 100644 --- a/apis/core/lib/handlers/dataset.ts +++ b/apis/core/lib/handlers/dataset.ts @@ -1,5 +1,5 @@ -import { Term } from 'rdf-js' import { PassThrough } from 'stream' +import type { Term } from '@rdfjs/types' import asyncMiddleware from 'middleware-async' import clownface from 'clownface' import parsePreferHeader from 'parse-prefer-header' diff --git a/apis/core/lib/handlers/dimension-mapping.ts b/apis/core/lib/handlers/dimension-mapping.ts index a13ab14dc..0eabadfd2 100644 --- a/apis/core/lib/handlers/dimension-mapping.ts +++ b/apis/core/lib/handlers/dimension-mapping.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import asyncMiddleware from 'middleware-async' import { protectedResource } from '@hydrofoil/labyrinth/resource' import { Enrichment } from '@hydrofoil/labyrinth/lib/middleware/preprocessResource' diff --git a/apis/core/lib/handlers/dimension.ts b/apis/core/lib/handlers/dimension.ts index 1b6f9fefb..6bd93a2a6 100644 --- a/apis/core/lib/handlers/dimension.ts +++ b/apis/core/lib/handlers/dimension.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { protectedResource } from '@hydrofoil/labyrinth/resource' import { Enrichment } from '@hydrofoil/labyrinth/lib/middleware/preprocessResource' import asyncMiddleware from 'middleware-async' diff --git a/apis/core/lib/handlers/jobs.ts b/apis/core/lib/handlers/jobs.ts index e5647df10..5a6a643f4 100644 --- a/apis/core/lib/handlers/jobs.ts +++ b/apis/core/lib/handlers/jobs.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import asyncMiddleware from 'middleware-async' import { protectedResource } from '@hydrofoil/labyrinth/resource' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/middleware/shacl.ts b/apis/core/lib/middleware/shacl.ts index 3ddd7e47e..10489f172 100644 --- a/apis/core/lib/middleware/shacl.ts +++ b/apis/core/lib/middleware/shacl.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import * as expressMiddlewareShacl from 'hydra-box-middleware-shacl' import ResourceStoreImpl from '../ResourceStore' import { streamClient } from '../query-client' diff --git a/apis/core/lib/pipeline/trigger.ts b/apis/core/lib/pipeline/trigger.ts index 7a3e49f63..ea6027f71 100644 --- a/apis/core/lib/pipeline/trigger.ts +++ b/apis/core/lib/pipeline/trigger.ts @@ -1,5 +1,5 @@ import { URLSearchParams } from 'url' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import nodeFetch, { RequestInit, Response } from 'node-fetch' import env from '@cube-creator/core/env' import { GraphPointer } from 'clownface' diff --git a/apis/core/lib/resources/hydraManages.ts b/apis/core/lib/resources/hydraManages.ts index 93ec8a037..ba9d510c6 100644 --- a/apis/core/lib/resources/hydraManages.ts +++ b/apis/core/lib/resources/hydraManages.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { GraphPointer } from 'clownface' import { hydra } from '@tpluscode/rdf-ns-builders' diff --git a/apis/core/package.json b/apis/core/package.json index e1c774663..169cee303 100644 --- a/apis/core/package.json +++ b/apis/core/package.json @@ -92,7 +92,7 @@ "@types/once": "^1.4.0", "@types/parse-prefer-header": "^1.0.1", "@types/rdf-ext": "^1.3.8", - "@types/rdf-js": "^4.0.0", + "@rdfjs/types": "^1.1.0", "@types/rdf-transform-triple-to-quad": "^1.0.0", "@types/rdfjs__express-handler": "^1.1.1", "@types/rdfjs__fetch": "^2", diff --git a/apis/core/test/csvw-builder/support.ts b/apis/core/test/csvw-builder/support.ts index 01692c78b..c92c675ba 100644 --- a/apis/core/test/csvw-builder/support.ts +++ b/apis/core/test/csvw-builder/support.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Column, Table } from '@rdfine/csvw' export function findColumn(table: Table, nameOrProp: string | NamedNode): Column | undefined { diff --git a/apis/core/test/domain/column-mapping/create.test.ts b/apis/core/test/domain/column-mapping/create.test.ts index 02835bbe5..2eb1a2241 100644 --- a/apis/core/test/domain/column-mapping/create.test.ts +++ b/apis/core/test/domain/column-mapping/create.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/column-mapping/delete.test.ts b/apis/core/test/domain/column-mapping/delete.test.ts index f9aebb0e0..79fb02b91 100644 --- a/apis/core/test/domain/column-mapping/delete.test.ts +++ b/apis/core/test/domain/column-mapping/delete.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/column-mapping/update.test.ts b/apis/core/test/domain/column-mapping/update.test.ts index 8cec9d736..731efa576 100644 --- a/apis/core/test/domain/column-mapping/update.test.ts +++ b/apis/core/test/domain/column-mapping/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/csv-source/replace.test.ts b/apis/core/test/domain/csv-source/replace.test.ts index ac4fdb0f1..7564c7395 100644 --- a/apis/core/test/domain/csv-source/replace.test.ts +++ b/apis/core/test/domain/csv-source/replace.test.ts @@ -1,6 +1,6 @@ import * as fs from 'fs' import * as path from 'path' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/csv-source/update.test.ts b/apis/core/test/domain/csv-source/update.test.ts index 8d233498f..831343d7f 100644 --- a/apis/core/test/domain/csv-source/update.test.ts +++ b/apis/core/test/domain/csv-source/update.test.ts @@ -1,7 +1,7 @@ import * as fs from 'fs' import * as path from 'path' import { Readable } from 'stream' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/cube-projects/create.test.ts b/apis/core/test/domain/cube-projects/create.test.ts index 46fb7f8cc..c5962e2bc 100644 --- a/apis/core/test/domain/cube-projects/create.test.ts +++ b/apis/core/test/domain/cube-projects/create.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach, afterEach } from 'mocha' import { expect } from 'chai' import clownface from 'clownface' diff --git a/apis/core/test/domain/cube-projects/export.test.ts b/apis/core/test/domain/cube-projects/export.test.ts index 738a5a36c..5bf3f6403 100644 --- a/apis/core/test/domain/cube-projects/export.test.ts +++ b/apis/core/test/domain/cube-projects/export.test.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import { before, describe, it } from 'mocha' import { expect } from 'chai' import { cc } from '@cube-creator/core/namespace' diff --git a/apis/core/test/domain/cube-projects/import.test.ts b/apis/core/test/domain/cube-projects/import.test.ts index 1b83153a8..d2ff8d806 100644 --- a/apis/core/test/domain/cube-projects/import.test.ts +++ b/apis/core/test/domain/cube-projects/import.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach, afterEach } from 'mocha' import clownface, { GraphPointer } from 'clownface' import { blankNode, namedNode } from '@cube-creator/testing/clownface' diff --git a/apis/core/test/domain/cube-projects/update.test.ts b/apis/core/test/domain/cube-projects/update.test.ts index 3a78437e8..f4c5970ca 100644 --- a/apis/core/test/domain/cube-projects/update.test.ts +++ b/apis/core/test/domain/cube-projects/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach, afterEach } from 'mocha' import { expect } from 'chai' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/core/test/domain/dataset/update.test.ts b/apis/core/test/domain/dataset/update.test.ts index c165ae5cf..15ecfb637 100644 --- a/apis/core/test/domain/dataset/update.test.ts +++ b/apis/core/test/domain/dataset/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/dimension-mapping/DimensionMappings.test.ts b/apis/core/test/domain/dimension-mapping/DimensionMappings.test.ts index f40d9a222..d36464602 100644 --- a/apis/core/test/domain/dimension-mapping/DimensionMappings.test.ts +++ b/apis/core/test/domain/dimension-mapping/DimensionMappings.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { fromPointer } from '@rdfine/prov/lib/Dictionary' import { GraphPointer } from 'clownface' diff --git a/apis/core/test/domain/dimension-mapping/update.test.ts b/apis/core/test/domain/dimension-mapping/update.test.ts index de50d25ac..ee870e195 100644 --- a/apis/core/test/domain/dimension-mapping/update.test.ts +++ b/apis/core/test/domain/dimension-mapping/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/dimension/update.test.ts b/apis/core/test/domain/dimension/update.test.ts index 56918944f..caa82d85c 100644 --- a/apis/core/test/domain/dimension/update.test.ts +++ b/apis/core/test/domain/dimension/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/core/test/domain/job/update.test.ts b/apis/core/test/domain/job/update.test.ts index 9647e5dc4..39c195bd0 100644 --- a/apis/core/test/domain/job/update.test.ts +++ b/apis/core/test/domain/job/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/core/test/domain/observations/index.test.ts b/apis/core/test/domain/observations/index.test.ts index 7e68943ff..20be9d16f 100644 --- a/apis/core/test/domain/observations/index.test.ts +++ b/apis/core/test/domain/observations/index.test.ts @@ -1,4 +1,4 @@ -import { Quad, Term } from 'rdf-js' +import type { Quad, Term } from '@rdfjs/types' import { describe, it, beforeEach, before, after } from 'mocha' import { expect } from 'chai' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/core/test/domain/observations/lib/index.test.ts b/apis/core/test/domain/observations/lib/index.test.ts index c8bb00559..422ed9996 100644 --- a/apis/core/test/domain/observations/lib/index.test.ts +++ b/apis/core/test/domain/observations/lib/index.test.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { describe, it, beforeEach, before } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/queries/tabel.test.ts b/apis/core/test/domain/queries/tabel.test.ts index 8e33329ee..439f3af64 100644 --- a/apis/core/test/domain/queries/tabel.test.ts +++ b/apis/core/test/domain/queries/tabel.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { beforeEach, describe, it } from 'mocha' import { expect } from 'chai' import $rdf from 'rdf-ext' diff --git a/apis/core/test/domain/table/create.test.ts b/apis/core/test/domain/table/create.test.ts index 3d139112b..312cb9b97 100644 --- a/apis/core/test/domain/table/create.test.ts +++ b/apis/core/test/domain/table/create.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/table/delete.test.ts b/apis/core/test/domain/table/delete.test.ts index cb41d400f..40d6e8cb6 100644 --- a/apis/core/test/domain/table/delete.test.ts +++ b/apis/core/test/domain/table/delete.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/domain/table/update.test.ts b/apis/core/test/domain/table/update.test.ts index 57148af1e..ab6445ca0 100644 --- a/apis/core/test/domain/table/update.test.ts +++ b/apis/core/test/domain/table/update.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import sinon from 'sinon' diff --git a/apis/core/test/handlers/dimension-mapping.test.ts b/apis/core/test/handlers/dimension-mapping.test.ts index 7b56317ec..eb625053a 100644 --- a/apis/core/test/handlers/dimension-mapping.test.ts +++ b/apis/core/test/handlers/dimension-mapping.test.ts @@ -1,4 +1,4 @@ -import { Literal } from 'rdf-js' +import type { Literal } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { Request } from 'express' import sinon from 'sinon' diff --git a/apis/core/test/handlers/dimension.test.ts b/apis/core/test/handlers/dimension.test.ts index 71e2dee89..cdf2afab1 100644 --- a/apis/core/test/handlers/dimension.test.ts +++ b/apis/core/test/handlers/dimension.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { before, beforeEach, describe, it } from 'mocha' import { ccClients } from '@cube-creator/testing/lib' import { insertTestProject } from '@cube-creator/testing/lib/seedData' diff --git a/apis/core/test/shapes/dimension.test.ts b/apis/core/test/shapes/dimension.test.ts index dcbad514f..a4171721d 100644 --- a/apis/core/test/shapes/dimension.test.ts +++ b/apis/core/test/shapes/dimension.test.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import $rdf from 'rdf-ext' import toStream from 'string-to-stream' import Parser from '@rdfjs/parser-n3' diff --git a/apis/core/test/support/TestResourceStore.ts b/apis/core/test/support/TestResourceStore.ts index bdd934597..3140ad4a3 100644 --- a/apis/core/test/support/TestResourceStore.ts +++ b/apis/core/test/support/TestResourceStore.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import DatasetExt from 'rdf-ext/lib/Dataset' import clownface, { GraphPointer } from 'clownface' import TermMap from '@rdfjs/term-map' diff --git a/apis/errors/index.ts b/apis/errors/index.ts index bb79113d8..7695fc6fc 100644 --- a/apis/errors/index.ts +++ b/apis/errors/index.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import type { GraphPointer } from 'clownface' import { ForbiddenMapper, UnauthorizedMapper } from './auth' import { DomainErrorMapper } from './domain' diff --git a/apis/shared-dimensions/bootstrap/index.ts b/apis/shared-dimensions/bootstrap/index.ts index 200f91488..c4961f3ec 100644 --- a/apis/shared-dimensions/bootstrap/index.ts +++ b/apis/shared-dimensions/bootstrap/index.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import namespace from '@rdfjs/namespace' import clownface, { GraphPointer } from 'clownface' import $rdf from 'rdf-ext' diff --git a/apis/shared-dimensions/lib/domain/hierarchies.ts b/apis/shared-dimensions/lib/domain/hierarchies.ts index 56cb55cd7..041b1b4d7 100644 --- a/apis/shared-dimensions/lib/domain/hierarchies.ts +++ b/apis/shared-dimensions/lib/domain/hierarchies.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { CONSTRUCT, SELECT } from '@tpluscode/sparql-builder' import { md, meta } from '@cube-creator/core/namespace' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/shared-dimensions/lib/domain/resource.ts b/apis/shared-dimensions/lib/domain/resource.ts index b77960aec..39115d077 100644 --- a/apis/shared-dimensions/lib/domain/resource.ts +++ b/apis/shared-dimensions/lib/domain/resource.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import $rdf from 'rdf-ext' import { sparql } from '@tpluscode/rdf-string' import { AnyPointer, GraphPointer } from 'clownface' diff --git a/apis/shared-dimensions/lib/domain/shared-dimension-term.ts b/apis/shared-dimensions/lib/domain/shared-dimension-term.ts index ae692f17a..609020af2 100644 --- a/apis/shared-dimensions/lib/domain/shared-dimension-term.ts +++ b/apis/shared-dimensions/lib/domain/shared-dimension-term.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { hydra, rdf, schema } from '@tpluscode/rdf-ns-builders' import { GraphPointer } from 'clownface' import { DomainError } from '@cube-creator/api-errors' diff --git a/apis/shared-dimensions/lib/domain/shared-dimension.ts b/apis/shared-dimensions/lib/domain/shared-dimension.ts index f1825a29d..29f556a59 100644 --- a/apis/shared-dimensions/lib/domain/shared-dimension.ts +++ b/apis/shared-dimensions/lib/domain/shared-dimension.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad, Stream, Term } from 'rdf-js' +import type { NamedNode, Quad, Stream, Term } from '@rdfjs/types' import clownface, { GraphPointer, MultiPointer } from 'clownface' import $rdf from 'rdf-ext' import through2 from 'through2' diff --git a/apis/shared-dimensions/lib/domain/shared-dimension/import.ts b/apis/shared-dimensions/lib/domain/shared-dimension/import.ts index a7655d752..56d962a04 100644 --- a/apis/shared-dimensions/lib/domain/shared-dimension/import.ts +++ b/apis/shared-dimensions/lib/domain/shared-dimension/import.ts @@ -1,6 +1,6 @@ import { createReadStream } from 'fs' import path from 'path' -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import httpError, { BadRequest } from 'http-errors' import { Files } from '@cube-creator/express/multipart' import $rdf from 'rdf-ext' diff --git a/apis/shared-dimensions/lib/domain/shared-dimension/queries.ts b/apis/shared-dimensions/lib/domain/shared-dimension/queries.ts index 89176e91e..f42b6260a 100644 --- a/apis/shared-dimensions/lib/domain/shared-dimension/queries.ts +++ b/apis/shared-dimensions/lib/domain/shared-dimension/queries.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { DELETE, WITH } from '@tpluscode/sparql-builder' import { VALUES } from '@tpluscode/sparql-builder/expressions' import { schema } from '@tpluscode/rdf-ns-builders/strict' diff --git a/apis/shared-dimensions/lib/domain/shared-dimensions.ts b/apis/shared-dimensions/lib/domain/shared-dimensions.ts index 3c6df4bc3..e95775f3f 100644 --- a/apis/shared-dimensions/lib/domain/shared-dimensions.ts +++ b/apis/shared-dimensions/lib/domain/shared-dimensions.ts @@ -1,5 +1,5 @@ -import { Quad, Stream, Term } from 'rdf-js' import path from 'path' +import type { Quad, Stream, Term } from '@rdfjs/types' import { CONSTRUCT } from '@tpluscode/sparql-builder' import { hydra, rdf, schema, sh } from '@tpluscode/rdf-ns-builders' import { md, meta } from '@cube-creator/core/namespace' diff --git a/apis/shared-dimensions/lib/handlers/collection.ts b/apis/shared-dimensions/lib/handlers/collection.ts index 11fc1e97a..d3f89c6be 100644 --- a/apis/shared-dimensions/lib/handlers/collection.ts +++ b/apis/shared-dimensions/lib/handlers/collection.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import $rdf from 'rdf-ext' import clownface from 'clownface' import { hydra, rdf } from '@tpluscode/rdf-ns-builders' diff --git a/apis/shared-dimensions/lib/handlers/hierarchy.ts b/apis/shared-dimensions/lib/handlers/hierarchy.ts index dc5ceb604..15b93cabc 100644 --- a/apis/shared-dimensions/lib/handlers/hierarchy.ts +++ b/apis/shared-dimensions/lib/handlers/hierarchy.ts @@ -1,4 +1,4 @@ -import { Quad } from 'rdf-js' +import type { Quad } from '@rdfjs/types' import { dcterms, sd } from '@tpluscode/rdf-ns-builders' import { asyncMiddleware } from 'middleware-async' import $rdf from 'rdf-ext' diff --git a/apis/shared-dimensions/lib/handlers/shared-dimensions.ts b/apis/shared-dimensions/lib/handlers/shared-dimensions.ts index 53de4f91f..71b29ade7 100644 --- a/apis/shared-dimensions/lib/handlers/shared-dimensions.ts +++ b/apis/shared-dimensions/lib/handlers/shared-dimensions.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import { hydra, oa, schema } from '@tpluscode/rdf-ns-builders' import { asyncMiddleware } from 'middleware-async' import { protectedResource } from '@hydrofoil/labyrinth/resource' diff --git a/apis/shared-dimensions/lib/loader.ts b/apis/shared-dimensions/lib/loader.ts index 0e2691cfc..bd7f67aca 100644 --- a/apis/shared-dimensions/lib/loader.ts +++ b/apis/shared-dimensions/lib/loader.ts @@ -1,5 +1,5 @@ -import { NamedNode } from 'rdf-js' import { PassThrough } from 'stream' +import type { NamedNode } from '@rdfjs/types' import { SELECT } from '@tpluscode/sparql-builder' import type HydraBox from 'hydra-box' import { rdf } from '@tpluscode/rdf-ns-builders' diff --git a/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts b/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts index 2cfcd73da..3a5972072 100644 --- a/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts +++ b/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts @@ -1,5 +1,5 @@ -import { Quad, Stream, Term } from 'rdf-js' import { Readable } from 'stream' +import type { Quad, Stream, Term } from '@rdfjs/types' import express from 'express' import asyncMiddleware from 'middleware-async' import through2 from 'through2' diff --git a/apis/shared-dimensions/lib/query.ts b/apis/shared-dimensions/lib/query.ts index ef5651a6d..d9277585a 100644 --- a/apis/shared-dimensions/lib/query.ts +++ b/apis/shared-dimensions/lib/query.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import namespace from '@rdfjs/namespace' import $rdf from 'rdf-ext' import { sparql } from '@tpluscode/sparql-builder' diff --git a/apis/shared-dimensions/lib/rewrite.ts b/apis/shared-dimensions/lib/rewrite.ts index 7576b26e5..7c9241f6b 100644 --- a/apis/shared-dimensions/lib/rewrite.ts +++ b/apis/shared-dimensions/lib/rewrite.ts @@ -1,4 +1,4 @@ -import { Quad, Term } from 'rdf-js' +import type { Quad, Term } from '@rdfjs/types' import $rdf from 'rdf-ext' import clownface, { GraphPointer } from 'clownface' import env from './env' diff --git a/apis/shared-dimensions/lib/shapes/dynamic-properties.ts b/apis/shared-dimensions/lib/shapes/dynamic-properties.ts index a63c3a6ba..eb03bacd2 100644 --- a/apis/shared-dimensions/lib/shapes/dynamic-properties.ts +++ b/apis/shared-dimensions/lib/shapes/dynamic-properties.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode, Quad } from 'rdf-js' +import type { DatasetCore, NamedNode, Quad } from '@rdfjs/types' import { dash, hydra, rdf, rdfs, schema, sh, xsd } from '@tpluscode/rdf-ns-builders/strict' import { iso6391, md } from '@cube-creator/core/namespace' import { CONSTRUCT } from '@tpluscode/sparql-builder' diff --git a/apis/shared-dimensions/lib/shapes/index.ts b/apis/shared-dimensions/lib/shapes/index.ts index 541495fb3..32e8e6bfc 100644 --- a/apis/shared-dimensions/lib/shapes/index.ts +++ b/apis/shared-dimensions/lib/shapes/index.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import TermMap from '@rdfjs/term-map' import clownface, { AnyPointer, GraphPointer } from 'clownface' import $rdf from 'rdf-ext' diff --git a/apis/shared-dimensions/lib/store.ts b/apis/shared-dimensions/lib/store.ts index 83e5c5ce8..a0a15c210 100644 --- a/apis/shared-dimensions/lib/store.ts +++ b/apis/shared-dimensions/lib/store.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { GraphPointer } from 'clownface' import $rdf from 'rdf-ext' import { parsingClient } from './sparql' diff --git a/apis/shared-dimensions/lib/store/index.ts b/apis/shared-dimensions/lib/store/index.ts index 0dfbbffac..c0002ab9d 100644 --- a/apis/shared-dimensions/lib/store/index.ts +++ b/apis/shared-dimensions/lib/store/index.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import ParsingClient from 'sparql-http-client/ParsingClient' import clownface, { AnyPointer, GraphPointer } from 'clownface' import { ASK, INSERT, SELECT } from '@tpluscode/sparql-builder' diff --git a/apis/shared-dimensions/test/lib/domain/managed-dimension-term.test.ts b/apis/shared-dimensions/test/lib/domain/managed-dimension-term.test.ts index 2a3cb5793..37e9e0edb 100644 --- a/apis/shared-dimensions/test/lib/domain/managed-dimension-term.test.ts +++ b/apis/shared-dimensions/test/lib/domain/managed-dimension-term.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { expect } from 'chai' import { namedNode } from '@cube-creator/testing/clownface' diff --git a/apis/shared-dimensions/test/lib/domain/managed-dimension.test.ts b/apis/shared-dimensions/test/lib/domain/managed-dimension.test.ts index 3969afaba..d134ae19a 100644 --- a/apis/shared-dimensions/test/lib/domain/managed-dimension.test.ts +++ b/apis/shared-dimensions/test/lib/domain/managed-dimension.test.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import { describe, it, beforeEach, before } from 'mocha' import { expect } from 'chai' import { blankNode, namedNode } from '@cube-creator/testing/clownface' diff --git a/apis/shared-dimensions/test/lib/shapes/dynamic-properties.test.ts b/apis/shared-dimensions/test/lib/shapes/dynamic-properties.test.ts index 942ac5c15..d679af6f1 100644 --- a/apis/shared-dimensions/test/lib/shapes/dynamic-properties.test.ts +++ b/apis/shared-dimensions/test/lib/shapes/dynamic-properties.test.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import { describe, before, beforeEach, it } from 'mocha' import sinon from 'sinon' import clownface, { GraphPointer } from 'clownface' diff --git a/apis/shared-dimensions/test/lib/shapes/index.test.ts b/apis/shared-dimensions/test/lib/shapes/index.test.ts index da5bf41b3..f97dae0e1 100644 --- a/apis/shared-dimensions/test/lib/shapes/index.test.ts +++ b/apis/shared-dimensions/test/lib/shapes/index.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { describe, it, beforeEach } from 'mocha' import { Request } from 'express' import sinon from 'sinon' diff --git a/cli/lib/counters.ts b/cli/lib/counters.ts index 1e1d30e42..2fcd90d93 100644 --- a/cli/lib/counters.ts +++ b/cli/lib/counters.ts @@ -1,4 +1,4 @@ -import { Quad } from 'rdf-js' +import type { Quad } from '@rdfjs/types' import type { Context } from 'barnard59-core/lib/Pipeline' import { PassThrough } from 'readable-stream' import through2 from 'through2' diff --git a/cli/lib/csv.ts b/cli/lib/csv.ts index 8d276d67f..6e1f28a4d 100644 --- a/cli/lib/csv.ts +++ b/cli/lib/csv.ts @@ -1,4 +1,4 @@ -import { Stream } from 'rdf-js' +import type { Stream } from '@rdfjs/types' import { PassThrough } from 'readable-stream' import $rdf from 'rdf-ext' import { readable } from 'duplex-to' diff --git a/cli/lib/cube.ts b/cli/lib/cube.ts index 1765daee9..a383884db 100644 --- a/cli/lib/cube.ts +++ b/cli/lib/cube.ts @@ -1,4 +1,4 @@ -import { DatasetCore, Quad, Term } from 'rdf-js' +import type { DatasetCore, Quad, Term } from '@rdfjs/types' import $rdf from 'rdf-ext' import { cc } from '@cube-creator/core/namespace' import clownface, { GraphPointer } from 'clownface' diff --git a/cli/lib/import/cube.ts b/cli/lib/import/cube.ts index 4591820e4..cfc28bb90 100644 --- a/cli/lib/import/cube.ts +++ b/cli/lib/import/cube.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import type { Context } from 'barnard59-core/lib/Pipeline' import StreamClient from 'sparql-http-client' import { CONSTRUCT } from '@tpluscode/sparql-builder' diff --git a/cli/lib/import/cubeMetadata.ts b/cli/lib/import/cubeMetadata.ts index 6a717c71c..ad18b7c17 100644 --- a/cli/lib/import/cubeMetadata.ts +++ b/cli/lib/import/cubeMetadata.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode, Quad, Term } from 'rdf-js' +import type { DatasetCore, NamedNode, Quad, Term } from '@rdfjs/types' import { cc } from '@cube-creator/core/namespace' import DatasetExt from 'rdf-ext/lib/Dataset' import { dcterms, schema } from '@tpluscode/rdf-ns-builders' diff --git a/cli/lib/import/dimensions.ts b/cli/lib/import/dimensions.ts index bfd694026..984e90b76 100644 --- a/cli/lib/import/dimensions.ts +++ b/cli/lib/import/dimensions.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode, Term } from 'rdf-js' +import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import type { Context } from 'barnard59-core/lib/Pipeline' import ParsingClient from 'sparql-http-client/ParsingClient' import clownface, { AnyContext, AnyPointer, GraphPointer } from 'clownface' diff --git a/cli/lib/job.ts b/cli/lib/job.ts index 60dba3db9..146e4b61e 100644 --- a/cli/lib/job.ts +++ b/cli/lib/job.ts @@ -1,4 +1,4 @@ -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' import stream from 'readable-stream' import { HydraClient } from 'alcaeus/alcaeus' import { Job, Table, TransformJob } from '@cube-creator/model' diff --git a/cli/lib/metadata.ts b/cli/lib/metadata.ts index e97fe9eed..09e316a88 100644 --- a/cli/lib/metadata.ts +++ b/cli/lib/metadata.ts @@ -1,4 +1,4 @@ -import { Literal, NamedNode, Quad } from 'rdf-js' +import type { Literal, NamedNode, Quad } from '@rdfjs/types' import { obj } from 'through2' import $rdf from 'rdf-ext' import { dcat, dcterms, rdf, schema, sh, _void, foaf } from '@tpluscode/rdf-ns-builders' diff --git a/cli/lib/output-filter.ts b/cli/lib/output-filter.ts index 3e1f45322..161a06b43 100644 --- a/cli/lib/output-filter.ts +++ b/cli/lib/output-filter.ts @@ -1,4 +1,4 @@ -import { BlankNode, Quad, Term } from 'rdf-js' +import type { BlankNode, Quad, Term } from '@rdfjs/types' import { csvw, rdf } from '@tpluscode/rdf-ns-builders' import { cc } from '@cube-creator/core/namespace' import type { Context } from 'barnard59-core/lib/Pipeline' diff --git a/cli/lib/output-mapper.ts b/cli/lib/output-mapper.ts index 057808be2..de9e48fcc 100644 --- a/cli/lib/output-mapper.ts +++ b/cli/lib/output-mapper.ts @@ -1,4 +1,4 @@ -import { DatasetCore, Quad, Term } from 'rdf-js' +import type { DatasetCore, Quad, Term } from '@rdfjs/types' import $rdf from 'rdf-ext' import { ImportJob, TransformJob } from '@cube-creator/model' import { HydraClient } from 'alcaeus/alcaeus' diff --git a/cli/lib/publish/patch-stream.ts b/cli/lib/publish/patch-stream.ts index 6ace029e9..223d789d7 100644 --- a/cli/lib/publish/patch-stream.ts +++ b/cli/lib/publish/patch-stream.ts @@ -1,4 +1,4 @@ -import { Dataset } from 'rdf-js' +import type { Dataset } from '@rdfjs/types' import { qudt } from '@tpluscode/rdf-ns-builders' import $rdf from 'rdf-ext' diff --git a/cli/lib/validation.ts b/cli/lib/validation.ts index 22692aa54..e34fb5673 100644 --- a/cli/lib/validation.ts +++ b/cli/lib/validation.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import { turtle } from '@tpluscode/rdf-string' import type { Context } from 'barnard59-core/lib/Pipeline' import { validateQuad } from 'rdf-validate-datatype' diff --git a/cli/lib/variables.ts b/cli/lib/variables.ts index 4d2e2faf3..e72a51abe 100644 --- a/cli/lib/variables.ts +++ b/cli/lib/variables.ts @@ -1,4 +1,4 @@ -import { Literal, NamedNode } from 'rdf-js' +import type { Literal, NamedNode } from '@rdfjs/types' import { HydraClient } from 'alcaeus/alcaeus' import * as Csvw from '@rdfine/csvw' import DatasetExt from 'rdf-ext/lib/Dataset' diff --git a/cli/package.json b/cli/package.json index 0da89c734..4f997eef7 100644 --- a/cli/package.json +++ b/cli/package.json @@ -103,7 +103,7 @@ "@types/node-fetch": "^2.5.7", "@types/once": "^1.4.0", "@types/rdf-ext": "^1.3.5", - "@types/rdf-js": "^4", + "@rdfjs/types": "^1.1.0", "@types/rdf-utils-fs": "^2.1.0", "@types/rdf-validate-datatype": "^0.1", "@types/rdfjs__formats-common": "^2.0.0", diff --git a/cli/test/lib/commands/publish.test.ts b/cli/test/lib/commands/publish.test.ts index 382d4c9e6..817f2eede 100644 --- a/cli/test/lib/commands/publish.test.ts +++ b/cli/test/lib/commands/publish.test.ts @@ -1,4 +1,4 @@ -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import env from '@cube-creator/core/env' import { before, describe, it } from 'mocha' import { expect } from 'chai' diff --git a/cli/test/lib/commands/unlist.test.ts b/cli/test/lib/commands/unlist.test.ts index 39cb15720..ff275bf50 100644 --- a/cli/test/lib/commands/unlist.test.ts +++ b/cli/test/lib/commands/unlist.test.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import env from '@cube-creator/core/env' import { before, describe, it } from 'mocha' import { expect } from 'chai' diff --git a/cli/test/lib/metadata.test.ts b/cli/test/lib/metadata.test.ts index 835c2a691..46cf253a9 100644 --- a/cli/test/lib/metadata.test.ts +++ b/cli/test/lib/metadata.test.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import { insertTestProject } from '@cube-creator/testing/lib/seedData' import { before, describe, it } from 'mocha' import getStream from 'get-stream' diff --git a/packages/core/datatypes.ts b/packages/core/datatypes.ts index 5edd1a7cf..ed40cbdc7 100644 --- a/packages/core/datatypes.ts +++ b/packages/core/datatypes.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { xsd } from '@tpluscode/rdf-ns-builders/strict' export const datatypes: [NamedNode, string[]][] = [ diff --git a/packages/core/namespaces/shapes.ts b/packages/core/namespaces/shapes.ts index a55150465..7ce7e812a 100644 --- a/packages/core/namespaces/shapes.ts +++ b/packages/core/namespaces/shapes.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import namespace from '@rdf-esm/namespace' import env from '../env' diff --git a/packages/core/package.json b/packages/core/package.json index 1ecac9fd4..bf91d3f23 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -15,7 +15,7 @@ "string-to-stream": "^3.0.1" }, "devDependencies": { - "@types/rdf-js": "^4.0.0", + "@rdfjs/types": "^1.1.0", "@types/rdfjs__namespace": "^1.1.3", "@types/rdfjs__parser-n3": "^1.1.2", "@types/sparql-http-client": "^2.2.5" diff --git a/packages/express-rdf-request/index.ts b/packages/express-rdf-request/index.ts index ec765c476..c8b1a1fb8 100644 --- a/packages/express-rdf-request/index.ts +++ b/packages/express-rdf-request/index.ts @@ -1,4 +1,4 @@ -import { NamedNode, Quad } from 'rdf-js' +import type { NamedNode, Quad } from '@rdfjs/types' import express from 'express' import clownface, { GraphPointer } from 'clownface' import $rdf from 'rdf-ext' @@ -10,7 +10,7 @@ declare module 'express-serve-static-core' { } } -declare module 'rdf-js' { +declare module '@rdfjs/types' { // eslint-disable-next-line @typescript-eslint/no-empty-interface interface Stream extends AsyncIterable {} } diff --git a/packages/express/multipart.ts b/packages/express/multipart.ts index efe2dc199..6e81f2af8 100644 --- a/packages/express/multipart.ts +++ b/packages/express/multipart.ts @@ -1,5 +1,5 @@ -import { NamedNode, Stream } from 'rdf-js' import { Readable } from 'stream' +import type { NamedNode, Stream } from '@rdfjs/types' import E, { Router } from 'express' import { parsers } from '@rdfjs-elements/formats-pretty' import once from 'once' diff --git a/packages/model/ColumnMapping.ts b/packages/model/ColumnMapping.ts index 4634fe2f5..95372b23a 100644 --- a/packages/model/ColumnMapping.ts +++ b/packages/model/ColumnMapping.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode, Term } from 'rdf-js' +import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import { Initializer, RdfResource, RdfResourceCore } from '@tpluscode/rdfine/RdfResource' import RdfResourceImpl, { Constructor, namespace, property, ResourceIdentifier } from '@tpluscode/rdfine' import { cc } from '@cube-creator/core/namespace' diff --git a/packages/model/Cube.ts b/packages/model/Cube.ts index 29826b88d..b2afd1c00 100644 --- a/packages/model/Cube.ts +++ b/packages/model/Cube.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { RdfResourceCore } from '@tpluscode/rdfine/RdfResource' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import { Constructor, property } from '@tpluscode/rdfine' diff --git a/packages/model/Dataset.ts b/packages/model/Dataset.ts index 3e13e941e..44b6c4029 100644 --- a/packages/model/Dataset.ts +++ b/packages/model/Dataset.ts @@ -1,4 +1,4 @@ -import { Literal } from 'rdf-js' +import type { Literal } from '@rdfjs/types' import { RdfResource } from '@tpluscode/rdfine/RdfResource' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import { Constructor, property } from '@tpluscode/rdfine' diff --git a/packages/model/DimensionMetadata.ts b/packages/model/DimensionMetadata.ts index b1f105196..ad92cc19d 100644 --- a/packages/model/DimensionMetadata.ts +++ b/packages/model/DimensionMetadata.ts @@ -1,4 +1,4 @@ -import { Literal, NamedNode, Term } from 'rdf-js' +import type { Literal, NamedNode, Term } from '@rdfjs/types' import * as Rdfs from '@rdfine/rdfs' import { Constructor, namespace, property, RdfResource } from '@tpluscode/rdfine' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' diff --git a/packages/model/ImportJob.ts b/packages/model/ImportJob.ts index 51b00f8a0..2090cd766 100644 --- a/packages/model/ImportJob.ts +++ b/packages/model/ImportJob.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Constructor, namespace, property, RdfResource } from '@tpluscode/rdfine' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import { ResourceMixin } from '@rdfine/rdfs' diff --git a/packages/model/Job.ts b/packages/model/Job.ts index fb15b9ab8..ea737be0f 100644 --- a/packages/model/Job.ts +++ b/packages/model/Job.ts @@ -1,4 +1,4 @@ -import { Literal, NamedNode, Term } from 'rdf-js' +import type { Literal, NamedNode, Term } from '@rdfjs/types' import { Constructor, property, RdfResource } from '@tpluscode/rdfine' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import type { Collection } from '@rdfine/hydra' diff --git a/packages/model/MediaObject.ts b/packages/model/MediaObject.ts index 0a2652fd7..2dfadd899 100644 --- a/packages/model/MediaObject.ts +++ b/packages/model/MediaObject.ts @@ -1,4 +1,4 @@ -import type { DatasetCore, NamedNode } from 'rdf-js' +import type { DatasetCore, NamedNode } from '@rdfjs/types' import type * as Schema from '@rdfine/schema' import RdfResourceImpl, { Initializer, RdfResourceCore, ResourceIdentifier } from '@tpluscode/rdfine/RdfResource' import { Constructor, property } from '@tpluscode/rdfine' diff --git a/packages/model/Organization.ts b/packages/model/Organization.ts index d22134ae4..89ef0195e 100644 --- a/packages/model/Organization.ts +++ b/packages/model/Organization.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode, Term } from 'rdf-js' +import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import { Organization, OrganizationMixin as SchemaOrganizationMixin } from '@rdfine/schema' import { Constructor, namespace, property, ResourceIdentifier } from '@tpluscode/rdfine' import { cc } from '@cube-creator/core/namespace' diff --git a/packages/model/Project.ts b/packages/model/Project.ts index 51aa197d6..7906e89ad 100644 --- a/packages/model/Project.ts +++ b/packages/model/Project.ts @@ -1,4 +1,4 @@ -import { DatasetCore, NamedNode } from 'rdf-js' +import type { DatasetCore, NamedNode } from '@rdfjs/types' import { ResourceMixin } from '@rdfine/rdfs' import { Constructor, namespace, property, RdfResource, ResourceIdentifier } from '@tpluscode/rdfine' import type { GraphPointer } from 'clownface' diff --git a/packages/model/Table.ts b/packages/model/Table.ts index f262febbd..5ba78a61d 100644 --- a/packages/model/Table.ts +++ b/packages/model/Table.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import RdfResourceImpl, { RdfResource, Constructor, namespace, property, ResourceIdentifier } from '@tpluscode/rdfine' import type { GraphPointer } from 'clownface' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' diff --git a/packages/model/lib/Link.ts b/packages/model/lib/Link.ts index 056508d9a..6eba55a34 100644 --- a/packages/model/lib/Link.ts +++ b/packages/model/lib/Link.ts @@ -1,4 +1,4 @@ -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import { RdfResource, RdfResourceCore } from '@tpluscode/rdfine/RdfResource' import type { HydraResponse } from 'alcaeus' diff --git a/packages/model/lib/resourceIdentifiers.ts b/packages/model/lib/resourceIdentifiers.ts index fdf4d7d80..993cb0249 100644 --- a/packages/model/lib/resourceIdentifiers.ts +++ b/packages/model/lib/resourceIdentifiers.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { namedNode } from '@rdf-esm/data-model' import { RdfResourceCore } from '@tpluscode/rdfine/RdfResource' diff --git a/packages/model/package.json b/packages/model/package.json index 584646932..ebbb71073 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -19,7 +19,7 @@ "@cube-creator/testing": "^0.1.21", "@types/clownface": "^1", "@types/is-uri": "^1", - "@types/rdf-js": "^4.0.0", + "@rdfjs/types": "^1.1.0", "alcaeus": "^2", "chai": "^4.3.4", "mocha": "^10" diff --git a/packages/shacl-middleware/index.ts b/packages/shacl-middleware/index.ts index feb045fa1..76b24c3a2 100644 --- a/packages/shacl-middleware/index.ts +++ b/packages/shacl-middleware/index.ts @@ -1,4 +1,4 @@ -import { Term, Quad, NamedNode, DatasetCore } from 'rdf-js' +import type { Term, Quad, NamedNode, DatasetCore } from '@rdfjs/types' import { Request, Response } from 'express' import asyncMiddleware from 'middleware-async' import $rdf from 'rdf-ext' diff --git a/packages/shacl-middleware/package.json b/packages/shacl-middleware/package.json index e32835e6e..e15ba5a44 100644 --- a/packages/shacl-middleware/package.json +++ b/packages/shacl-middleware/package.json @@ -20,7 +20,7 @@ "@cube-creator/testing": "^0.1.15", "@rdfjs/term-map": "^1.0.0", "@tpluscode/rdf-string": "^0.2.21", - "@types/rdf-js": "^4", + "@rdfjs/types": "^1.1.0", "@types/rdf-validate-shacl": "^0.4.0", "mocha": "^10", "supertest": "^6.0.0" diff --git a/packages/shacl-middleware/readme.md b/packages/shacl-middleware/readme.md index e7192ded4..8b8187790 100644 --- a/packages/shacl-middleware/readme.md +++ b/packages/shacl-middleware/readme.md @@ -25,7 +25,7 @@ Exported from the package's main module, a factory function requires configurati ```typescript import { shaclMiddleware } from 'hydra-box-middleware-shacl' import express from 'express' -import type { NamedNode, Term, Quad } from 'rdf-js' +import type { NamedNode, Term, Quad } from '@rdfjs/types' import type { GraphPointer } from 'clownface' const app = express() diff --git a/packages/shacl-middleware/test/support/loader.ts b/packages/shacl-middleware/test/support/loader.ts index ce058160f..c3d62d479 100644 --- a/packages/shacl-middleware/test/support/loader.ts +++ b/packages/shacl-middleware/test/support/loader.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import TermMap from '@rdfjs/term-map' import { GraphPointer } from 'clownface' diff --git a/packages/testing/clownface.ts b/packages/testing/clownface.ts index 3204b7e70..e58bb5083 100644 --- a/packages/testing/clownface.ts +++ b/packages/testing/clownface.ts @@ -1,4 +1,4 @@ -import { BlankNode, NamedNode } from 'rdf-js' +import type { BlankNode, NamedNode } from '@rdfjs/types' import clownface, { GraphPointer } from 'clownface' import $rdf from 'rdf-ext' import DatasetExt from 'rdf-ext/lib/Dataset' diff --git a/packages/testing/lib/chaiShapeMatcher.ts b/packages/testing/lib/chaiShapeMatcher.ts index 186b262d4..06d21aa75 100644 --- a/packages/testing/lib/chaiShapeMatcher.ts +++ b/packages/testing/lib/chaiShapeMatcher.ts @@ -1,4 +1,4 @@ -import { BlankNode, DatasetCore, NamedNode } from 'rdf-js' +import type { BlankNode, DatasetCore, NamedNode } from '@rdfjs/types' import chai from 'chai' import type { NodeShape, ValidationResult } from '@rdfine/shacl' import { fromPointer } from '@rdfine/shacl/lib/NodeShape' diff --git a/packages/testing/lib/seedData.ts b/packages/testing/lib/seedData.ts index 221341f0e..e2ea2913b 100644 --- a/packages/testing/lib/seedData.ts +++ b/packages/testing/lib/seedData.ts @@ -1,6 +1,6 @@ import fs from 'fs' import path from 'path' -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' import ParsingClient from 'sparql-http-client/ParsingClient' import StreamClient from 'sparql-http-client/StreamClient' import { parsers } from '@rdfjs/formats-common' diff --git a/packages/testing/middleware.ts b/packages/testing/middleware.ts index 920db7010..49812bcd1 100644 --- a/packages/testing/middleware.ts +++ b/packages/testing/middleware.ts @@ -1,4 +1,4 @@ -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { HydraBox } from 'hydra-box' import express from 'express' import cf, { GraphPointer } from 'clownface' diff --git a/packages/testing/package.json b/packages/testing/package.json index 1aaa33058..279946ad6 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@types/hydra-box": "^0.6.0", - "@types/rdf-js": "^4", + "@rdfjs/types": "^1.1.0", "@types/rdf-transform-triple-to-quad": "^1.0.0", "@types/rdf-validate-shacl": "^0.4.0", "@types/rdfjs__express-handler": "^1.1.2" diff --git a/typings/rdf-cube-view-query/index.d.ts b/typings/rdf-cube-view-query/index.d.ts index ed0ea000b..d1b0d445c 100644 --- a/typings/rdf-cube-view-query/index.d.ts +++ b/typings/rdf-cube-view-query/index.d.ts @@ -36,7 +36,7 @@ declare module 'rdf-cube-view-query/lib/query/ViewQuery' { } declare module 'rdf-cube-view-query/lib/View' { - import { DatasetCore, NamedNode, Term } from 'rdf-js' + import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import type { GraphPointer } from 'clownface' import ViewQuery = require('rdf-cube-view-query/lib/query/ViewQuery') import Node = require('rdf-cube-view-query/lib/Node') @@ -91,7 +91,7 @@ declare module 'rdf-cube-view-query/lib/Source' { } declare module 'rdf-cube-view-query/lib/Cube' { - import { DatasetCore, NamedNode, Term } from 'rdf-js' + import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import Node = require('rdf-cube-view-query/lib/Node') import Source = require('rdf-cube-view-query/lib/Source') @@ -111,7 +111,7 @@ declare module 'rdf-cube-view-query/lib/Cube' { } declare module 'rdf-cube-view-query/lib/Node' { - import { DatasetCore, NamedNode, Term } from 'rdf-js' + import type { DatasetCore, NamedNode, Term } from '@rdfjs/types' import type { GraphPointer } from 'clownface' namespace Node { diff --git a/typings/rdf-parser-px/index.d.ts b/typings/rdf-parser-px/index.d.ts index aae1164c2..60a776b43 100644 --- a/typings/rdf-parser-px/index.d.ts +++ b/typings/rdf-parser-px/index.d.ts @@ -1,6 +1,6 @@ declare module 'rdf-parser-px' { import { Readable, Transform } from 'stream' - import { Sink, Stream } from 'rdf-js' + import type { Sink, Stream } from '@rdfjs/types' interface ColumnMetadata { titles: string | string [] diff --git a/ui/package.json b/ui/package.json index 478c0f5d4..722629484 100644 --- a/ui/package.json +++ b/ui/package.json @@ -79,7 +79,7 @@ "@types/humanize-duration": "^3.27.1", "@types/markdown-it": "^12.2.3", "@types/rdf-ext": "^1.3.11", - "@types/rdf-js": "^4", + "@rdfjs/types": "^1.1.0", "@types/rdfjs__dataset": "^1.0.4", "@types/rdfjs__term-set": "^1.0.2", "@typescript-eslint/eslint-plugin": "^5.0.0", diff --git a/ui/src/api/common.ts b/ui/src/api/common.ts index 2fdda39f5..b018cba77 100644 --- a/ui/src/api/common.ts +++ b/ui/src/api/common.ts @@ -1,5 +1,5 @@ import { RdfResource, RuntimeOperation } from 'alcaeus' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { rdf, schema } from '@tpluscode/rdf-ns-builders' import { Actions } from '@/api/mixins/ApiResource' diff --git a/ui/src/api/errors.ts b/ui/src/api/errors.ts index 273e498a2..b9c9aeebd 100644 --- a/ui/src/api/errors.ts +++ b/ui/src/api/errors.ts @@ -1,6 +1,6 @@ import { HydraResponse } from 'alcaeus' import { RdfResourceCore } from '@tpluscode/rdfine/RdfResource' -import { DatasetCore } from 'rdf-js' +import type { DatasetCore } from '@rdfjs/types' export interface ValidationReport { path: string diff --git a/ui/src/api/index.ts b/ui/src/api/index.ts index a20e98876..23b093b90 100644 --- a/ui/src/api/index.ts +++ b/ui/src/api/index.ts @@ -21,7 +21,7 @@ import * as Models from '@cube-creator/model' import { findNodes } from 'clownface-shacl-path' import { FileLiteral } from '@/forms/FileLiteral' import { GraphPointer } from 'clownface' -import { Term } from 'rdf-js' +import type { Term } from '@rdfjs/types' export const rootURL = window.APP_CONFIG.apiCoreBase const segmentSeparator = '!!' // used to replace slash in URI to prevent escaping diff --git a/ui/src/api/mixins/ApiResource.ts b/ui/src/api/mixins/ApiResource.ts index 56cbf915f..b6eee0ca3 100644 --- a/ui/src/api/mixins/ApiResource.ts +++ b/ui/src/api/mixins/ApiResource.ts @@ -1,7 +1,7 @@ import { Constructor, RdfResource } from '@tpluscode/rdfine' import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory' import { commonActions } from '@/api/common' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { RuntimeOperation } from 'alcaeus' import { displayLanguage } from '@/store/serializers' import { rdfs } from '@tpluscode/rdf-ns-builders' diff --git a/ui/src/api/mixins/Hierarchy.ts b/ui/src/api/mixins/Hierarchy.ts index 3bdc24cb3..182296003 100644 --- a/ui/src/api/mixins/Hierarchy.ts +++ b/ui/src/api/mixins/Hierarchy.ts @@ -1,7 +1,7 @@ import { Constructor, property } from '@tpluscode/rdfine' import { md, meta } from '@cube-creator/core/namespace' import { schema, sh } from '@tpluscode/rdf-ns-builders/strict' -import { NamedNode } from 'rdf-js' +import type { NamedNode } from '@rdfjs/types' import { Hierarchy, NextInHierarchy, Path } from '@/store/types' function pathMixin (base: Base) { diff --git a/ui/src/api/mixins/SharedDimension.ts b/ui/src/api/mixins/SharedDimension.ts index 56db72cf8..7e443d0fd 100644 --- a/ui/src/api/mixins/SharedDimension.ts +++ b/ui/src/api/mixins/SharedDimension.ts @@ -1,6 +1,6 @@ import { Constructor, property } from '@tpluscode/rdfine' import { md, meta } from '@cube-creator/core/namespace' -import { NamedNode, Term } from 'rdf-js' +import type { NamedNode, Term } from '@rdfjs/types' import { Hierarchy } from '@/store/types' import { ThingMixin } from '@rdfine/schema' import { Resource } from 'alcaeus' diff --git a/ui/src/components/CubePreviewDimension.vue b/ui/src/components/CubePreviewDimension.vue index 95d20bd4e..820096efa 100644 --- a/ui/src/components/CubePreviewDimension.vue +++ b/ui/src/components/CubePreviewDimension.vue @@ -45,7 +45,7 @@