Compare commits

...

3 Commits

Author SHA1 Message Date
7b2d4ba119 updated xhr error handling
All checks were successful
Build / Build NPM Project (push) Successful in 42s
Build / Tag Version (push) Successful in 4s
2024-06-25 09:58:02 -04:00
1a4e732fd5 deepMerge fix
All checks were successful
Build / Build NPM Project (push) Successful in 22s
Build / Tag Version (push) Successful in 5s
2024-06-18 21:08:18 -04:00
3a039c935f export deepMerge
All checks were successful
Build / Build NPM Project (push) Successful in 22s
Build / Tag Version (push) Successful in 4s
2024-06-18 20:19:10 -04:00
3 changed files with 10 additions and 10 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.12.0", "version": "0.12.3",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",

View File

@ -42,17 +42,17 @@ export function deepCopy<T>(value: T): T {
* @param sources Objects that will copied into target * @param sources Objects that will copied into target
* @return {any} The des * @return {any} The des
*/ */
function deepMerge<T>(target: any, ...sources: any[]): T { export function deepMerge<T>(target: any, ...sources: any[]): T {
for(const source of sources) { sources.forEach(s => {
for(const key in source) { for(const key in s) {
if(source[key] && typeof source[key] == 'object' && !Array.isArray(source[key])) { if(s[key] && typeof s[key] == 'object' && !Array.isArray(s[key])) {
if(!target[key]) target[key] = {}; if(!target[key]) target[key] = {};
deepMerge(target[key], source[key]); deepMerge(target[key], s[key]);
} else { } else {
target[key] = source[key]; target[key] = s[key];
}
} }
} }
});
return target; return target;
} }

View File

@ -83,8 +83,8 @@ export class XHR {
const payload = await decode(); const payload = await decode();
if(resp.ok) return payload; if(resp.ok) return payload;
const text = resp.statusText || (typeof payload == 'string' ? payload : null); throw Object.assign(new Error(typeof payload == 'string' ? payload : resp.statusText),
throw (text ? new Error(text) : payload); typeof payload == 'object' ? payload : {});
}); });
} }
} }