export editor, pass editor into Main

Author: ShMcK

lib/editor/compareVersions.js

@@ -0,0 +1,31 @@
+/**
+ * extracts versions intro array from a string
+ * "0.1.0" -> ['0', '1', '0']
+ * or returns null
+ * @param  {string} v
+ */
+function matchVersions(v: string): string[]|null {
+  return v.match(/([0-9]+)\.([0-9]+)/);
+}
+
+/**
+ * checks that a version is >= b version
+ * @param  {string} a
+ * @param  {string} b
+ * @returns boolean
+ */
+export function isAboveVersion(a: string, b: string): boolean {
+  if (a === b) { return true; }
+  const a_components = a.split('.');
+  const b_components = b.split('.');
+  const len = Math.min(a_components.length, b_components.length);
+  for (let i = 0; i < len; i++) {
+    const first = parseInt(a_components[i], 10);
+    const second = parseInt(b_components[i], 10);
+    if (first > second) { return true; }
+    if (first < second) { return false; }
+  }
+  if (a_components.length > b_components.length) { return true; }
+  if (a_components.length < b_components.length) { return false; }
+  return true;
+}

lib/editor/compareVersions.js.map

@@ -0,0 +1,24 @@
+import { directory } from './directory';
+import { getGrammar, tokenizeLines } from './grammar';
+import {
+  editorIssuesPath, editorMinVersion, editorName,
+  editorVersionFailMessage, editorVersionLabel, minVersion
+} from './setup';
+import Subscriptions from './subscriptions';
+import {addRightPanel} from './ui';
+
+const editor = {
+  directory,
+  getGrammar,
+  tokenizeLines,
+  editorName,
+  editorMinVersion,
+  editorVersionLabel,
+  editorVersionFailMessage,
+  editorIssuesPath,
+  minVersion,
+  Subscriptions,
+  addRightPanel
+}
+
+export default editor;

lib/editor/index.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import {isAboveVersion} from '../utils/compareVersions';
+import {isAboveVersion} from './compareVersions';
 import commandLine from 'atom-plugin-command-line';
 
 export const editorName = 'Atom';

lib/editor/index.js.map

@@ -1,52 +1,7 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-
-import * as actions from './actions';
-import {SideRoot, sideElement} from './components/SidePanel';
-import addToStatusBar from './components/StatusBar';
-import Subscriptions from './editor/subscriptions';
-import {addRightPanel} from './editor/ui';
-import {setupVerify} from './modules/setup';
-import store from './store';
-import loadPolyfills from './utils/polyfills';
-import * as injectTapEventPlugin from 'react-tap-event-plugin';
+import editor from './editor';
+import Main from './main';
 
 // React optimization
 process.env.NODE_ENV = 'production';
 
-class Main {
-  private side: HTMLElement;
-  private statusBarTile: StatusBar.IStatusBarView|null;
-  private subscriptions: any;
-  constructor() {
-    injectTapEventPlugin(); // remove later
-    loadPolyfills();
-    // run startup checks
-    store.dispatch(setupVerify());
-    this.side = sideElement.init();
-    this.subscriptions = new Subscriptions();
-  }
-  public activate(): void {
-    // create editor panel
-    addRightPanel(this.side);
-    // activate subscriptions
-    this.subscriptions.onActivate(store, actions);
-    // render React component
-    ReactDOM.render(SideRoot(store), this.side);
-  }
-  public deactivate(): void {
-    // remove bottom status bar icon
-    if (this.statusBarTile) {
-      this.statusBarTile.destroy();
-      this.statusBarTile = null;
-    }
-    // remove subscriptions & unmount react app
-    this.subscriptions.onDeactivate(store);
-    // unmount React
-    sideElement.unmount();
-  }
-  private consumeStatusBar(statusBar) {
-    this.statusBarTile = addToStatusBar(store, statusBar);
-  }
-};
-export = new Main();
+export = new Main(editor);

lib/editor/setup.js

@@ -0,0 +1,50 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+
+import * as actions from './actions';
+import {SideRoot, sideElement} from './components/SidePanel';
+import addToStatusBar from './components/StatusBar';
+import {setupVerify} from './modules/setup';
+import store from './store';
+import loadPolyfills from './utils/polyfills';
+import * as injectTapEventPlugin from 'react-tap-event-plugin';
+
+class Main {
+  public editor: any;
+  private side: HTMLElement;
+  private statusBarTile: StatusBar.IStatusBarView|null;
+  private subscriptions: any;
+  constructor(editor) {
+    injectTapEventPlugin(); // remove later
+    loadPolyfills();
+
+    this.editor = editor;
+    // run startup checks
+    store.dispatch(setupVerify());
+    this.side = sideElement.init();
+    this.subscriptions = new editor.Subscriptions();
+  }
+  public activate(): void {
+    // create editor panel
+    this.editor.addRightPanel(this.side);
+    // activate subscriptions
+    this.subscriptions.onActivate(store, actions);
+    // render React component
+    ReactDOM.render(SideRoot(store), this.side);
+  }
+  public deactivate(): void {
+    // remove bottom status bar icon
+    if (this.statusBarTile) {
+      this.statusBarTile.destroy();
+      this.statusBarTile = null;
+    }
+    // remove subscriptions & unmount react app
+    this.subscriptions.onDeactivate(store);
+    // unmount React
+    sideElement.unmount();
+  }
+  private consumeStatusBar(statusBar) {
+    this.statusBarTile = addToStatusBar(store, statusBar);
+  }
+};
+export default Main;

lib/editor/setup.js.map

@@ -93,11 +93,14 @@
     "src/editor/actions/terminal.ts",
     "src/editor/actions/write.ts",
     "src/editor/actions/writeFile.ts",
+    "src/editor/compareVersions.ts",
     "src/editor/directory.ts",
     "src/editor/grammar.ts",
+    "src/editor/index.ts",
     "src/editor/subscriptions.ts",
     "src/editor/ui.ts",
     "src/index.ts",
+    "src/main.ts",
     "src/modules/alert/actions.ts",
     "src/modules/alert/index.ts",
     "src/modules/alert/types.ts",