@here/olp-sdk-dataservice-read 2.0.0 → 3.0.0

package/lib/index.js

@@ -19,7 +19,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/utils/getTile.d.ts

@@ -1,6 +1,7 @@
 import { FetchOptions, HRN, TileKey, OlpClientSettings } from "@here/olp-sdk-core";
 import { Index as QuadTreeIndex } from "@here/olp-sdk-dataservice-api/lib/query-api";
-import { QuadTreeIndexDepth, TileRequest, TileRequestParams } from "@here/olp-sdk-dataservice-read";
+import { QuadTreeIndexDepth } from "../client/QuadTreeIndexRequest";
+import { TileRequest, TileRequestParams } from "../client/TileRequest";
 /**
  * Parameters used to get a tile.
  */

package/lib/utils/getTile.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (C) 2020-2021 HERE Europe B.V.
+ * Copyright (C) 2020-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,14 @@
  * SPDX-License-Identifier: Apache-2.0
  * License-Filename: LICENSE
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchQuadTreeIndex = exports.getTile = void 0;
+exports.getTile = getTile;
+exports.fetchQuadTreeIndex = fetchQuadTreeIndex;
 const olp_sdk_core_1 = require("@here/olp-sdk-core");
 const olp_sdk_dataservice_api_1 = require("@here/olp-sdk-dataservice-api");
-const olp_sdk_dataservice_read_1 = require("@here/olp-sdk-dataservice-read");
+const QuadTreeIndexCacheRepository_1 = require("../cache/QuadTreeIndexCacheRepository");
+const QuadTreeIndexRequest_1 = require("../client/QuadTreeIndexRequest");
+const QueryClient_1 = require("../client/QueryClient");
 /**
  * Fetches asynchronously data from a tile or from its nearest ancestor if not found.
  *
@@ -65,102 +59,102 @@ const olp_sdk_dataservice_read_1 = require("@here/olp-sdk-dataservice-read");
  *
  * @returns The blob of the requested tile or the blob of the closest parent Tile.
  */
