@faiwer/react 0.9.0 → 19.0.1
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.
- package/README.md +28 -9
- package/dist/core/actions/applyAction.d.ts.map +1 -1
- package/dist/core/actions/applyAction.js +4 -0
- package/dist/core/actions/applyAction.js.map +1 -1
- package/dist/core/actions/catchError.action.d.ts +10 -0
- package/dist/core/actions/catchError.action.d.ts.map +1 -0
- package/dist/core/actions/catchError.action.js +51 -0
- package/dist/core/actions/catchError.action.js.map +1 -0
- package/dist/core/actions/dom/value.d.ts +3 -2
- package/dist/core/actions/dom/value.d.ts.map +1 -1
- package/dist/core/actions/dom/value.js +20 -13
- package/dist/core/actions/dom/value.js.map +1 -1
- package/dist/core/actions/helpers.d.ts.map +1 -1
- package/dist/core/actions/helpers.js +1 -2
- package/dist/core/actions/helpers.js.map +1 -1
- package/dist/core/actions/remove.action.d.ts.map +1 -1
- package/dist/core/actions/remove.action.js +2 -3
- package/dist/core/actions/remove.action.js.map +1 -1
- package/dist/core/actions/replace.action.d.ts.map +1 -1
- package/dist/core/actions/replace.action.js +4 -0
- package/dist/core/actions/replace.action.js.map +1 -1
- package/dist/core/actions/scheduleEffect.action.d.ts +7 -0
- package/dist/core/actions/scheduleEffect.action.d.ts.map +1 -0
- package/dist/core/actions/scheduleEffect.action.js +8 -0
- package/dist/core/actions/scheduleEffect.action.js.map +1 -0
- package/dist/core/actions/setAttr.action.d.ts.map +1 -1
- package/dist/core/actions/setAttr.action.js +2 -3
- package/dist/core/actions/setAttr.action.js.map +1 -1
- package/dist/core/actions/setRef.action.d.ts.map +1 -1
- package/dist/core/actions/setRef.action.js +1 -2
- package/dist/core/actions/setRef.action.js.map +1 -1
- package/dist/core/classComponent.d.ts +2 -1
- package/dist/core/classComponent.d.ts.map +1 -1
- package/dist/core/classComponent.js +17 -10
- package/dist/core/classComponent.js.map +1 -1
- package/dist/core/components.d.ts +5 -3
- package/dist/core/components.d.ts.map +1 -1
- package/dist/core/components.js +8 -3
- package/dist/core/components.js.map +1 -1
- package/dist/core/reactNodeToFiberNode.d.ts +3 -1
- package/dist/core/reactNodeToFiberNode.d.ts.map +1 -1
- package/dist/core/reactNodeToFiberNode.js +74 -16
- package/dist/core/reactNodeToFiberNode.js.map +1 -1
- package/dist/core/reconciliation/collect/fromApp.d.ts +2 -1
- package/dist/core/reconciliation/collect/fromApp.d.ts.map +1 -1
- package/dist/core/reconciliation/collect/fromApp.js +6 -1
- package/dist/core/reconciliation/collect/fromApp.js.map +1 -1
- package/dist/core/reconciliation/collect/fromChildrenPair.d.ts +2 -1
- package/dist/core/reconciliation/collect/fromChildrenPair.d.ts.map +1 -1
- package/dist/core/reconciliation/collect/fromChildrenPair.js +26 -4
- package/dist/core/reconciliation/collect/fromChildrenPair.js.map +1 -1
- package/dist/core/reconciliation/collect/fromComponent.d.ts +2 -1
- package/dist/core/reconciliation/collect/fromComponent.d.ts.map +1 -1
- package/dist/core/reconciliation/collect/fromComponent.js +25 -3
- package/dist/core/reconciliation/collect/fromComponent.js.map +1 -1
- package/dist/core/reconciliation/collect/fromFiberPair.d.ts +2 -1
- package/dist/core/reconciliation/collect/fromFiberPair.d.ts.map +1 -1
- package/dist/core/reconciliation/collect/fromFiberPair.js +6 -1
- package/dist/core/reconciliation/collect/fromFiberPair.js.map +1 -1
- package/dist/core/reconciliation/effects.d.ts +2 -2
- package/dist/core/reconciliation/effects.d.ts.map +1 -1
- package/dist/core/reconciliation/effects.js +52 -4
- package/dist/core/reconciliation/effects.js.map +1 -1
- package/dist/core/reconciliation/errors/ReactError.d.ts +8 -0
- package/dist/core/reconciliation/errors/ReactError.d.ts.map +1 -1
- package/dist/core/reconciliation/errors/ReactError.js +30 -0
- package/dist/core/reconciliation/errors/ReactError.js.map +1 -1
- package/dist/core/reconciliation/errors/stack.d.ts +1 -1
- package/dist/core/reconciliation/errors/stack.d.ts.map +1 -1
- package/dist/core/reconciliation/errors/stack.js +3 -3
- package/dist/core/reconciliation/errors/stack.js.map +1 -1
- package/dist/core/reconciliation/mount.d.ts.map +1 -1
- package/dist/core/reconciliation/mount.js +10 -2
- package/dist/core/reconciliation/mount.js.map +1 -1
- package/dist/core/reconciliation/render.d.ts.map +1 -1
- package/dist/core/reconciliation/render.js +8 -2
- package/dist/core/reconciliation/render.js.map +1 -1
- package/dist/core/reconciliation/runFiberComponents.d.ts +3 -1
- package/dist/core/reconciliation/runFiberComponents.d.ts.map +1 -1
- package/dist/core/reconciliation/runFiberComponents.js +31 -4
- package/dist/core/reconciliation/runFiberComponents.js.map +1 -1
- package/dist/hooks/helpers.d.ts +2 -2
- package/dist/hooks/helpers.d.ts.map +1 -1
- package/dist/hooks/index.d.ts +1 -0
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/index.js +1 -0
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/useEffect.d.ts.map +1 -1
- package/dist/hooks/useEffect.js +20 -6
- package/dist/hooks/useEffect.js.map +1 -1
- package/dist/hooks/useError.d.ts +5 -0
- package/dist/hooks/useError.d.ts.map +1 -0
- package/dist/hooks/useError.js +19 -0
- package/dist/hooks/useError.js.map +1 -0
- package/dist/hooks/useReducer.d.ts +7 -0
- package/dist/hooks/useReducer.d.ts.map +1 -0
- package/dist/hooks/useReducer.js +10 -0
- package/dist/hooks/useReducer.js.map +1 -0
- package/dist/hooks/useState.d.ts.map +1 -1
- package/dist/hooks/useState.js +0 -1
- package/dist/hooks/useState.js.map +1 -1
- package/dist/types/actions.d.ts +12 -1
- package/dist/types/actions.d.ts.map +1 -1
- package/dist/types/app.d.ts +5 -1
- package/dist/types/app.d.ts.map +1 -1
- package/dist/types/component.d.ts +6 -0
- package/dist/types/component.d.ts.map +1 -1
- package/dist/types/fiber.d.ts +1 -1
- package/dist/types/fiber.d.ts.map +1 -1
- package/dist/types/hooks.d.ts +12 -2
- package/dist/types/hooks.d.ts.map +1 -1
- package/dist/types/react.d.ts +0 -4
- package/dist/types/react.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { collectActionsFromChildrenPair } from './fromChildrenPair';
|
|
2
2
|
import { areFiberPropsEq } from '../compare/areFiberPropsEq';
|
|
3
3
|
import { isFiberDead } from '../fibers';
|
|
4
|
+
import { ReactError } from '../errors/ReactError';
|
|
4
5
|
/**
|
|
5
6
|
* `l` and `r` are the same node, but `r` may have some updates. This method
|
|
6
7
|
* collects a list of actions that must be applied to convert `l` to `r`.
|
|
@@ -17,7 +18,11 @@ export const collectActionsFromFiberPair = (app, l, r) => {
|
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
if (l.type === 'tag' || l.type === 'fragment') {
|
|
20
|
-
|
|
21
|
+
const childrenActionsX = collectActionsFromChildrenPair(l, r.children);
|
|
22
|
+
// Tags & fragments cannot be error boundaries. Pass it through.
|
|
23
|
+
if (childrenActionsX instanceof ReactError)
|
|
24
|
+
return childrenActionsX;
|
|
25
|
+
actions.push(...childrenActionsX);
|
|
21
26
|
}
|
|
22
27
|
if (eqProps &&
|
|
23
28
|
// Component may have the same props, but changed internal state
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fromFiberPair.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/collect/fromFiberPair.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fromFiberPair.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/collect/fromFiberPair.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { App, EffectMode } from '../../types';
|
|
1
|
+
import type { App, EffectMode, FiberNode } from '../../types';
|
|
2
2
|
/**
|
|
3
3
|
* Adds to a planner the given effect.
|
|
4
4
|
* - `refs` & `layout` effects are run in the same microtask queue
|
|
@@ -6,7 +6,7 @@ import type { App, EffectMode } from '../../types';
|
|
|
6
6
|
* be run in the same microtask queue (when one of the ref or layout effects
|
|
7
7
|
* invalidates a component).
|
|
8
8
|
*/
|
|
9
|
-
export declare const scheduleEffect: (
|
|
9
|
+
export declare const scheduleEffect: (fiber: FiberNode, fn: () => void, mode: EffectMode) => void;
|
|
10
10
|
/**
|
|
11
11
|
* Run scheduled effects one-by-one from the given queue.
|
|
12
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effects.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/effects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"effects.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/effects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAOrE;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,8DAM1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,sCAgCtB,CAAC"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import { getAppByFiber } from './app';
|
|
2
|
+
import { ReactError } from './errors/ReactError';
|
|
3
|
+
import { findClosestErrorBoundary } from '../../hooks/useError';
|
|
4
|
+
import { traverseFiberTree } from '../actions/helpers';
|
|
5
|
+
import { catchErrorAction } from '../actions/catchError.action';
|
|
1
6
|
/**
|
|
2
7
|
* Adds to a planner the given effect.
|
|
3
8
|
* - `refs` & `layout` effects are run in the same microtask queue
|
|
@@ -5,17 +10,60 @@
|
|
|
5
10
|
* be run in the same microtask queue (when one of the ref or layout effects
|
|
6
11
|
* invalidates a component).
|
|
7
12
|
*/
|
|
8
|
-
export const scheduleEffect = (
|
|
9
|
-
|
|
13
|
+
export const scheduleEffect = (fiber, fn, mode) => {
|
|
14
|
+
getAppByFiber(fiber).effects[mode].push({ fiber, fn, cancelled: false });
|
|
10
15
|
};
|
|
11
16
|
/**
|
|
12
17
|
* Run scheduled effects one-by-one from the given queue.
|
|
13
18
|
*/
|
|
14
19
|
export const runEffects = (app, mode) => {
|
|
15
20
|
const effects = app.effects[mode];
|
|
21
|
+
for (const { fn, fiber, cancelled } of effects) {
|
|
22
|
+
if (cancelled) {
|
|
23
|
+
// Another component within the same error boundary children group failed
|
|
24
|
+
// during running one of its effects.
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
try {
|
|
28
|
+
fn(fiber);
|
|
29
|
+
}
|
|
30
|
+
catch (errorRaw) {
|
|
31
|
+
if (mode === 'refsMount' || mode === 'refsUnmount') {
|
|
32
|
+
fiber.ref = null; // Don't run the ref-destructor for this fiber.
|
|
33
|
+
}
|
|
34
|
+
const error = new ReactError(fiber, `Error during running effect. ${String(errorRaw)}`);
|
|
35
|
+
const boundary = findClosestErrorBoundary(fiber);
|
|
36
|
+
if (!boundary) {
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
cancelSetEffects(app, collectBoundaryChildren(boundary));
|
|
40
|
+
catchErrorAction(boundary, { error });
|
|
41
|
+
}
|
|
42
|
+
}
|
|
16
43
|
app.effects[mode] = [];
|
|
17
|
-
|
|
18
|
-
|
|
44
|
+
};
|
|
45
|
+
/** Return IDs of all given error boundary fiber children. */
|
|
46
|
+
const collectBoundaryChildren = (boundary) => {
|
|
47
|
+
const fibers = new Set();
|
|
48
|
+
traverseFiberTree(boundary, (fiber) => {
|
|
49
|
+
if (fiber !== boundary) {
|
|
50
|
+
fibers.add(fiber.id);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
return fibers;
|
|
54
|
+
};
|
|
55
|
+
/** Cancels all effects that aren't destructors for given set of fibers. */
|
|
56
|
+
const cancelSetEffects = (app, fibers) => {
|
|
57
|
+
for (const group of [
|
|
58
|
+
app.effects.layout,
|
|
59
|
+
app.effects.normal,
|
|
60
|
+
app.effects.refsMount,
|
|
61
|
+
]) {
|
|
62
|
+
for (const effect of group) {
|
|
63
|
+
if (fibers.has(effect.fiber.id)) {
|
|
64
|
+
effect.cancelled = true;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
19
67
|
}
|
|
20
68
|
};
|
|
21
69
|
//# sourceMappingURL=effects.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effects.js","sourceRoot":"","sources":["../../../src/core/reconciliation/effects.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"effects.js","sourceRoot":"","sources":["../../../src/core/reconciliation/effects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
import type { FiberNode } from '../../../types';
|
|
2
|
+
import type { CatchErrorAction } from '../../../types/actions';
|
|
2
3
|
export declare class ReactError extends Error {
|
|
3
4
|
fiber: FiberNode;
|
|
5
|
+
fullStack: string;
|
|
4
6
|
constructor(fiber: FiberNode, error: unknown, prefix?: string);
|
|
7
|
+
/**
|
|
8
|
+
* Finds the closest error boundary and prepares a CatchError action. If a
|
|
9
|
+
* boundary wasn't found it returns null.
|
|
10
|
+
*/
|
|
11
|
+
genCatchAction(): CatchErrorAction | null;
|
|
12
|
+
catchActionArrOrPassThru(): CatchErrorAction[] | ReactError;
|
|
5
13
|
}
|
|
6
14
|
export declare const nullthrowsForFiber: <T>(fiber: FiberNode, val: T | null | undefined, label?: string) => T;
|
|
7
15
|
//# sourceMappingURL=ReactError.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactError.d.ts","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/ReactError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ReactError.d.ts","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/ReactError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,qBAAa,UAAW,SAAQ,KAAK;IACnC,KAAK,EAAE,SAAS,CAAC;IAEjB,SAAS,EAAE,MAAM,CAAC;IAElB,YAAY,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,EAgB5D;IAED;;;OAGG;IACH,cAAc,IAAI,gBAAgB,GAAG,IAAI,CAcxC;IAED,wBAAwB,IAAI,gBAAgB,EAAE,GAAG,UAAU,CAG1D;CACF;AAUD,eAAO,MAAM,kBAAkB,GAAI,CAAC,mEAUnC,CAAC"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { captureStack, getFiberLabel } from './stack';
|
|
2
|
+
import { findClosestErrorBoundary } from '../../../hooks/useError';
|
|
3
|
+
import { traverseFiberTree } from '../../../core/actions/helpers';
|
|
4
|
+
import { getAppByFiber } from '../app';
|
|
2
5
|
export class ReactError extends Error {
|
|
3
6
|
fiber;
|
|
7
|
+
// Like .stack but contains the label of the node where the error occured.
|
|
8
|
+
fullStack;
|
|
4
9
|
constructor(fiber, error, prefix) {
|
|
5
10
|
let message = ((prefix ? `${prefix}. ` : '') + errToStr(error)).replace('%fiber%', getFiberLabel(fiber));
|
|
6
11
|
super(message);
|
|
@@ -9,6 +14,31 @@ export class ReactError extends Error {
|
|
|
9
14
|
const stack = captureStack(fiber);
|
|
10
15
|
this.message +=
|
|
11
16
|
'\nReact stack:\n' + stack.map((line) => ` ├— ${line}`).join('\n');
|
|
17
|
+
this.fullStack = captureStack(fiber, false)
|
|
18
|
+
.map((line) => ` ├— ${line}`)
|
|
19
|
+
.join('\n');
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Finds the closest error boundary and prepares a CatchError action. If a
|
|
23
|
+
* boundary wasn't found it returns null.
|
|
24
|
+
*/
|
|
25
|
+
genCatchAction() {
|
|
26
|
+
const boundary = findClosestErrorBoundary(this.fiber);
|
|
27
|
+
if (!boundary)
|
|
28
|
+
return null;
|
|
29
|
+
const app = getAppByFiber(this.fiber);
|
|
30
|
+
// Remove from the whole app.invalidatedComponents all components that are
|
|
31
|
+
// children from `fiber`?
|
|
32
|
+
traverseFiberTree(boundary, (child) => {
|
|
33
|
+
if (child.type === 'component') {
|
|
34
|
+
app.invalidatedComponents.delete(child);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
return { type: 'CatchError', fiber: boundary, error: this };
|
|
38
|
+
}
|
|
39
|
+
catchActionArrOrPassThru() {
|
|
40
|
+
const catchAction = this.genCatchAction();
|
|
41
|
+
return catchAction ? [catchAction] : this;
|
|
12
42
|
}
|
|
13
43
|
}
|
|
14
44
|
const errToStr = (error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactError.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/ReactError.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEtD,MAAM,OAAO,UAAW,SAAQ,KAAK;IACnC,KAAK,CAAY;
|
|
1
|
+
{"version":3,"file":"ReactError.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/ReactError.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ import type { FiberNode } from '../../../types';
|
|
|
4
4
|
* @example
|
|
5
5
|
* ['<div.test/>', '<Label/>', '<App/>']
|
|
6
6
|
*/
|
|
7
|
-
export declare const captureStack: (fiber: FiberNode) => string[];
|
|
7
|
+
export declare const captureStack: (fiber: FiberNode, skipRoot?: boolean) => string[];
|
|
8
8
|
export declare const getFiberLabel: (fiber: FiberNode) => string;
|
|
9
9
|
//# sourceMappingURL=stack.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.d.ts","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/stack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAgB,MAAM,oBAAoB,CAAC;AAIlE;;;;GAIG;AACH,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"stack.d.ts","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/stack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAgB,MAAM,oBAAoB,CAAC;AAIlE;;;;GAIG;AACH,eAAO,MAAM,YAAY,oDASxB,CAAC;AAEF,eAAO,MAAM,aAAa,8BAoCzB,CAAC"}
|
|
@@ -5,8 +5,8 @@ import { isFiberDead } from '../fibers';
|
|
|
5
5
|
* @example
|
|
6
6
|
* ['<div.test/>', '<Label/>', '<App/>']
|
|
7
7
|
*/
|
|
8
|
-
export const captureStack = (fiber) => {
|
|
9
|
-
const result = [];
|
|
8
|
+
export const captureStack = (fiber, skipRoot = true) => {
|
|
9
|
+
const result = skipRoot ? [] : [getFiberLabel(fiber)];
|
|
10
10
|
while (fiber.parent && fiber.parent.tag !== 'root') {
|
|
11
11
|
result.push(getFiberLabel(fiber.parent));
|
|
12
12
|
fiber = fiber.parent;
|
|
@@ -28,7 +28,7 @@ export const getFiberLabel = (fiber) => {
|
|
|
28
28
|
// portal(<div#portal/>)
|
|
29
29
|
case 'tag':
|
|
30
30
|
return fiber.role === 'portal'
|
|
31
|
-
? `portal(<${fiber.
|
|
31
|
+
? `portal(<${fiber.data?.tagName.toLowerCase()}${tagAttrs(fiber.data)}/>`
|
|
32
32
|
: `<${fiber.tag}${tagAttrs(fiber)}/>${source(fiber)}`;
|
|
33
33
|
// #hello world
|
|
34
34
|
case 'text':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/stack.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAgB,EAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../../src/core/reconciliation/errors/stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EAGX,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EAGX,MAAM,oBAAoB,CAAC;AAY5B;;;GAGG;AACH,eAAO,MAAM,KAAK,4GAyDjB,CAAC"}
|
|
@@ -6,6 +6,7 @@ import { postCommit } from './postCommit';
|
|
|
6
6
|
import { removeApp, registerApp } from './app';
|
|
7
7
|
import { createFiberNode, toFiberChildren } from './fibers';
|
|
8
8
|
import { Queue } from './queue';
|
|
9
|
+
import { ReactError } from './errors/ReactError';
|
|
9
10
|
/**
|
|
10
11
|
* Mounts an app (`jsxElement`) to the given DOM node (`container`). Returns
|
|
11
12
|
* a function that destroys the app and removes all of its DOM nodes.
|
|
@@ -28,10 +29,17 @@ export const mount = (container, jsxElement, options) => {
|
|
|
28
29
|
transformSource: options.transformSource,
|
|
29
30
|
tempContext: new Map(),
|
|
30
31
|
}));
|
|
31
|
-
const
|
|
32
|
+
const actions = [];
|
|
33
|
+
const mountX = jsxElementToFiberNode(jsxElement, app.root, true);
|
|
34
|
+
if (mountX instanceof ReactError) {
|
|
35
|
+
// Could not mount the app. No error boundary was found. Terminate the app.
|
|
36
|
+
throw mountX;
|
|
37
|
+
}
|
|
38
|
+
const [content, mountActions] = mountX;
|
|
39
|
+
actions.push(...mountActions);
|
|
32
40
|
app.root.children = toFiberChildren(content);
|
|
33
41
|
app.root.element = container;
|
|
34
|
-
|
|
42
|
+
actions.push(...collectActionsFromNewFiber(app.root).flat());
|
|
35
43
|
applyActions(app, actions);
|
|
36
44
|
if (app.testMode)
|
|
37
45
|
validateApp(app);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/core/reconciliation/mount.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/core/reconciliation/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAO9C;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,SAAI,QA4B9C"}
|
|
@@ -2,6 +2,7 @@ import { validateApp } from './validateApp';
|
|
|
2
2
|
import { collectActionsFromApp } from './collect/fromApp';
|
|
3
3
|
import { postCommit } from './postCommit';
|
|
4
4
|
import { applyActions } from './applyActions';
|
|
5
|
+
import { ReactError } from './errors/ReactError';
|
|
5
6
|
/**
|
|
6
7
|
* Performs another rendering round. Once anything changes a component's state
|
|
7
8
|
* (invalidates it), a new render cycle is scheduled. The render consists of:
|
|
@@ -23,10 +24,15 @@ export function reactRender(app, depth = 0) {
|
|
|
23
24
|
if (app.testMode)
|
|
24
25
|
validateApp(app);
|
|
25
26
|
app.state = 'render';
|
|
26
|
-
const
|
|
27
|
+
const actionsX = collectActionsFromApp(app);
|
|
28
|
+
if (actionsX instanceof ReactError) {
|
|
29
|
+
// Couldn't perform a subsequent render. No error boundary found or could
|
|
30
|
+
// manage this render error. Pass it through.
|
|
31
|
+
throw actionsX;
|
|
32
|
+
}
|
|
27
33
|
if (app.testMode)
|
|
28
34
|
validateApp(app);
|
|
29
|
-
applyActions(app,
|
|
35
|
+
applyActions(app, actionsX);
|
|
30
36
|
if (app.testMode)
|
|
31
37
|
validateApp(app);
|
|
32
38
|
postCommit(app, depth);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/core/reconciliation/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/core/reconciliation/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,KAAK,GAAG,CAAC,EAAE;IAC/C,IAAI,KAAK,GAAG,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,qBAAqB,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ;QAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAEnC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC;IACrB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;QACnC,yEAAyE;QACzE,6CAA6C;QAC7C,MAAM,QAAQ,CAAC;IACjB,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ;QAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAEnC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC5B,IAAI,GAAG,CAAC,QAAQ;QAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAEnC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAAA,CACxB;AAED,MAAM,SAAS,GAAG,EAAE,CAAC,CAAC,iBAAiB"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { App, FiberNode } from '../../types';
|
|
2
|
+
import { ReactError } from './errors/ReactError';
|
|
3
|
+
import type { Action } from '../../types/actions';
|
|
2
4
|
/**
|
|
3
5
|
* By default we don't run all components. We run only those that were manually
|
|
4
6
|
* invalidated, as if they were all wrapped with `memo()`. So the `.children`
|
|
@@ -6,5 +8,5 @@ import type { App, FiberNode } from '../../types';
|
|
|
6
8
|
* given fiber DOM subtree nodes and runs all found components to fill their
|
|
7
9
|
* `.children`. Should be used only for not-yet-mounted component fiber nodes.
|
|
8
10
|
*/
|
|
9
|
-
export declare const runFiberComponents: (app: App, fiber: FiberNode) =>
|
|
11
|
+
export declare const runFiberComponents: (app: App, fiber: FiberNode) => Action[] | ReactError;
|
|
10
12
|
//# sourceMappingURL=runFiberComponents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runFiberComponents.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/runFiberComponents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"runFiberComponents.d.ts","sourceRoot":"","sources":["../../../src/core/reconciliation/runFiberComponents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAiB,MAAM,oBAAoB,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,uDAkD9B,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { runComponent } from '../components';
|
|
2
2
|
import { jsxElementToFiberNode } from '../reactNodeToFiberNode';
|
|
3
|
-
import { FAKE_CONTAINER_TAG, toFiberChildren } from './fibers';
|
|
3
|
+
import { createFiberNode, FAKE_CONTAINER_TAG, toFiberChildren } from './fibers';
|
|
4
4
|
import { ReactError } from './errors/ReactError';
|
|
5
|
+
import { isErrorBoundary } from '../../hooks/useError';
|
|
5
6
|
/**
|
|
6
7
|
* By default we don't run all components. We run only those that were manually
|
|
7
8
|
* invalidated, as if they were all wrapped with `memo()`. So the `.children`
|
|
@@ -12,20 +13,46 @@ import { ReactError } from './errors/ReactError';
|
|
|
12
13
|
export const runFiberComponents = (app, fiber) => {
|
|
13
14
|
if (app.testMode)
|
|
14
15
|
checkParents(fiber);
|
|
16
|
+
const actions = [];
|
|
15
17
|
switch (fiber.type) {
|
|
16
18
|
case 'fragment':
|
|
17
19
|
case 'tag':
|
|
18
20
|
for (const child of fiber.children) {
|
|
19
|
-
runFiberComponents(app, child);
|
|
21
|
+
const childActionsX = runFiberComponents(app, child);
|
|
22
|
+
// Tags & fragemtns can't be error boundaries. Pass it through.
|
|
23
|
+
if (childActionsX instanceof ReactError)
|
|
24
|
+
return childActionsX;
|
|
25
|
+
actions.push(...childActionsX);
|
|
20
26
|
}
|
|
21
27
|
break;
|
|
22
28
|
case 'component': {
|
|
23
|
-
const
|
|
24
|
-
|
|
29
|
+
const compX = runComponent(fiber, null);
|
|
30
|
+
// `fiber` can't be an error boundary for itself.
|
|
31
|
+
if (compX instanceof ReactError)
|
|
32
|
+
return compX;
|
|
33
|
+
const [newChildren, compActions] = compX;
|
|
34
|
+
let childrenX = jsxElementToFiberNode(newChildren, fiber, true /* run children-components recursively */);
|
|
35
|
+
if (childrenX instanceof ReactError) {
|
|
36
|
+
if (isErrorBoundary(fiber)) {
|
|
37
|
+
// `fiber` is not mounted yet, and it must have at least one child node.
|
|
38
|
+
const nullFiber = {
|
|
39
|
+
...createFiberNode(fiber),
|
|
40
|
+
type: 'null',
|
|
41
|
+
parent: fiber,
|
|
42
|
+
props: null,
|
|
43
|
+
};
|
|
44
|
+
childrenX = [nullFiber, [childrenX.genCatchAction()]];
|
|
45
|
+
}
|
|
46
|
+
else
|
|
47
|
+
return childrenX;
|
|
48
|
+
}
|
|
49
|
+
const [child, childrenActions] = childrenX;
|
|
25
50
|
fiber.children = toFiberChildren(child);
|
|
51
|
+
actions.push(...compActions, ...childrenActions);
|
|
26
52
|
break;
|
|
27
53
|
}
|
|
28
54
|
}
|
|
55
|
+
return actions;
|
|
29
56
|
};
|
|
30
57
|
const checkParents = (fiber) => {
|
|
31
58
|
let parent = fiber.parent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runFiberComponents.js","sourceRoot":"","sources":["../../../src/core/reconciliation/runFiberComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"runFiberComponents.js","sourceRoot":"","sources":["../../../src/core/reconciliation/runFiberComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,GAAQ,EACR,KAAgB,EACO,EAAE,CAAC;IAC1B,IAAI,GAAG,CAAC,QAAQ;QAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,UAAU,CAAC;QAChB,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACnC,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACrD,+DAA+D;gBAC/D,IAAI,aAAa,YAAY,UAAU;oBAAE,OAAO,aAAa,CAAC;gBAC9D,OAAO,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;YACjC,CAAC;YACD,MAAM;QAER,KAAK,WAAW,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACxC,iDAAiD;YACjD,IAAI,KAAK,YAAY,UAAU;gBAAE,OAAO,KAAK,CAAC;YAE9C,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;YACzC,IAAI,SAAS,GAAG,qBAAqB,CACnC,WAAW,EACX,KAAK,EACL,IAAI,CAAC,yCAAyC,CAC/C,CAAC;YACF,IAAI,SAAS,YAAY,UAAU,EAAE,CAAC;gBACpC,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,wEAAwE;oBACxE,MAAM,SAAS,GAAkB;wBAC/B,GAAG,eAAe,CAAC,KAAK,CAAC;wBACzB,IAAI,EAAE,MAAM;wBACZ,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,IAAI;qBACZ,CAAC;oBACF,SAAS,GAAG,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,cAAc,EAAG,CAAC,CAAC,CAAC;gBACzD,CAAC;;oBAAM,OAAO,SAAS,CAAC;YAC1B,CAAC;YAED,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,SAAS,CAAC;YAC3C,KAAK,CAAC,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,EAAE,GAAG,eAAe,CAAC,CAAC;YACjD,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AAAA,CAChB,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAgB,EAAQ,EAAE,CAAC;IAC/C,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1B,OAAO,MAAM,IAAI,MAAM,CAAC,GAAG,KAAK,kBAAkB;QAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,UAAU,CAClB,KAAK,EACL,wEAAwE,CACzE,CAAC;IACJ,CAAC;AAAA,CACF,CAAC"}
|
package/dist/hooks/helpers.d.ts
CHANGED
|
@@ -14,6 +14,6 @@ export declare const checkDeps: (saved: unknown[], deps: unknown[]) => boolean;
|
|
|
14
14
|
* create the initial hook state during the 1st render.
|
|
15
15
|
*/
|
|
16
16
|
export declare const getNextHookOrCreate: <T extends {
|
|
17
|
-
type: "context" | "effect" | "memo" | "ref" | "state";
|
|
18
|
-
}>(type: "context" | "effect" | "memo" | "ref" | "state", fn: (fiber: ComponentFiberNode) => T) => T;
|
|
17
|
+
type: "context" | "effect" | "error" | "memo" | "ref" | "state";
|
|
18
|
+
}>(type: "context" | "effect" | "error" | "memo" | "ref" | "state", fn: (fiber: ComponentFiberNode) => T) => T;
|
|
19
19
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/hooks/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAGlB;;;GAGG;AACH,eAAO,MAAM,QAAQ,+BAIpB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,gDASrB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC;;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/hooks/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACxB,MAAM,UAAU,CAAC;AAGlB;;;GAGG;AACH,eAAO,MAAM,QAAQ,+BAIpB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,gDASrB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC;;8GA0BpC,CAAC"}
|
package/dist/hooks/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/hooks/index.js
CHANGED
package/dist/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useEffect.d.ts","sourceRoot":"","sources":["../../src/hooks/useEffect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useEffect.d.ts","sourceRoot":"","sources":["../../src/hooks/useEffect.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,aAAa,EAEnB,MAAM,UAAU,CAAC;AAGlB,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,aAAa,EACjB,IAAI,CAAC,EAAE,OAAO,EAAE,QA+BjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,SAAS,2DAWrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,eAAe,2DAW3B,CAAC"}
|
package/dist/hooks/useEffect.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getCurrentComponentFiber, isFirstFiberRender, } from '../core/components';
|
|
2
2
|
import { checkDeps, getNextHookOrCreate, saveDeps } from './helpers';
|
|
3
|
-
import { scheduleEffect } from '../core/reconciliation/effects';
|
|
4
3
|
export function useBaseEffect(mode, fn, deps) {
|
|
5
|
-
const item = getNextHookOrCreate('effect', () => {
|
|
4
|
+
const item = getNextHookOrCreate('effect', (fiber) => {
|
|
6
5
|
const item = {
|
|
7
6
|
type: 'effect',
|
|
8
7
|
mode,
|
|
@@ -10,12 +9,23 @@ export function useBaseEffect(mode, fn, deps) {
|
|
|
10
9
|
destructor: null,
|
|
11
10
|
deps: deps ? saveDeps(deps) : null,
|
|
12
11
|
};
|
|
13
|
-
|
|
12
|
+
fiber.data.actions.push({
|
|
13
|
+
type: 'ScheduleEffect',
|
|
14
|
+
fiber,
|
|
15
|
+
mode,
|
|
16
|
+
fn: () => runEffect(item),
|
|
17
|
+
});
|
|
14
18
|
return item;
|
|
15
19
|
});
|
|
16
20
|
item.fn = fn;
|
|
17
21
|
if (!isFirstFiberRender() && (!deps || !checkDeps(item.deps, deps))) {
|
|
18
|
-
|
|
22
|
+
const fiber = getCurrentComponentFiber();
|
|
23
|
+
fiber.data.actions.push({
|
|
24
|
+
type: 'ScheduleEffect',
|
|
25
|
+
fiber,
|
|
26
|
+
mode,
|
|
27
|
+
fn: () => runEffect(item),
|
|
28
|
+
});
|
|
19
29
|
item.deps = deps ? saveDeps(deps) : null;
|
|
20
30
|
}
|
|
21
31
|
}
|
|
@@ -86,8 +96,12 @@ deps) => {
|
|
|
86
96
|
useBaseEffect('layout', fn, deps);
|
|
87
97
|
};
|
|
88
98
|
const runEffect = (item) => {
|
|
89
|
-
item.destructor
|
|
99
|
+
const destructor = item.destructor;
|
|
100
|
+
// Clear it before running to avoid double-calling in the case of an error.
|
|
101
|
+
// "Remove" action would try to call it again, because it calls all fiber's
|
|
102
|
+
// hook destructors.
|
|
90
103
|
item.destructor = null;
|
|
104
|
+
destructor?.();
|
|
91
105
|
const controller = new AbortController();
|
|
92
106
|
const result = item.fn(controller.signal);
|
|
93
107
|
item.destructor = function effectDestructor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useEffect.js","sourceRoot":"","sources":["../../src/hooks/useEffect.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"useEffect.js","sourceRoot":"","sources":["../../src/hooks/useEffect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErE,MAAM,UAAU,aAAa,CAC3B,IAAgB,EAChB,EAAiB,EACjB,IAAgB,EAChB;IACA,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAiB,EAAE,CAAC;QACnE,MAAM,IAAI,GAAkB;YAC1B,IAAI,EAAE,QAAQ;YACd,IAAI;YACJ,EAAE;YACF,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;SACnC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,gBAAgB;YACtB,KAAK;YACL,IAAI;YACJ,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAAA,CACb,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IAEb,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QACrE,MAAM,KAAK,GAAG,wBAAwB,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,gBAAgB;YACtB,KAAK;YACL,IAAI;YACJ,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;AAAA,CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;AACvB;;+BAE+B;AAC/B,EAAiB;AACjB;;aAEa;AACb,IAAgB,EAChB,EAAE,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAAA,CACnC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;AAC7B;;+BAE+B;AAC/B,EAAiB;AACjB;;aAEa;AACb,IAAgB,EAChB,EAAE,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAAA,CACnC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAmB,EAAQ,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,2EAA2E;IAC3E,2EAA2E;IAC3E,oBAAoB;IACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,EAAE,CAAC;IAEf,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAE1C,IAAI,CAAC,UAAU,GAAG,SAAS,gBAAgB,GAAG;QAC5C,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,EAAE,CAAC;QACX,CAAC;IAAA,CACF,CAAC;AAAA,CACH,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ComponentFiberNode, ErrorHandler, FiberNode } from '../types';
|
|
2
|
+
export declare function useError(handler: ErrorHandler): void;
|
|
3
|
+
export declare const isErrorBoundary: (fiber: FiberNode) => fiber is ComponentFiberNode;
|
|
4
|
+
export declare const findClosestErrorBoundary: (fiber: FiberNode) => FiberNode | null;
|
|
5
|
+
//# sourceMappingURL=useError.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useError.d.ts","sourceRoot":"","sources":["../../src/hooks/useError.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAE5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAUpD;AAED,eAAO,MAAM,eAAe,mDAG8B,CAAC;AAE3D,eAAO,MAAM,wBAAwB,wCAQpC,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { getNextHookOrCreate } from './helpers';
|
|
2
|
+
export function useError(handler) {
|
|
3
|
+
const item = getNextHookOrCreate('error', (fiber) => {
|
|
4
|
+
fiber.data.isErrorBoundary = true;
|
|
5
|
+
return {
|
|
6
|
+
type: 'error',
|
|
7
|
+
fn: handler,
|
|
8
|
+
};
|
|
9
|
+
});
|
|
10
|
+
item.fn = handler;
|
|
11
|
+
}
|
|
12
|
+
export const isErrorBoundary = (fiber) => fiber.type === 'component' && fiber.data.isErrorBoundary;
|
|
13
|
+
export const findClosestErrorBoundary = (fiber) => {
|
|
14
|
+
while (fiber.parent && !isErrorBoundary(fiber.parent)) {
|
|
15
|
+
fiber = fiber.parent;
|
|
16
|
+
}
|
|
17
|
+
return fiber.parent ?? null;
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=useError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useError.js","sourceRoot":"","sources":["../../src/hooks/useError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAQhD,MAAM,UAAU,QAAQ,CAAC,OAAqB,EAAQ;IACpD,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAgB,EAAE,CAAC;QACjE,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAClC,OAAO;YACL,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,OAAO;SACZ,CAAC;IAAA,CACH,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC;AAAA,CACnB;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,KAAgB,EACa,EAAE,CAC/B,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;AAE3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,KAAgB,EACE,EAAE,CAAC;IACrB,OAAO,KAAK,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC;AAAA,CAC7B,CAAC"}
|