@loaders.gl/loader-utils 4.1.0-alpha.3 → 4.1.0-alpha.5

package/dist/index.cjs

@@ -129,13 +129,17 @@ var nodeVersion = matches && parseFloat(matches[1]) || 0;
 function mergeLoaderOptions(baseOptions, newOptions) {
   return mergeOptionsRecursively(baseOptions || {}, newOptions);
 }
-function mergeOptionsRecursively(baseOptions, newOptions) {
+function mergeOptionsRecursively(baseOptions, newOptions, level = 0) {
+  if (level > 3) {
+    return newOptions;
+  }
   const options = { ...baseOptions };
   for (const [key, newValue] of Object.entries(newOptions)) {
     if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
       options[key] = mergeOptionsRecursively(
         options[key] || {},
-        newOptions[key]
+        newOptions[key],
+        level + 1
       );
     } else {
       options[key] = newOptions[key];

package/dist/json-loader.js

@@ -1,4 +1,4 @@
-const VERSION = typeof "4.1.0-alpha.3" !== 'undefined' ? "4.1.0-alpha.3" : 'latest';
+const VERSION = typeof "4.1.0-alpha.5" !== 'undefined' ? "4.1.0-alpha.5" : 'latest';
 export const JSONLoader = {
   name: 'JSON',
   id: 'json',

package/dist/lib/option-utils/merge-loader-options.js

@@ -2,12 +2,16 @@ export function mergeLoaderOptions(baseOptions, newOptions) {
   return mergeOptionsRecursively(baseOptions || {}, newOptions);
 }
 function mergeOptionsRecursively(baseOptions, newOptions) {
+  let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  if (level > 3) {
+    return newOptions;
+  }
   const options = {
     ...baseOptions
   };
   for (const [key, newValue] of Object.entries(newOptions)) {
     if (newValue && typeof newValue === 'object' && !Array.isArray(newValue)) {
-      options[key] = mergeOptionsRecursively(options[key] || {}, newOptions[key]);
+      options[key] = mergeOptionsRecursively(options[key] || {}, newOptions[key], level + 1);
     } else {
       options[key] = newOptions[key];
     }

package/dist/lib/option-utils/merge-loader-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-loader-options.js","names":["mergeLoaderOptions","baseOptions","newOptions","mergeOptionsRecursively","options","key","newValue","Object","entries","Array","isArray"],"sources":["../../../src/lib/option-utils/merge-loader-options.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {LoaderOptions} from '../../loader-types';\n\n/**\n *\n * @param baseOptions Can be undefined, in which case a fresh options object will be minted\n * @param newOptions\n * @returns\n */\nexport function mergeLoaderOptions<Options extends LoaderOptions>(\n  baseOptions: Options | undefined,\n  newOptions: Options\n): Options {\n  return mergeOptionsRecursively(baseOptions || {}, newOptions) as Options;\n}\n\nfunction mergeOptionsRecursively(\n  baseOptions: Record<string, unknown>,\n  newOptions: Record<string, unknown>\n): Record<string, unknown> {\n  const options = {...baseOptions};\n  for (const [key, newValue] of Object.entries(newOptions)) {\n    if (newValue && typeof newValue === 'object' && !Array.isArray(newValue)) {\n      options[key] = mergeOptionsRecursively(\n        (options[key] as Record<string, unknown>) || {},\n        newOptions[key] as Record<string, unknown>\n      );\n      // Object.assign(options[key] as object, newOptions[key]);\n    } else {\n      options[key] = newOptions[key];\n    }\n  }\n  return options as Record<string, unknown>;\n}\n"],"mappings":"AAYA,OAAO,SAASA,kBAAkBA,CAChCC,WAAgC,EAChCC,UAAmB,EACV;EACT,OAAOC,uBAAuB,CAACF,WAAW,IAAI,CAAC,CAAC,EAAEC,UAAU,CAAC;AAC/D;AAEA,SAASC,uBAAuBA,CAC9BF,WAAoC,EACpCC,UAAmC,EACV;EACzB,MAAME,OAAO,GAAG;IAAC,GAAGH;EAAW,CAAC;EAChC,KAAK,MAAM,CAACI,GAAG,EAAEC,QAAQ,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,UAAU,CAAC,EAAE;IACxD,IAAII,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,IAAI,CAACG,KAAK,CAACC,OAAO,CAACJ,QAAQ,CAAC,EAAE;MACxEF,OAAO,CAACC,GAAG,CAAC,GAAGF,uBAAuB,CACnCC,OAAO,CAACC,GAAG,CAAC,IAAgC,CAAC,CAAC,EAC/CH,UAAU,CAACG,GAAG,CAChB,CAAC;IAEH,CAAC,MAAM;MACLD,OAAO,CAACC,GAAG,CAAC,GAAGH,UAAU,CAACG,GAAG,CAAC;IAChC;EACF;EACA,OAAOD,OAAO;AAChB"}
+{"version":3,"file":"merge-loader-options.js","names":["mergeLoaderOptions","baseOptions","newOptions","mergeOptionsRecursively","level","arguments","length","undefined","options","key","newValue","Object","entries","Array","isArray"],"sources":["../../../src/lib/option-utils/merge-loader-options.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {LoaderOptions} from '../../loader-types';\n\n/**\n *\n * @param baseOptions Can be undefined, in which case a fresh options object will be minted\n * @param newOptions\n * @returns\n */\nexport function mergeLoaderOptions<Options extends LoaderOptions>(\n  baseOptions: Options | undefined,\n  newOptions: Options\n): Options {\n  return mergeOptionsRecursively(baseOptions || {}, newOptions) as Options;\n}\n\nfunction mergeOptionsRecursively(\n  baseOptions: Record<string, unknown>,\n  newOptions: Record<string, unknown>,\n  level = 0\n): Record<string, unknown> {\n  // Sanity check (jest test runner overwrites the console object which can lead to infinite recursion)\n  if (level > 3) {\n    return newOptions;\n  }\n\n  const options = {...baseOptions};\n  for (const [key, newValue] of Object.entries(newOptions)) {\n    if (newValue && typeof newValue === 'object' && !Array.isArray(newValue)) {\n      options[key] = mergeOptionsRecursively(\n        (options[key] as Record<string, unknown>) || {},\n        newOptions[key] as Record<string, unknown>,\n        level + 1\n      );\n      // Object.assign(options[key] as object, newOptions[key]);\n    } else {\n      options[key] = newOptions[key];\n    }\n  }\n  return options as Record<string, unknown>;\n}\n"],"mappings":"AAYA,OAAO,SAASA,kBAAkBA,CAChCC,WAAgC,EAChCC,UAAmB,EACV;EACT,OAAOC,uBAAuB,CAACF,WAAW,IAAI,CAAC,CAAC,EAAEC,UAAU,CAAC;AAC/D;AAEA,SAASC,uBAAuBA,CAC9BF,WAAoC,EACpCC,UAAmC,EAEV;EAAA,IADzBE,KAAK,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAGT,IAAID,KAAK,GAAG,CAAC,EAAE;IACb,OAAOF,UAAU;EACnB;EAEA,MAAMM,OAAO,GAAG;IAAC,GAAGP;EAAW,CAAC;EAChC,KAAK,MAAM,CAACQ,GAAG,EAAEC,QAAQ,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACV,UAAU,CAAC,EAAE;IACxD,IAAIQ,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,IAAI,CAACG,KAAK,CAACC,OAAO,CAACJ,QAAQ,CAAC,EAAE;MACxEF,OAAO,CAACC,GAAG,CAAC,GAAGN,uBAAuB,CACnCK,OAAO,CAACC,GAAG,CAAC,IAAgC,CAAC,CAAC,EAC/CP,UAAU,CAACO,GAAG,CAAC,EACfL,KAAK,GAAG,CACV,CAAC;IAEH,CAAC,MAAM;MACLI,OAAO,CAACC,GAAG,CAAC,GAAGP,UAAU,CAACO,GAAG,CAAC;IAChC;EACF;EACA,OAAOD,OAAO;AAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/loader-utils",
-  "version": "4.1.0-alpha.3",
+  "version": "4.1.0-alpha.5",
   "description": "Framework-independent loaders for 3D graphics formats",
   "license": "MIT",
   "type": "module",
@@ -47,8 +47,8 @@
   "scripts": {},
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/worker-utils": "4.1.0-alpha.3",
+    "@loaders.gl/worker-utils": "4.1.0-alpha.5",
     "@probe.gl/stats": "^4.0.2"
   },
-  "gitHead": "b78075a7cb8d4ecd4aac84805ce74b8ceb400cf7"
+  "gitHead": "3250842d8cc0fc8b76a575168c1fd57e5a66b6ba"
 }

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

@@ -19,14 +19,21 @@ export function mergeLoaderOptions<Options extends LoaderOptions>(
 
 function mergeOptionsRecursively(
   baseOptions: Record<string, unknown>,
-  newOptions: Record<string, unknown>
+  newOptions: Record<string, unknown>,
+  level = 0
 ): Record<string, unknown> {
+  // Sanity check (jest test runner overwrites the console object which can lead to infinite recursion)
+  if (level > 3) {
+    return newOptions;
+  }
+
   const options = {...baseOptions};
   for (const [key, newValue] of Object.entries(newOptions)) {
     if (newValue && typeof newValue === 'object' && !Array.isArray(newValue)) {
       options[key] = mergeOptionsRecursively(
         (options[key] as Record<string, unknown>) || {},
-        newOptions[key] as Record<string, unknown>
+        newOptions[key] as Record<string, unknown>,
+        level + 1
       );
       // Object.assign(options[key] as object, newOptions[key]);
     } else {