Use app logic for loading default file in embed (codesandbox#2382)

siddharthkp · CompuIves · commit f9a7742457d5 · 2019-09-10T14:37:31.000+02:00
* Use app logic for loading default file in embed * simplify flow by removing try catch * we basically need the entire sandbox at this point * fetch parsedConfig * make conditionals less error prone * reset circle ci cache * Revert "reset circle ci cache" This reverts commit c9d30a2. * create a browser compatible fork of jsonlint * remove outdated comment * remove jsonlint from deps * move jsonlint to vendors + eslintignore it * Revert "move jsonlint to vendors + eslintignore it" This reverts commit 90a3559.
diff --git a/packages/app/src/embed/components/App/index.js b/packages/app/src/embed/components/App/index.js
@@ -225,13 +225,11 @@ export default class App extends React.PureComponent<
   getCurrentModuleFromPath = (sandbox: Sandbox): Module => {
     const { currentModule: currentModulePath } = this.state;
 
-    return (
-      findCurrentModule(
-        sandbox.modules,
-        sandbox.directories,
-        currentModulePath,
-        findMainModule(sandbox.modules, sandbox.directories, sandbox.entry)
-      ) || sandbox.modules[0]
+    return findCurrentModule(
+      sandbox.modules,
+      sandbox.directories,
+      currentModulePath,
+      findMainModule(sandbox)
     );
   };
 
diff --git a/packages/app/src/embed/components/Content/index.tsx b/packages/app/src/embed/components/Content/index.tsx
@@ -387,7 +387,7 @@ export default class Content extends React.PureComponent<Props, State> {
     } = this.props;
 
     const mainModule = isInProjectView
-      ? findMainModule(sandbox.modules, sandbox.directories, sandbox.entry)
+      ? findMainModule(sandbox)
       : currentModule;
 
     if (!mainModule) throw new Error('Cannot find main module');
diff --git a/packages/common/src/sandbox/modules.ts b/packages/common/src/sandbox/modules.ts
@@ -1,5 +1,7 @@
 import memoize from 'lodash/memoize';
-import { Module, Directory } from '../types';
+import { Module, Directory, Sandbox } from '../types';
+import getTemplateDefinition from '../templates';
+import parse from '../templates/configuration/parse';
 
 const compareTitle = (
   original: string,
@@ -248,18 +250,40 @@ export const isMainModule = (
   return path.replace('/', '') === entry;
 };
 
-export const findMainModule = (
-  modules: Module[],
-  directories: Directory[],
-  entry: string = 'index.js'
-) => {
-  try {
-    const module = resolveModule(entry, modules, directories);
+export const findMainModule = (sandbox?: Sandbox) => {
+  const resolve = resolveModuleWrapped(sandbox);
 
-    return module;
-  } catch (e) {
-    return modules[0];
+  // first attempt: try loading the entry file if it exists
+  const entryModule = resolve(sandbox.entry);
+  if (entryModule) {
+    return entryModule;
   }
+
+  // second attempt: try loading the first file that exists from
+  // the list of possible defaults in the template defination
+  const templateDefinition = getTemplateDefinition(sandbox.template);
+
+  const parsedConfigs = parse(
+    sandbox.template,
+    templateDefinition.configurationFiles,
+    resolve,
+    sandbox
+  );
+
+  const defaultOpenedFiles = templateDefinition.getDefaultOpenedFiles(
+    parsedConfigs
+  );
+
+  const defaultOpenModule = defaultOpenedFiles
+    .map(path => resolve(path))
+    .find(module => module);
+
+  if (defaultOpenModule) {
+    return defaultOpenModule;
+  }
+
+  // third attempt: give up and load the first file in the list
+  return sandbox.modules[0];
 };
 
 export const findCurrentModule = (
@@ -284,3 +308,19 @@ export const findCurrentModule = (
     mainModule
   );
 };
+
+export const resolveModuleWrapped = sandbox => (path: string) => {
+  try {
+    return resolveModule(path, sandbox.modules, sandbox.directories);
+  } catch (e) {
+    return undefined;
+  }
+};
+
+export const resolveDirectoryWrapped = sandbox => (path: string) => {
+  try {
+    return resolveDirectory(path, sandbox.modules, sandbox.directories);
+  } catch (e) {
+    return undefined;
+  }
+};
diff --git a/packages/common/src/templates/configuration/resolve-module-wrapped.ts b/packages/common/src/templates/configuration/resolve-module-wrapped.ts
@@ -1,17 +1,10 @@
-import { resolveModule, resolveDirectory } from '../../sandbox/modules';
+import {
+  resolveModuleWrapped,
+  resolveDirectoryWrapped,
+} from '../../sandbox/modules';
 
-export const resolveModuleWrapped = sandbox => (path: string) => {
-  try {
-    return resolveModule(path, sandbox.modules, sandbox.directories);
-  } catch (e) {
-    return undefined;
-  }
-};
+// keeping this file around to reduce merge conflicts
+// with other open branches
+// TODO @sid: Replace the usage of this file after overmind refactor is complete.
 
-export const resolveDirectoryWrapped = sandbox => (path: string) => {
-  try {
-    return resolveDirectory(path, sandbox.modules, sandbox.directories);
-  } catch (e) {
-    return undefined;
-  }
-};
+export { resolveModuleWrapped, resolveDirectoryWrapped };