-function getTile(request, params, abortSignal) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let catalogVersion;
-        const quadKey = request.getTileKey();
-        if (!quadKey) {
-            return Promise.reject(new Error("Please provide correct QuadKey"));
-        }
-        if (params.layerType === "versioned") {
-            catalogVersion = params.catalogVersion;
-        }
-        const blobType = params.layerType === "versioned" ? "blob" : "volatile-blob";
-        const blobRequestBuilder = yield olp_sdk_core_1.RequestFactory.create(blobType, "v1", params.settings, params.catalogHrn, abortSignal).catch(error => Promise.reject(error));
-        const delta = 4;
-        const requestedTileKey = olp_sdk_core_1.TileKey.fromRowColumnLevel(quadKey.row, quadKey.column, quadKey.level);
-        let quadTreeIndex = null;
-        if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
-            const cache = new olp_sdk_dataservice_read_1.QuadTreeIndexCacheRepository(params.settings.cache);
-            for (let i = 1; i <= delta; i++) {
-                const parentInCache = requestedTileKey.changedLevelBy(-i);
-                const cachedTree = cache.get({
-                    hrn: params.catalogHrn.toString(),
-                    layerId: params.layerId,
-                    depth: delta,
-                    root: parentInCache,
-                    version: catalogVersion
-                });
-                if (cachedTree) {
-                    quadTreeIndex = cachedTree;
-                }
+async function getTile(request, params, abortSignal) {
+    let catalogVersion;
+    const quadKey = request.getTileKey();
+    if (!quadKey) {
+        return Promise.reject(new Error("Please provide correct QuadKey"));
+    }
+    if (params.layerType === "versioned") {
+        catalogVersion = params.catalogVersion;
+    }
+    const blobType = params.layerType === "versioned" ? "blob" : "volatile-blob";
+    const blobRequestBuilder = await olp_sdk_core_1.RequestFactory.create(blobType, "v1", params.settings, params.catalogHrn, abortSignal);
+    const delta = 4;
+    const requestedTileKey = olp_sdk_core_1.TileKey.fromRowColumnLevel(quadKey.row, quadKey.column, quadKey.level);
+    let quadTreeIndex = null;
+    if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
+        const cache = new QuadTreeIndexCacheRepository_1.QuadTreeIndexCacheRepository(params.settings.cache);
+        for (let i = 1; i <= delta; i++) {
+            const parentInCache = requestedTileKey.changedLevelBy(-i);
+            const cachedTree = cache.get({
+                hrn: params.catalogHrn.toString(),
+                layerId: params.layerId,
+                depth: delta,
+                root: parentInCache,
+                version: catalogVersion
+            });
+            if (cachedTree) {
+                quadTreeIndex = cachedTree;
             }
         }
-        const parentTileKey = requestedTileKey.changedLevelBy(-delta);
-        if (!quadTreeIndex) {
-            quadTreeIndex = yield fetchQuadTreeIndex(Object.assign(Object.assign({}, params), { catalogVersion, depth: delta, fetchOptions: request.getFetchOption(), tileKey: parentTileKey, abortSignal, billingTag: request.getBillingTag() })).catch(e => Promise.reject(e));
+    }
+    const parentTileKey = requestedTileKey.changedLevelBy(-delta);
+    if (!quadTreeIndex) {
+        quadTreeIndex = await fetchQuadTreeIndex({
+            ...params,
+            catalogVersion,
+            depth: delta,
+            fetchOptions: request.getFetchOption(),
+            tileKey: parentTileKey,
+            abortSignal,
+            billingTag: request.getBillingTag()
+        });
+    }
+    if (!quadTreeIndex.subQuads || !quadTreeIndex.subQuads.length) {
+        return Promise.resolve(new Response(null, {
+            status: 204,
+            statusText: "No Content"
+        }));
+    }
+    // Return the data for the requested QuadKey or for the closest parent
+    const subQuads = quadTreeIndex.subQuads;
+    let currentTileKey = requestedTileKey;
+    let currentDelta = delta;
+    for (let level = currentTileKey.level; level >= parentTileKey.level; --level) {
+        const metadata = subQuads.find((item) => item.subQuadKey === currentTileKey.getSubHereTile(currentDelta));
+        if (metadata) {
+            return olp_sdk_dataservice_api_1.BlobApi.getBlob(blobRequestBuilder, {
+                dataHandle: metadata.dataHandle,
+                layerId: params.layerId,
+                billingTag: request.getBillingTag()
+            });
         }
-        if (!quadTreeIndex.subQuads || !quadTreeIndex.subQuads.length) {
-            return Promise.resolve(new Response(null, {
-                status: 204,
-                statusText: "No Content"
-            }));
+        try {
+            currentTileKey = currentTileKey.parent();
+            currentDelta = parentTileKey.level - currentTileKey.level;
         }
-        // Return the data for the requested QuadKey or for the closest parent
-        const subQuads = quadTreeIndex.subQuads;
-        let currentTileKey = requestedTileKey;
-        let currentDelta = delta;
-        for (let level = currentTileKey.level; level >= parentTileKey.level; --level) {
-            const metadata = subQuads.find(item => item.subQuadKey === currentTileKey.getSubHereTile(currentDelta));
-            if (metadata) {
-                return olp_sdk_dataservice_api_1.BlobApi.getBlob(blobRequestBuilder, {
-                    dataHandle: metadata.dataHandle,
-                    layerId: params.layerId,
-                    billingTag: request.getBillingTag()
-                });
-            }
-            try {
-                currentTileKey = currentTileKey.parent();
-                currentDelta = parentTileKey.level - currentTileKey.level;
-            }
-            catch (error) {
-                continue;
-            }
+        catch (error) {
+            continue;
         }
-        return Promise.reject(new Error(`Error getting blob for Tile: ${JSON.stringify(quadKey)}`));
-    });
+    }
+    return Promise.reject(new Error(`Error getting blob for Tile: ${JSON.stringify(quadKey)}`));
 }
-exports.getTile = getTile;
 /**
  * The function should request quad tree index for the parent tile with delta 4
  * and cache the responses in cache for later calls.
  * @hidden
  */
-function fetchQuadTreeIndex(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cache = new olp_sdk_dataservice_read_1.QuadTreeIndexCacheRepository(params.settings.cache);
-        const queryClient = new olp_sdk_dataservice_read_1.QueryClient(params.settings);
-        const quadTreeIndexRequest = new olp_sdk_dataservice_read_1.QuadTreeIndexRequest(params.catalogHrn, params.layerId, params.layerType)
-            .withQuadKey(params.tileKey)
-            .withDepth(params.depth);
-        if (params.layerType === "versioned") {
-            quadTreeIndexRequest.withVersion(params.catalogVersion);
-        }
-        const quadTreeIndex = yield queryClient
-            .fetchQuadTreeIndex(quadTreeIndexRequest, params.abortSignal)
-            .catch(err => Promise.reject(err));
-        if (params.fetchOptions !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
-            quadTreeIndex.subQuads) {
-            cache.put({
-                hrn: params.catalogHrn.toString(),
-                layerId: params.layerId,
-                depth: params.depth,
-                root: params.tileKey,
-                tree: quadTreeIndex,
-                version: params.catalogVersion
-            });
-        }
-        return Promise.resolve(quadTreeIndex);
-    });
+async function fetchQuadTreeIndex(params) {
+    const cache = new QuadTreeIndexCacheRepository_1.QuadTreeIndexCacheRepository(params.settings.cache);
+    const queryClient = new QueryClient_1.QueryClient(params.settings);
+    const quadTreeIndexRequest = new QuadTreeIndexRequest_1.QuadTreeIndexRequest(params.catalogHrn, params.layerId, params.layerType)
+        .withQuadKey(params.tileKey)
+        .withDepth(params.depth);
+    if (params.layerType === "versioned") {
+        quadTreeIndexRequest.withVersion(params.catalogVersion);
+    }
+    const quadTreeIndex = await queryClient.fetchQuadTreeIndex(quadTreeIndexRequest, params.abortSignal);
+    if (params.fetchOptions !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
+        quadTreeIndex.subQuads) {
+        cache.put({
+            hrn: params.catalogHrn.toString(),
+            layerId: params.layerId,
+            depth: params.depth,
+            root: params.tileKey,
+            tree: quadTreeIndex,
+            version: params.catalogVersion
+        });
+    }
+    return Promise.resolve(quadTreeIndex);
 }
