@futdevpro/fsm-dynamo 1.12.3 → 1.12.5
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.
|
@@ -63,11 +63,11 @@ function DyFM_getConstructionStackLocation(level = 0) {
|
|
|
63
63
|
}
|
|
64
64
|
function DyFM_getLocalStackLocation(level = 0) {
|
|
65
65
|
let stack = new Error().stack;
|
|
66
|
-
// Split the stack into lines and remove the first line (Error:)
|
|
66
|
+
// Split the stack into lines and remove the first line (Error:) and the second line (DyFM_getLocalStackLocation)
|
|
67
67
|
let stackLines = stack?.split('\n')?.slice(2);
|
|
68
|
-
// Find the line that contains the
|
|
69
|
-
// It will be the FIRST line that doesn't contain '
|
|
70
|
-
let
|
|
68
|
+
// Find the line that contains the location
|
|
69
|
+
// It will be the FIRST line that doesn't contain 'node_modules' or 'node:'
|
|
70
|
+
let locationLine = stackLines?.find(line => line &&
|
|
71
71
|
!line.includes('node_modules') &&
|
|
72
72
|
!line.includes('node:'));
|
|
73
73
|
if (isNaN(level)) {
|
|
@@ -75,37 +75,37 @@ function DyFM_getLocalStackLocation(level = 0) {
|
|
|
75
75
|
}
|
|
76
76
|
if (level) {
|
|
77
77
|
while (level) {
|
|
78
|
-
stackLines = stackLines?.filter(line => line !==
|
|
78
|
+
stackLines = stackLines?.filter(line => line !== locationLine);
|
|
79
79
|
level--;
|
|
80
|
-
|
|
80
|
+
locationLine = stackLines?.find(line => line &&
|
|
81
81
|
!line.includes('node_modules') &&
|
|
82
82
|
!line.includes('node:'));
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
|
-
if (!
|
|
86
|
-
|
|
85
|
+
if (!locationLine) {
|
|
86
|
+
locationLine = stack?.split(' at ')?.find(line => line &&
|
|
87
87
|
!line.includes('node_modules') &&
|
|
88
88
|
!line.includes('node:'));
|
|
89
|
-
if (!
|
|
90
|
-
log_util_1.DyFM_Log.warn(`No
|
|
89
|
+
if (!locationLine) {
|
|
90
|
+
log_util_1.DyFM_Log.warn(`No location line found outside of node_modules or node: (0)\n${typeof stack}\n${stack?.slice(0, 300)?.split('\n') + '...'}`, {
|
|
91
91
|
stack,
|
|
92
92
|
});
|
|
93
93
|
return '';
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
// Remove the 'constructorLine at ... (' and the ')'
|
|
97
|
-
if (
|
|
98
|
-
|
|
97
|
+
if (locationLine?.includes('(')) {
|
|
98
|
+
locationLine = locationLine?.split('(')[1];
|
|
99
99
|
}
|
|
100
|
-
if (
|
|
101
|
-
|
|
100
|
+
if (locationLine?.includes(')')) {
|
|
101
|
+
locationLine = locationLine?.split(')')[0];
|
|
102
102
|
}
|
|
103
|
-
if (!
|
|
104
|
-
log_util_1.DyFM_Log.warn(`No
|
|
103
|
+
if (!locationLine) {
|
|
104
|
+
log_util_1.DyFM_Log.warn(`No location line found (1)\n${typeof stack}\n${stack?.slice(0, 300)?.split('\n') + '...'}`, {
|
|
105
105
|
stack,
|
|
106
106
|
});
|
|
107
107
|
return '';
|
|
108
108
|
}
|
|
109
|
-
return
|
|
109
|
+
return locationLine;
|
|
110
110
|
}
|
|
111
111
|
//# sourceMappingURL=stack.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.12.
|
|
3
|
+
"version": "01.12.5",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "full-stack-package",
|
|
@@ -79,12 +79,12 @@ export function DyFM_getConstructionStackLocation(level: number = 0): string {
|
|
|
79
79
|
export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
80
80
|
let stack: string = new Error().stack;
|
|
81
81
|
|
|
82
|
-
// Split the stack into lines and remove the first line (Error:)
|
|
82
|
+
// Split the stack into lines and remove the first line (Error:) and the second line (DyFM_getLocalStackLocation)
|
|
83
83
|
let stackLines = stack?.split('\n')?.slice(2);
|
|
84
84
|
|
|
85
|
-
// Find the line that contains the
|
|
86
|
-
// It will be the FIRST line that doesn't contain '
|
|
87
|
-
let
|
|
85
|
+
// Find the line that contains the location
|
|
86
|
+
// It will be the FIRST line that doesn't contain 'node_modules' or 'node:'
|
|
87
|
+
let locationLine: string | undefined = stackLines?.find(line =>
|
|
88
88
|
line &&
|
|
89
89
|
!line.includes('node_modules') &&
|
|
90
90
|
!line.includes('node:')
|
|
@@ -96,9 +96,9 @@ export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
|
96
96
|
|
|
97
97
|
if (level) {
|
|
98
98
|
while (level) {
|
|
99
|
-
stackLines = stackLines?.filter(line => line !==
|
|
99
|
+
stackLines = stackLines?.filter(line => line !== locationLine);
|
|
100
100
|
level--;
|
|
101
|
-
|
|
101
|
+
locationLine = stackLines?.find(line =>
|
|
102
102
|
line &&
|
|
103
103
|
!line.includes('node_modules') &&
|
|
104
104
|
!line.includes('node:')
|
|
@@ -106,16 +106,16 @@ export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
|
|
109
|
-
if (!
|
|
110
|
-
|
|
109
|
+
if (!locationLine) {
|
|
110
|
+
locationLine = stack?.split(' at ')?.find(line =>
|
|
111
111
|
line &&
|
|
112
112
|
!line.includes('node_modules') &&
|
|
113
113
|
!line.includes('node:')
|
|
114
114
|
);
|
|
115
115
|
|
|
116
|
-
if (!
|
|
116
|
+
if (!locationLine) {
|
|
117
117
|
DyFM_Log.warn(
|
|
118
|
-
`No
|
|
118
|
+
`No location line found outside of node_modules or node: (0)\n${typeof stack}\n${stack?.slice(0, 300)?.split('\n') + '...'}`, {
|
|
119
119
|
stack,
|
|
120
120
|
});
|
|
121
121
|
return '';
|
|
@@ -123,20 +123,20 @@ export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
// Remove the 'constructorLine at ... (' and the ')'
|
|
126
|
-
if (
|
|
127
|
-
|
|
126
|
+
if (locationLine?.includes('(')) {
|
|
127
|
+
locationLine = locationLine?.split('(')[1];
|
|
128
128
|
}
|
|
129
|
-
if (
|
|
130
|
-
|
|
129
|
+
if (locationLine?.includes(')')) {
|
|
130
|
+
locationLine = locationLine?.split(')')[0];
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
if (!
|
|
133
|
+
if (!locationLine) {
|
|
134
134
|
DyFM_Log.warn(
|
|
135
|
-
`No
|
|
135
|
+
`No location line found (1)\n${typeof stack}\n${stack?.slice(0, 300)?.split('\n') + '...'}`, {
|
|
136
136
|
stack,
|
|
137
137
|
});
|
|
138
138
|
return '';
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
-
return
|
|
141
|
+
return locationLine;
|
|
142
142
|
}
|
|
Binary file
|