@lde/sparql-qlever 0.17.0 → 0.18.0

package/dist/importer.d.ts

@@ -23,13 +23,16 @@ export declare class Importer implements ImporterInterface {
     import(distributions: Distribution[]): Promise<NotSupported | ImportSuccessful | ImportFailed>;
     private doImport;
     private parseTripleCount;
+    /** The QLever that built the index, from the `git-hash` in its metadata:
+     *  QLever has no releases, so the commit is its version. */
+    private parseEngine;
     private cacheInfoPath;
     /**
      * Check whether the cached index is still up to date.
      */
     private isIndexUpToDate;
-    /** Read the triple count from QLever's metadata file. */
-    private readTripleCount;
+    /** Read QLever's metadata file, or an empty string when there is none. */
+    private readMetadata;
     private writeCacheInfo;
     private index;
 }

package/dist/importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,IAAI,iBAAiB,EAC7B,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAyB,YAAY,EAAE,MAAM,cAAc,CAAC;AAOnE,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yJAAyJ;IACzJ,+BAA+B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACpC;AAWD,qBAAa,QAAS,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,OAAO,EAAE,qBAAqB;IAa7B,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAC5B,OAAO,CAAC,YAAY,GAAG,gBAAgB,GAAG,YAAY,CAAC;YAqC5C,QAAQ;IA6DtB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,eAAe;IA0B7B,yDAAyD;YAC3C,eAAe;YAaf,cAAc;YAKd,KAAK;CA8CpB"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,IAAI,iBAAiB,EAC7B,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAyB,YAAY,EAAE,MAAM,cAAc,CAAC;AAOnE,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yJAAyJ;IACzJ,+BAA+B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACpC;AAWD,qBAAa,QAAS,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,OAAO,EAAE,qBAAqB;IAa7B,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAC5B,OAAO,CAAC,YAAY,GAAG,gBAAgB,GAAG,YAAY,CAAC;YAqC5C,QAAQ;IA0EtB,OAAO,CAAC,gBAAgB;IAQxB;gEAC4D;IAC5D,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,eAAe;IA0B7B,0EAA0E;YAC5D,YAAY;YAYZ,cAAc;YAKd,KAAK;CA8CpB"}

package/dist/importer.js

@@ -52,11 +52,12 @@ export class Importer {
     async doImport(distribution) {
         const { path: localFile, headers } = await this.options.downloader.download(distribution);
         if (await this.isIndexUpToDate(localFile)) {
-            const tripleCount = await this.readTripleCount(localFile);
+            const metadata = await this.readMetadata(localFile);
+            const tripleCount = this.parseTripleCount(metadata);
             if (tripleCount === 0) {
                 return new ImportFailed(distribution, 'Index is cached but contains 0 triples');
             }
-            return new ImportSuccessful(distribution, undefined, tripleCount);
+            return new ImportSuccessful(distribution, undefined, tripleCount, [], this.parseEngine(metadata));
         }
         let indexFile = localFile;
         let format;
@@ -91,7 +92,7 @@ export class Importer {
             return new ImportFailed(distribution, 'Indexed 0 triples from distribution');
         }
         await this.writeCacheInfo(localFile);
-        return new ImportSuccessful(distribution, undefined, tripleCount, warnings);
+        return new ImportSuccessful(distribution, undefined, tripleCount, warnings, this.parseEngine(logs));
     }
     parseTripleCount(logs) {
         // Extract num-triples.normal from the metadata JSON that the index
@@ -100,6 +101,12 @@ export class Importer {
         const match = logs.match(/"num-triples":\{[^}]*"normal":(\d+)/);
         return match ? Number(match[1]) : undefined;
     }
+    /** The QLever that built the index, from the `git-hash` in its metadata:
+     *  QLever has no releases, so the commit is its version. */
+    parseEngine(metadata) {
+        const match = metadata.match(/"git-hash"\s*:\s*"([0-9a-f]+)"/);
+        return match ? { name: 'QLever', version: match[1] } : undefined;
+    }
     cacheInfoPath(dataFile) {
         return join(dirname(dataFile), `${this.options.indexName}.cache-info.json`);
     }
@@ -129,15 +136,14 @@ export class Importer {
         }
         return true;
     }
-    /** Read the triple count from QLever's metadata file. */
-    async readTripleCount(dataFile) {
+    /** Read QLever's metadata file, or an empty string when there is none. */
+    async readMetadata(dataFile) {
         try {
             const metadataPath = join(dirname(dataFile), `${this.options.indexName}.meta-data.json`);
-            const raw = await readFile(metadataPath, 'utf-8');
-            return this.parseTripleCount(raw);
+            return await readFile(metadataPath, 'utf-8');
         }
         catch {
-            return undefined;
+            return '';
         }
     }
     async writeCacheInfo(dataFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/sparql-qlever",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
     "directory": "packages/sparql-qlever"
@@ -26,7 +26,7 @@
   "dependencies": {
     "@lde/dataset": "^0.8.0",
     "@lde/distribution-downloader": "^0.7.0",
-    "@lde/sparql-importer": "^0.7.0",
+    "@lde/sparql-importer": "^0.8.0",
     "@lde/sparql-server": "^0.5.0",
     "@lde/task-runner": "^0.3.0",
     "@lde/task-runner-docker": "^0.4.0",