build(deps): remove old rdf-js packages (closes #1482)

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'

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 {

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'

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'

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 {

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'

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'

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 {

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'

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'

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 {

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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 )
             `

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'

apis/core/lib/domain/queries/cube-data.ts

@@ -1,5 +1,5 @@
-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'
 
 interface DescribeResource {

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'