Avoid type conflict

pull/347/head
ptazithos 2 years ago
parent 146004129e
commit f1812882eb

@ -4,7 +4,8 @@ import { listen, UnlistenFn } from "@tauri-apps/api/event";
export type LogOptions = { export type LogOptions = {
file?: string; file?: string;
line?: number; line?: number;
} & Record<string, string | undefined>; extras: Record<string, string | undefined>;
};
enum LogLevel { enum LogLevel {
/** /**
@ -36,7 +37,7 @@ enum LogLevel {
* *
* Designates very serious errors. * Designates very serious errors.
*/ */
Error, Error
} }
async function log( async function log(
@ -50,7 +51,7 @@ async function log(
return name.length > 0 && location !== "[native code]"; return name.length > 0 && location !== "[native code]";
}); });
const { file, line, ...keyValues } = options ?? {}; const { file, line, extras = {} } = options ?? {};
let location = filtered?.[0]?.filter((v) => v.length > 0).join("@"); let location = filtered?.[0]?.filter((v) => v.length > 0).join("@");
if (location === "Error") { if (location === "Error") {
@ -63,7 +64,7 @@ async function log(
location, location,
file, file,
line, line,
keyValues, keyValues: extras
}); });
} }

Loading…
Cancel
Save