2 files changed, 42 insertions, 20 deletions

diff --git a/packages/renderer/src/stores/RendererEnv.ts b/packages/renderer/src/stores/RendererEnv.ts
new file mode 100644
index 0000000..f2ec519
--- /dev/null
+++ b/packages/renderer/src/stores/RendererEnv.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { getEnv as getAnyEnv, IAnyStateTreeNode } from 'mobx-state-tree';
+import type { SophieRenderer } from '@sophie/shared';
+
+export interface RendererEnv {
+  ipc: Omit<SophieRenderer, 'setSharedStoreListener'>;
+}
+
+/**
+ * Gets a well-typed environment from `model`.
+ *
+ * Only useable inside state trees created by `createAndConnectRootStore`.
+ *
+ * @param model The state tree node.
+ */
+export function getEnv(model: IAnyStateTreeNode): RendererEnv {
+  return getAnyEnv<RendererEnv>(model);
+}
diff --git a/packages/renderer/src/stores/RootStore.ts b/packages/renderer/src/stores/RendererStore.ts
index f7f37f0..001f23a 100644
--- a/packages/renderer/src/stores/RootStore.ts
+++ b/packages/renderer/src/stores/RendererStore.ts
@@ -21,8 +21,6 @@
 import {
   applySnapshot,
   applyPatch,
-  getEnv as getAnyEnv,
-  IAnyStateTreeNode,
   Instance,
   types
 } from 'mobx-state-tree';
@@ -33,22 +31,9 @@ import {
   ThemeSource,
 } from '@sophie/shared';
 
-export interface RootEnv {
-  ipc: Omit<SophieRenderer, 'setSharedStoreListener'>;
-}
-
-/**
- * Gets a well-typed environment from `model`.
- *
- * Only useable inside state trees created by `createAndConnectRootStore`.
- *
- * @param model The state tree node.
- */
-export function getEnv(model: IAnyStateTreeNode): RootEnv {
-  return getAnyEnv<RootEnv>(model);
-}
+import { getEnv } from './RendererEnv';
 
-export const rootStore = types.model('RootStore', {
+export const rendererStore = types.model('RendererStore', {
   shared: types.optional(sharedStore, {}),
 }).actions((self) => ({
   setBrowserViewBounds(bounds: BrowserViewBounds) {
@@ -66,7 +51,7 @@ export const rootStore = types.model('RootStore', {
   },
 }));
 
-export interface RootStore extends Instance<typeof rootStore> {}
+export interface RendererStore extends Instance<typeof rendererStore> {}
 
 /**
  * Creates a new `RootStore` with a new environment and connects it to `ipc`.
@@ -76,8 +61,8 @@ export interface RootStore extends Instance<typeof rootStore> {}
  *
  * @param ipc The `sophieRenderer` context bridge.
  */
-export function createAndConnectRootStore(ipc: SophieRenderer): RootStore {
-  const store = rootStore.create({}, {
+export function createAndConnectRendererStore(ipc: SophieRenderer): RendererStore {
+  const store = rendererStore.create({}, {
     ipc,
   });