no type issues, woop woop

Author: christianalfoni

packages/app/src/app/overmind/actions.ts

@@ -235,7 +235,7 @@ export const refetchSandboxInfo: AsyncAction = async ({
   sandbox.setCollection(updatedSandbox.collection);
   sandbox.setOwned(updatedSandbox.owned);
   sandbox.setLiked(updatedSandbox.userLiked);
-  sandbox.setTitle(updatedSandbox.title);
+  sandbox.setTitle(updatedSandbox.title || '');
   sandbox.setTeam(updatedSandbox.team);
   sandbox.setRoomId(updatedSandbox.roomId);
 

packages/app/src/app/overmind/effects/prettyfier.ts

@@ -17,7 +17,7 @@ export default {
       title,
       () => code,
       _options.getPrettierConfig(),
-      () => _options.getCurrentModule().id === moduleId
+      () => _options.getCurrentModule()?.id === moduleId
     );
   },
 };

packages/app/src/app/overmind/internalActions.ts

@@ -210,7 +210,7 @@ export const setCurrentSandbox: AsyncAction<Sandbox> = async (
 
   const newTab: ModuleTab = {
     type: TabType.MODULE,
-    moduleShortid: state.editor.sandbox.currentModule.shortid,
+    moduleShortid: state.editor.sandbox.currentModule?.shortid ?? null,
     dirty: true,
   };
 
@@ -260,8 +260,14 @@ export const updateCurrentSandbox: AsyncAction<Sandbox> = async (
     return;
   }
 
-  state.editor.sandbox.setTeam(sandbox.team || null);
-  state.editor.sandbox.setCollection(sandbox.collection);
+  if (sandbox.team) {
+    state.editor.sandbox.setTeam(sandbox.team);
+  }
+
+  if (sandbox.collection) {
+    state.editor.sandbox.setCollection(sandbox.collection);
+  }
+
   state.editor.sandbox.setOwned(sandbox.owned);
   state.editor.sandbox.setLiked(sandbox.userLiked);
   state.editor.sandbox.setTitle(sandbox.title);
@@ -321,15 +327,20 @@ export const ensurePackageJSON: AsyncAction = async ({
 };
 
 export const closeTabByIndex: Action<number> = ({ state }, tabIndex) => {
-  const { currentModule } = state.editor.sandbox;
+  const sandbox = state.editor.sandbox;
   const tabs = state.editor.tabs as ModuleTab[];
-  const isActiveTab = currentModule.shortid === tabs[tabIndex].moduleShortid;
+  const isActiveTab =
+    sandbox.currentModule?.shortid === tabs[tabIndex].moduleShortid;
 
   if (isActiveTab) {
     const newTab = tabIndex > 0 ? tabs[tabIndex - 1] : tabs[tabIndex + 1];
 
-    if (newTab) {
-      currentModule.shortid = newTab.moduleShortid;
+    if (
+      newTab &&
+      newTab.moduleShortid &&
+      sandbox.getModule(newTab.moduleShortid)
+    ) {
+      sandbox.setCurrentModule(sandbox.getModule(newTab.moduleShortid)!);
     }
   }
 

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -66,7 +66,9 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
 }>(async ({ state, actions, effects }, { id }) => {
   // This happens when we fork. This can be avoided with state first routing
   if (state.editor.isForkingSandbox && state.editor.sandbox) {
-    effects.vscode.openModule(state.editor.sandbox.currentModule);
+    if (state.editor.sandbox.currentModule) {
+      effects.vscode.openModule(state.editor.sandbox.currentModule);
+    }
 
     await actions.editor.internal.initializeLiveSandbox();
 
@@ -142,7 +144,10 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
     await effects.live.sendModuleStateSyncRequest();
   }
 
-  effects.vscode.openModule(sandbox.currentModule);
+  if (sandbox.currentModule) {
+    effects.vscode.openModule(sandbox.currentModule);
+  }
+
   effects.preview.executeCodeImmediately({ initialRender: true });
 
   state.editor.isLoading = false;
@@ -251,7 +256,7 @@ export const codeChanged: Action<{
   });
 
   if (
-    !state.editor.sandbox.templateDefinition.isServer &&
+    !state.editor.sandbox.templateDefinition?.isServer &&
     state.preferences.settings.livePreviewEnabled
   ) {
     actions.editor.internal.updatePreviewCode();
@@ -377,14 +382,12 @@ export const moduleSelected: Action<
   | {
       // Id means it is coming from Explorer
       id: string;
-      path?: undefined;
     }
   | {
       // Path means it is coming from VSCode
-      id?: undefined;
       path: string;
     }
-> = ({ actions, effects, state }, { id, path }) => {
+> = ({ actions, effects, state }, payload) => {
   effects.analytics.track('Open File');
 
   const sandbox = state.editor.sandbox;
@@ -394,11 +397,12 @@ export const moduleSelected: Action<
   }
 
   try {
-    const module = path
-      ? sandbox.getModuleByPath(path)
-      : sandbox.getModuleById(id);
+    const module =
+      'path' in payload
+        ? sandbox.getModuleByPath(payload.path)
+        : sandbox.getModuleById(payload.id);
 
-    if (sandbox.isCurrentModule(module)) {
+    if (!module || sandbox.isCurrentModule(module)) {
       return;
     }
 
@@ -447,7 +451,7 @@ export const moduleDoubleClicked: Action = ({ state, effects }) => {
   const tabs = state.editor.tabs as ModuleTab[];
   const tab = tabs.find(
     tabItem =>
-      tabItem.moduleShortid === state.editor.sandbox.currentModule.shortid
+      tabItem.moduleShortid === state.editor.sandbox.currentModule?.shortid
   );
 
   if (tab) {
@@ -479,7 +483,7 @@ export const prettifyClicked: AsyncAction = async ({
 }) => {
   effects.analytics.track('Prettify Code');
   const module = state.editor.sandbox.currentModule;
-  if (!module.id) {
+  if (!module?.id) {
     return;
   }
   const newCode = await effects.prettyfier.prettify(
@@ -617,7 +621,7 @@ export const showEnvironmentVariablesNotification: AsyncAction = async ({
 
   await actions.editor.fetchEnvironmentVariables();
 
-  const environmentVariables = sandbox.environmentVariables;
+  const environmentVariables = sandbox.environmentVariables || {};
   const emptyVarCount = Object.keys(environmentVariables).filter(
     key => !environmentVariables[key]
   ).length;

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

@@ -187,6 +187,7 @@ export const updateCurrentTemplate: AsyncAction = async ({
         'node') as TemplateType;
 
       if (
+        template &&
         newTemplate !== template.name &&
         template.isServer === getTemplateDefinition(newTemplate).isServer
       ) {
@@ -297,7 +298,7 @@ export const forkSandbox: AsyncAction<{
   const sandbox = state.editor.sandbox;
   const template = sandbox.templateDefinition;
 
-  if (!state.isLoggedIn && template.isServer) {
+  if (!state.isLoggedIn && template?.isServer) {
     effects.analytics.track('Show Server Fork Sign In Modal');
     actions.modalOpened({ modal: 'forkServerModal' });
 
@@ -337,7 +338,7 @@ export const forkSandbox: AsyncAction<{
     );
     effects.preview.updateAddressbarUrl();
 
-    if (template.isServer) {
+    if (template && template.isServer) {
       effects.preview.refresh();
       actions.server.startContainer(forkedSandbox);
     }
@@ -348,7 +349,7 @@ export const forkSandbox: AsyncAction<{
 
     effects.notificationToast.success('Forked sandbox!');
 
-    if (template.isServer) {
+    if (template && template.isServer) {
       actions.editor.showEnvironmentVariablesNotification();
     }
 

packages/app/src/app/overmind/namespaces/editor/models/EditorSandbox.ts

@@ -339,8 +339,8 @@ export class EditorSandbox {
     this.currentSandbox.template = template;
   }
 
-  setTitle(title: string) {
-    this.currentSandbox.title = title;
+  setTitle(title: string | null) {
+    this.currentSandbox.title = title || '';
   }
 
   setDescription(description: string) {
@@ -375,15 +375,15 @@ export class EditorSandbox {
     this.currentSandbox.previewSecret = previewSecret;
   }
 
-  setTeam(team: { id: string; name: string }) {
+  setTeam(team: { id: string; name: string } | null) {
     this.currentSandbox.team = team;
   }
 
-  setRoomId(roomId: string) {
+  setRoomId(roomId: string | null) {
     this.currentSandbox.roomId = roomId;
   }
 
-  setCollection(collection: { path: string }) {
+  setCollection(collection: { path: string } | null) {
     this.currentSandbox.collection = collection;
   }
 

packages/app/src/app/overmind/namespaces/editor/state.ts

@@ -91,7 +91,7 @@ export const state: State = {
     return tabs.find(
       tab =>
         'moduleShortid' in tab &&
-        tab.moduleShortid === currentSandbox.currentModule.shortid
+        tab.moduleShortid === currentSandbox.currentModule?.shortid
     );
   },
   /**

packages/app/src/app/overmind/namespaces/files/actions.ts

@@ -642,7 +642,9 @@ export const moduleDeleted: AsyncAction<{
     }
 
     const removedModule = sandbox.removeModule(module);
-    const wasCurrentModule = sandbox.currentModule.shortid === moduleShortid;
+    const wasCurrentModule = sandbox.currentModule
+      ? sandbox.currentModule.shortid === moduleShortid
+      : false;
 
     effects.vscode.sandboxFsSync.unlink(
       state.editor.modulesByPath,

packages/app/src/app/overmind/namespaces/live/actions.ts

@@ -59,7 +59,9 @@ export const roomJoined: AsyncAction<{
   });
 
   effects.live.sendModuleStateSyncRequest();
-  effects.vscode.openModule(state.editor.sandbox.currentModule);
+  if (state.editor.sandbox.currentModule) {
+    effects.vscode.openModule(state.editor.sandbox.currentModule);
+  }
   effects.preview.executeCodeImmediately({ initialRender: true });
   state.editor.isLoading = false;
 });
@@ -151,7 +153,7 @@ export const sendCurrentSelection: Action = ({ state, effects }) => {
 
   if (state.live.isCurrentEditor) {
     const { liveUserId } = state.live;
-    if (liveUserId) {
+    if (liveUserId && state.editor.sandbox.currentModule) {
       effects.live.sendUserSelection(
         state.editor.sandbox.currentModule.shortid,
         liveUserId,
@@ -171,7 +173,7 @@ export const onSelectionChanged: Action<any> = (
 
   if (state.live.isCurrentEditor) {
     const { liveUserId } = state.live;
-    const moduleShortid = state.editor.sandbox.currentModule.shortid;
+    const moduleShortid = state.editor.sandbox.currentModule?.shortid;
     if (!moduleShortid || !liveUserId) {
       return;
     }

packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts

@@ -222,7 +222,7 @@ export const onModuleUpdated: Operator<LiveMessage<{
 export const onModuleDeleted: Operator<LiveMessage<{
   moduleShortid: string;
 }>> = mutate(({ state, effects, actions }, { _isOwnMessage, data }) => {
-  if (_isOwnMessage || !state.editor.sandbox) {
+  if (_isOwnMessage) {
     return;
   }
   const sandbox = state.editor.sandbox;
@@ -233,7 +233,9 @@ export const onModuleDeleted: Operator<LiveMessage<{
     return;
   }
   const moduleIndex = state.editor.sandbox.modules.indexOf(removedModule);
-  const wasCurrentModule = sandbox.currentModule.shortid === data.moduleShortid;
+  const wasCurrentModule = sandbox.currentModule
+    ? sandbox.currentModule.shortid === data.moduleShortid
+    : false;
 
   state.editor.sandbox.modules.splice(moduleIndex, 1);
   effects.vscode.sandboxFsSync.unlink(