@loaders.gl/core 4.4.0-alpha.9 → 4.4.0

package/src/lib/loader-utils/option-utils.ts

@@ -8,13 +8,15 @@ import {
   registerJSModules,
   isPureObject,
   isObject,
-  StrictLoaderOptions
+  StrictLoaderOptions,
+  path
 } from '@loaders.gl/loader-utils';
 import {probeLog, NullLog} from './loggers';
 import {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';
+import {stripQueryString} from '../utils/url-utils';
 
 const CORE_LOADER_OPTION_KEYS = [
-  'baseUri',
+  'baseUrl',
   'fetch',
   'mimeType',
   'fallbackMimeType',
@@ -91,7 +93,7 @@ export function setGlobalOptions(options: LoaderOptions): void {
 }
 
 /**
- * Merges options with global opts and loader defaults, also injects baseUri
+ * Merges options with global opts and loader defaults, also injects baseUrl
  * @param options
  * @param loader
  * @param loaders
@@ -175,14 +177,18 @@ function validateOptionsObject(
     if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
       // Issue deprecation warnings
       if (key in deprecatedOptions) {
-        probeLog.warn(
-          `${loaderName} loader option \'${prefix}${key}\' no longer supported, use \'${deprecatedOptions[key]}\'`
-        )();
+        if (probeLog.level > 0) {
+          probeLog.warn(
+            `${loaderName} loader option \'${prefix}${key}\' no longer supported, use \'${deprecatedOptions[key]}\'`
+          )();
+        }
       } else if (!isSubOptions) {
-        const suggestion = findSimilarOption(key, loaders);
-        probeLog.warn(
-          `${loaderName} loader option \'${prefix}${key}\' not recognized. ${suggestion}`
-        )();
+        if (probeLog.level > 0) {
+          const suggestion = findSimilarOption(key, loaders);
+          probeLog.warn(
+            `${loaderName} loader option \'${prefix}${key}\' not recognized. ${suggestion}`
+          )();
+        }
       }
     }
   }
@@ -258,8 +264,7 @@ function mergeNestedFields(mergedOptions: LoaderOptions, options: LoaderOptions)
 
 /**
  * Harvest information from the url
- * @deprecated This is mainly there to support a hack in the GLTFLoader
- * TODO - baseUri should be a directory, i.e. remove file component from baseUri
+ * @deprecated This is mainly there to support loaders that still resolve from options
  * TODO - extract extension?
  * TODO - extract query parameters?
  * TODO - should these be injected on context instead of options?
@@ -268,11 +273,10 @@ function addUrlOptions(options: LoaderOptions, url?: string): void {
   if (!url) {
     return;
   }
-  const hasTopLevelBaseUri = options.baseUri !== undefined;
-  const hasCoreBaseUri = options.core?.baseUri !== undefined;
-  if (!hasTopLevelBaseUri && !hasCoreBaseUri) {
+  const hasCoreBaseUrl = options.core?.baseUrl !== undefined;
+  if (!hasCoreBaseUrl) {
     options.core ||= {};
-    options.core.baseUri = url;
+    options.core.baseUrl = path.dirname(stripQueryString(url));
   }
 }
 
@@ -285,6 +289,13 @@ function cloneLoaderOptions(options: LoaderOptions): LoaderOptions {
 }
 
 function moveDeprecatedTopLevelOptionsToCore(options: LoaderOptions): void {
+  if (options.baseUri !== undefined) {
+    options.core ||= {};
+    if (options.core.baseUrl === undefined) {
+      options.core.baseUrl = options.baseUri;
+    }
+  }
+
   for (const key of CORE_LOADER_OPTION_KEYS) {
     if ((options as Record<string, unknown>)[key] !== undefined) {
       const coreOptions = (options.core = options.core || {});