-exports.fetchQuadTreeIndex = fetchQuadTreeIndex;

package/lib/utils/index.js

@@ -19,7 +19,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/utils/validateBillingTag.js

@@ -18,7 +18,7 @@
  * License-Filename: LICENSE
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateBillingTag = void 0;
+exports.validateBillingTag = validateBillingTag;
 /**
  * Validates the billinig tag.
  *
@@ -34,4 +34,3 @@ function validateBillingTag(tag) {
     }
     return tag;
 }
-exports.validateBillingTag = validateBillingTag;

package/lib/utils/validatePartitionsIdsList.js

@@ -18,7 +18,7 @@
  * License-Filename: LICENSE
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validatePartitionsIdsList = void 0;
+exports.validatePartitionsIdsList = validatePartitionsIdsList;
 /**
  * Validates a list of partitions IDs.
  *
@@ -35,4 +35,3 @@ function validatePartitionsIdsList(list) {
     }
     return list;
 }
-exports.validatePartitionsIdsList = validatePartitionsIdsList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@here/olp-sdk-dataservice-read",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Wrapper around a subset of the HERE Open Location Platform Data REST API related to reading data from OLP catalogs",
   "main": "index.js",
   "browser": "index.web.js",
@@ -11,32 +11,13 @@
   },
   "scripts": {
     "build": "tsc",
-    "lint": "tslint -c tslint.json -p tsconfig.json",
-    "test": "tsc -p ./test/tsconfig.json && mocha",
-    "coverage": "nyc npm run test",
-    "codecov": "npm run coverage && nyc report --reporter=lcov",
-    "prepare": "tsc --sourceMap false && npm run bundle",
+    "lint": "eslint .",
+    "test": "vitest run",
+    "coverage": "vitest run --coverage",
+    "prepack": "tsc --sourceMap false && npm run bundle",
     "bundle": "npm run bundle:dev && npm run bundle:prod",
-    "bundle:prod": "webpack --env.NODE_ENV=production",
-    "bundle:dev": "webpack --env.NODE_ENV=development"
-  },
-  "nyc": {
-    "include": [
-      "lib/**/*.ts",
-      "lib/**/*.js"
-    ],
-    "extension": [
-      ".ts"
-    ],
-    "require": [
-      "ts-node/register"
-    ],
-    "reporter": [
-      "text",
-      "html"
-    ],
-    "sourceMap": true,
-    "instrument": true
+    "bundle:prod": "webpack --env NODE_ENV=production",
+    "bundle:dev": "webpack --env NODE_ENV=development"
   },
   "repository": {
     "type": "git",
@@ -49,36 +30,11 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@here/olp-sdk-core": "^2.0.0",
-    "@here/olp-sdk-dataservice-api": "^2.0.0",
-    "@here/olp-sdk-fetch": "^2.0.0"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.7",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "18.7.14",
-    "@types/sinon": "7.0.3",
-    "@types/sinon-chai": "^3.2.3",
-    "chai": "^4.2.0",
-    "glob": "^7.1.6",
-    "husky": "^3.1.0",
-    "lint-staged": "^9.5.0",
-    "mocha": "^6.2.2",
-    "nyc": "^15.0.0",
-    "prettier": "^1.19.1",
-    "sinon": "7.4.2",
-    "sinon-chai": "^3.4.0",
-    "source-map-support": "^0.5.16",
-    "ts-node": "10.9.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.22.13",
-    "typescript": "4.0.3",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.10",
-    "terser-webpack-plugin": "^1.4.5"
+    "@here/olp-sdk-core": "^3.0.0",
+    "@here/olp-sdk-dataservice-api": "^3.0.0",
+    "@here/olp-sdk-fetch": "^3.0.0"
   },
   "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 24.0.0"
   }
 }

package/webpack.config.js

@@ -1,5 +1,4 @@
 const path = require("path");
-const TerserPlugin = require("terser-webpack-plugin");
 
 module.exports = env => {
   const isProd = env.NODE_ENV === "production";
@@ -13,14 +12,10 @@ module.exports = env => {
     },
     entry: "./index.web.js",
     output: {
-      filename: `bundle.umd${isProd ? '.min' : '.dev'}.js`,
+      filename: `bundle.umd${isProd ? ".min" : ".dev"}.js`,
       path: path.resolve(__dirname),
       libraryTarget: "umd",
-      globalObject: 'this'
-    },
-    optimization: {
-      minimize: true,
-      minimizer: [new TerserPlugin()],
+      globalObject: "this"
     }
   };
 };