@baklavabg/common-ts 1.0.21 → 1.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../src/safeExit/safe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../src/safeExit/safe.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAClD,EAAE,EAAE,CAAC,EACL,UAAU,GAAE,OAAc,EAC1B,UAAU,GAAE,OAAc,EAC1B,kBAAkB,CAAC,EAAE,GAAG,EACxB,eAAe,CAAC,EAAE,MAAM,EACxB,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC/B,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,kBAAkB,CA+DvE"}
|
package/dist/safeExit/safe.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { print } from "../utils/log.utils.js";
|
|
2
|
-
import { EarlyReturnError } from "./types.js";
|
|
3
|
-
// @mii use this instead of the other function `safe`
|
|
2
|
+
import { EarlyReturnError, ConditionalResult as Result } from "./types.js";
|
|
4
3
|
/**
|
|
5
4
|
* Enhanced safe function that handles both regular errors and early returns
|
|
6
5
|
* @param fn - The function to wrap
|
|
@@ -12,9 +11,9 @@ import { EarlyReturnError } from "./types.js";
|
|
|
12
11
|
*/
|
|
13
12
|
export function safe(fn, printError = true, printStack = true, defaultReturnValue, defaultErrorMsg, cbk) {
|
|
14
13
|
const getFileInfoFromStack = (stackTrace, functionName) => {
|
|
15
|
-
const lines = stackTrace.split("\n").map(
|
|
16
|
-
const fnLine = lines.find(
|
|
17
|
-
lines.find(
|
|
14
|
+
const lines = stackTrace.split("\n").map(line => line.trim());
|
|
15
|
+
const fnLine = lines.find(line => line.startsWith(`at ${functionName}`)) ||
|
|
16
|
+
lines.find(line => /at .*:\d+:\d+/.test(line)) ||
|
|
18
17
|
lines[1] ||
|
|
19
18
|
"";
|
|
20
19
|
const regex = /at (?:\S+ \()?(.+):(\d+):(\d+)\)?$/;
|
|
@@ -42,7 +41,7 @@ export function safe(fn, printError = true, printStack = true, defaultReturnValu
|
|
|
42
41
|
if (cbk) {
|
|
43
42
|
cbk(e);
|
|
44
43
|
}
|
|
45
|
-
return defaultReturnValue;
|
|
44
|
+
return defaultReturnValue ?? new Result(null, "An unexpected error occurred");
|
|
46
45
|
};
|
|
47
46
|
const handleEarlyReturn = (e) => {
|
|
48
47
|
return e.returnValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe.js","sourceRoot":"","sources":["../../src/safeExit/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"safe.js","sourceRoot":"","sources":["../../src/safeExit/safe.ts"],"names":[],"mappings":"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"}
|