Merge pull request #53 from rubensworks/fix/ts

Migrate typings to @rdfjs/types

lib/hdt.d.ts

@@ -1,44 +1,48 @@
-import * as RDF from "rdf-js";
-
-declare module "hdt" {
-  export interface SearchTermsOpts {
-    limit?: number;
-    position?: "subject" | "predicate" | "object";
-    prefix?: string;
-    subject?: string; // mutually exclusive with prefix and prioritized
-    object?: string, // mutually exclusive with prefix and prioritized
-  }
-
-  export interface SearchLiteralsOpts {
-    limit?: number;
-    offset?: number;
-  }
-
-  export interface SearchLiteralsResult {
-    literals: RDF.Literal[];
-    totalCount: number;
-  }
-
-  export interface SearchTriplesOpts {
-    limit?: number;
-    offset?: number;
-  }
-
-  export interface SearchResult {
-    triples: RDF.Quad[];
-    totalCount: number;
-    hasExactCount: boolean;
-  }
-
-  export interface Document {
-    searchTriples(sub?: RDF.Term, pred?: RDF.Term, obj?: RDF.Term, opts?: SearchTriplesOpts): Promise<SearchResult>;
-    countTriples(sub?: RDF.Term, pred?: RDF.Term, obj?: RDF.Term): Promise<SearchResult>;
-    searchLiterals(substring: string, opts?: SearchLiteralsOpts): Promise<SearchLiteralsResult>;
-    searchTerms(opts?: SearchTermsOpts): Promise<string[]>;
-    close(): Promise<void>;
-    readHeader(): Promise<string>;
-    changeHeader(triples:string, outputFile:string): Promise<Document>;
-  }
-
-  export function fromFile(filename: string, opts?: { dataFactory?: RDF.DataFactory }): Promise<Document>;
+import * as RDF from "@rdfjs/types";
+
+export interface SearchTermsOpts {
+  limit?: number;
+  position?: "subject" | "predicate" | "object";
+  prefix?: string;
+  subject?: string; // mutually exclusive with prefix and prioritized
+  object?: string, // mutually exclusive with prefix and prioritized
+}
+
+export interface SearchLiteralsOpts {
+  limit?: number;
+  offset?: number;
+}
+
+export interface SearchLiteralsResult {
+  literals: RDF.Literal[];
+  totalCount: number;
+}
+
+export interface SearchTriplesOpts {
+  limit?: number;
+  offset?: number;
+}
+
+export interface SearchResult {
+  triples: RDF.Quad[];
+  totalCount: number;
+  hasExactCount: boolean;
 }
+
+export interface Document {
+  searchTriples(sub?: RDF.Term, pred?: RDF.Term, obj?: RDF.Term, opts?: SearchTriplesOpts): Promise<SearchResult>;
+
+  countTriples(sub?: RDF.Term, pred?: RDF.Term, obj?: RDF.Term): Promise<SearchResult>;
+
+  searchLiterals(substring: string, opts?: SearchLiteralsOpts): Promise<SearchLiteralsResult>;
+
+  searchTerms(opts?: SearchTermsOpts): Promise<string[]>;
+
+  close(): Promise<void>;
+
+  readHeader(): Promise<string>;
+
+  changeHeader(triples: string, outputFile: string): Promise<Document>;
+}
+
+export function fromFile(filename: string, opts?: { dataFactory?: RDF.DataFactory }): Promise<Document>;

package.json

@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "minimist": "^1.1.0",
-    "n3": "^1.3.5",
+    "n3": "^1.17.3",
     "nan": "^2.19.0",
-    "rdf-string": "^1.3.1"
+    "rdf-string": "^1.6.3"
   },
   "devDependencies": {
     "eslint": "^5.3.0",