Skip to content

Commit

Permalink
effector#149 Fix crash in try environment while use restore
Browse files Browse the repository at this point in the history
  • Loading branch information
Antropov Andrey committed Jul 15, 2019
1 parent fae4eb5 commit 692fec2
Showing 1 changed file with 42 additions and 23 deletions.
65 changes: 42 additions & 23 deletions website/editor/src/dynamic.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,52 @@
//@flow

import {createStoreObject, sample, forward, is} from 'effector'
import fetch from 'cross-fetch'
import {
createStoreObject,
forward,
is,
sample,
} from 'effector'
import {compress} from './compression'

import {
changeSources,
codeCursorActivity,
codeError,
codeMarkLine,
evalEffect,
intervals,
packageVersions,
realmClearNode,
realmEvent,
realmStore,
realmEffect,
realmComponent,
realmDomain,
realmInvoke,
realmEffect,
realmEvent,
realmInterval,
realmTimeout,
realmComponent,
evalEffect,
sourceCode,
codeError,
intervals,
timeouts,
realmInvoke,
realmStatus,
stats,
packageVersions,
selectVersion,
realmStore,
realmTimeout,
retrieveCode,
retrieveVersion,
selectVersion,
sourceCode,
stats,
timeouts,
version,
} from './domain'
import {typeAtPos, typeNode} from './flow/domain'
import {
evaluator,
versionLoader,
} from './evaluator'
import {
typeAtPos,
typeNode,
} from './flow/domain'
import {resetGraphiteState} from './graphite/domain'
import {compress} from './compression'
import {versionLoader, evaluator} from './evaluator'
import {typechecker, typeHoverToggle} from './settings/domain'
import {
typechecker,
typeHoverToggle,
} from './settings/domain'
import {switcher} from './switcher'

version.on(selectVersion, (_, p) => p)
Expand Down Expand Up @@ -196,8 +209,14 @@ switcher({

realmInvoke.watch(({method, params, instance}) => {
if (method === 'restore') {
for (const key in instance) {
realmStore(instance[key])
if (params.length > 0
&& (params[0].kind === 'event' || params[0].kind === 'effect')
) {
realmStore(instance)
} else {
for (const key in instance) {
realmStore(instance[key])
}
}
}
if (method === 'createApi') {
Expand Down Expand Up @@ -263,7 +282,7 @@ codeError
})

let textMarker
codeError.watch(async ({stackFrames}) => {
codeError.watch(async({stackFrames}) => {
if (textMarker) textMarker.clear()
for (const frame of stackFrames) {
if (frame._originalFileName !== 'repl.js') continue
Expand Down

0 comments on commit 692fec2

Please sign in to comment.