@loaders.gl/i3s 4.3.0-alpha.2 → 4.3.0-alpha.4

package/dist/lib/utils/url-utils.js

@@ -8,9 +8,13 @@ export function getUrlWithoutParams(url) {
     try {
         const urlObj = new URL(url);
         urlWithoutParams = `${urlObj.origin}${urlObj.pathname}`;
+        // On Windows `new URL(url)` makes `C:\...` -> `null\...`
+        if (urlWithoutParams.startsWith('null')) {
+            urlWithoutParams = null;
+        }
     }
     catch (e) {
-        // do nothing
+        urlWithoutParams = null;
     }
     return urlWithoutParams || url;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.3.0-alpha.2",
+  "version": "4.3.0-alpha.4",
   "description": "i3s .",
   "license": "MIT",
   "type": "module",
@@ -42,16 +42,16 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.3.0-alpha.2",
-    "@loaders.gl/crypto": "4.3.0-alpha.2",
-    "@loaders.gl/draco": "4.3.0-alpha.2",
-    "@loaders.gl/images": "4.3.0-alpha.2",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.2",
-    "@loaders.gl/math": "4.3.0-alpha.2",
-    "@loaders.gl/schema": "4.3.0-alpha.2",
-    "@loaders.gl/textures": "4.3.0-alpha.2",
-    "@loaders.gl/tiles": "4.3.0-alpha.2",
-    "@loaders.gl/zip": "4.3.0-alpha.2",
+    "@loaders.gl/compression": "4.3.0-alpha.4",
+    "@loaders.gl/crypto": "4.3.0-alpha.4",
+    "@loaders.gl/draco": "4.3.0-alpha.4",
+    "@loaders.gl/images": "4.3.0-alpha.4",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.4",
+    "@loaders.gl/math": "4.3.0-alpha.4",
+    "@loaders.gl/schema": "4.3.0-alpha.4",
+    "@loaders.gl/textures": "4.3.0-alpha.4",
+    "@loaders.gl/tiles": "4.3.0-alpha.4",
+    "@loaders.gl/zip": "4.3.0-alpha.4",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0"
@@ -59,5 +59,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "77a3cb538ab7a1fbf74245f25590210451689f5c"
+  "gitHead": "4900ac4c4de20366c050b80cef04dc5b52d167af"
 }

package/src/lib/parsers/parse-slpk/parse-slpk.ts

@@ -1,4 +1,4 @@
-import {FileProvider} from '@loaders.gl/loader-utils';
+import {FileProviderInterface} from '@loaders.gl/loader-utils';
 import {
   parseZipCDFileHeader,
   CD_HEADER_SIGNATURE,
@@ -16,7 +16,7 @@ import {SLPKArchive} from './slpk-archieve';
  * @returns slpk file handler
  */
 export async function parseSLPKArchive(
-  fileProvider: FileProvider,
+  fileProvider: FileProviderInterface,
   cb?: (msg: string) => void,
   fileName?: string
 ): Promise<SLPKArchive> {

package/src/lib/parsers/parse-slpk/slpk-archieve.ts

@@ -1,5 +1,5 @@
 import {MD5Hash} from '@loaders.gl/crypto';
-import {FileProvider} from '@loaders.gl/loader-utils';
+import {FileProviderInterface} from '@loaders.gl/loader-utils';
 import {IndexedArchive, parseZipLocalFileHeader} from '@loaders.gl/zip';
 import {GZipCompression} from '@loaders.gl/compression';
 
@@ -56,7 +56,11 @@ export class SLPKArchive extends IndexedArchive {
    * @param hashTable - pre-loaded hashTable. If presented, getFile will skip reading the hash file
    * @param fileName - name of the archive. It is used to add to an URL of a loader context
    */
-  constructor(fileProvider: FileProvider, hashTable?: Record<string, bigint>, fileName?: string) {
+  constructor(
+    fileProvider: FileProviderInterface,
+    hashTable?: Record<string, bigint>,
+    fileName?: string
+  ) {
     super(fileProvider, hashTable, fileName);
     this.hashTable = hashTable;
   }

package/src/lib/utils/url-utils.ts

@@ -6,13 +6,18 @@ import {Node3DIndexDocument, SceneLayer3D} from '../../types';
  * @returns url without search params
  */
 export function getUrlWithoutParams(url: string): string {
-  let urlWithoutParams;
+  let urlWithoutParams: string | null;
 
   try {
     const urlObj = new URL(url);
     urlWithoutParams = `${urlObj.origin}${urlObj.pathname}`;
+
+    // On Windows `new URL(url)` makes `C:\...` -> `null\...`
+    if (urlWithoutParams.startsWith('null')) {
+      urlWithoutParams = null;
+    }
   } catch (e) {
-    // do nothing
+    urlWithoutParams = null;
   }
   return urlWithoutParams || url;
 }