@lde/dataset-registry-client 0.7.0 → 0.7.2

package/dist/client.d.ts

@@ -1,5 +1,8 @@
 import { Dataset } from '@lde/dataset';
+import { DatasetSchema } from './schema.js';
+import { type SchemaSearchInterface } from 'ldkit';
 import { Paginator } from './paginator.js';
+export type SearchCriteria = SchemaSearchInterface<typeof DatasetSchema>;
 export declare class Client {
     private readonly sparqlEndpoint;
     private readonly schema;
@@ -75,7 +78,7 @@ export declare class Client {
             };
         };
     });
-    query(criteria: object): Promise<Paginator<Dataset>>;
+    query(criteria: SearchCriteria): Promise<Paginator<Dataset>>;
     query(constructQuery: string): Promise<Paginator<Dataset>>;
 }
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAgB,MAAM,cAAc,CAAC;AAIrD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,MAAM;IAEf,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,cAAc,EAAE,GAAG,EACnB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAgB;IAGlC,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACpD,KAAK,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;CAqElE"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAgB,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,qBAAqB,EAAwB,MAAM,OAAO,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzE,qBAAa,MAAM;IAEf,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,cAAc,EAAE,GAAG,EACnB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAgB;IAGlC,KAAK,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5D,KAAK,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;CAoFlE"}

package/dist/client.js

@@ -24,9 +24,16 @@ export class Client {
             total = results.length;
             pageSize = total;
         }
+        else if (args.$id) {
+            // Work around LDkit bug: count() ignores $id.
+            // IRI lookups don't need pagination.
+            results = await datasets.find({ where: args });
+            total = results.length;
+            pageSize = total;
+        }
         else {
             // With search criteria the results are paginated.
-            total = await datasets.count({ ...args });
+            total = await datasets.count({ where: args });
             pageSize = 1000;
         }
         return new Paginator(async (offset, limit) => {
@@ -36,8 +43,16 @@ export class Client {
                 // TODO: we could add a convention here like {OFFSET} {LIMIT} in the query string.
                 items = await datasets.query(prepareQuery(args));
             }
+            else if (results) {
+                // Pre-fetched results ($id workaround): return them directly.
+                items = results;
+            }
             else {
-                items = await datasets.find({ ...args, take: limit, skip: offset });
+                items = await datasets.find({
+                    where: args,
+                    take: limit,
+                    skip: offset,
+                });
             }
             return items.map((dataset) => new Dataset({
                 iri: new URL(dataset.$id),

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAelD"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAYA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAwBlD"}

package/dist/query.js

@@ -1,18 +1,21 @@
-import { Generator, Parser } from 'sparqljs';
+import { Parser } from '@traqula/parser-sparql-1-1';
+import { Generator } from '@traqula/generator-sparql-1-1';
+import { AstFactory, } from '@traqula/rules-sparql-1-1';
 import { ldkit, rdf } from 'ldkit/namespaces';
-import { DataFactory } from 'n3';
 const generator = new Generator();
+const F = new AstFactory();
 export function prepareQuery(query) {
     const parsed = new Parser().parse(query);
-    if (parsed.type !== 'query' || 'CONSTRUCT' !== parsed.queryType) {
+    if (parsed.type !== 'query' || parsed.subType !== 'construct') {
         throw new Error('Must be CONSTRUCT query');
     }
-    const template = parsed.template;
-    template.push({
-        subject: template[0].subject,
-        predicate: DataFactory.namedNode(rdf.type),
-        object: DataFactory.namedNode(ldkit.Resource),
-    });
-    parsed.template = template;
-    return generator.stringify(parsed);
+    const construct = parsed;
+    const firstTriple = construct.template.triples[0];
+    // Clone the template triples so we don't mutate the WHERE clause
+    // (CONSTRUCT WHERE shorthand shares the same BGP object).
+    construct.template = F.patternBgp([
+        ...construct.template.triples,
+        F.triple(firstTriple.subject, F.termNamed(F.gen(), rdf.type), F.termNamed(F.gen(), ldkit.Resource)),
+    ], F.gen());
+    return generator.generate(construct);
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@lde/dataset-registry-client",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "repository": {
-    "url": "https://github.com/ldengine/lde",
+    "url": "git+https://github.com/ldelements/lde.git",
     "directory": "packages/dataset-registry-client"
   },
   "type": "module",
@@ -24,14 +24,13 @@
   ],
   "dependencies": {
     "@lde/dataset": "0.7.0",
+    "@traqula/generator-sparql-1-1": "^1.0.3",
+    "@traqula/parser-sparql-1-1": "^1.0.3",
+    "@traqula/rules-sparql-1-1": "^1.0.3",
     "ldkit": "^2.6.0",
-    "n3": "^2.0.1",
-    "sparqljs": "^3.7.4",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@comunica/query-sparql-file": "^5.1.3",
-    "@types/n3": "^1.26.0",
-    "@types/sparqljs": "^3.1.12"
+    "@comunica/query-sparql-file": "^5.1.3"
   }
 }