Move core out of packages folder

bendrucker · May 2, 2016 · 4363b55 · 4363b55
1 parent b0b0dbf
commit 4363b55
Show file tree

Hide file tree

Showing 26 changed files with 111 additions and 106 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -3,11 +3,13 @@ module.exports = function(config) {
     basePath: '',
     frameworks: ['mocha', 'browserify', 'fixture', 'phantomjs-shim'],
     files: [
+      'lib/**/*.js',
       'packages/**/*.js',
       'packages/*/fixtures/**/*.html',
     ],
     exclude: [],
     preprocessors: {
+      'lib/**/*.js': ['browserify'],
       'packages/**/*.js': ['browserify'],
       'packages/*/fixtures/**/*.html': ['html2js'],
     },

diff --git a/lib/app.js b/lib/app.js
@@ -0,0 +1,5 @@
+import 'babel-polyfill';
+import OctoLinker from './octo-linker.js';
+
+const octoLinker = new OctoLinker();
+octoLinker.init();
diff --git a/packages/helper-click-handler/index.js → lib/click-handler.js b/packages/helper-click-handler/index.js → lib/click-handler.js
@@ -1,11 +1,11 @@
 import $ from 'jquery';
+import tryLoad from '../packages/try-load';
 import resolverAPI from './resolver/resolver-api.js';
 import relativeFile from './resolver/relative-file.js';
 import javascriptFile from './resolver/javascript-file.js';
 import gitUrl from './resolver/git-url.js';
 import githubShorthand from './resolver/github-shorthand.js';
 import javascriptUniversal from './resolver/javascript-universal.js';
-import tryLoad from '../try-load';
 
 const CLASS_NAME = 'octo-linker-link';
 const LINK_SELECTOR = `.${CLASS_NAME}`;

diff --git a/lib/debug-mode.js b/lib/debug-mode.js
@@ -0,0 +1,7 @@
+export default function (enable = false) {
+  if (!enable) {
+    return;
+  }
+
+  document.body.classList.add('octo-linker-debug');
+}
diff --git a/lib/octo-linker.js b/lib/octo-linker.js
@@ -0,0 +1,45 @@
+import injection from 'github-injection';
+import BlobReader from '../packages/blob-reader';
+import clickHandler from './click-handler';
+import getPluginsForBlobType from './plugin-manager.js';
+import debugMode from './debug-mode.js';
+
+function initialize(self) {
+  debugMode(true);
+  clickHandler();
+
+  self._blobReader = new BlobReader();
+}
+
+function run(self) {
+  if (!self._blobReader.hasBlobs()) {
+    return false;
+  }
+
+  console.time('total');
+
+  self._blobReader.read();
+
+  self._blobReader.forEach((blob) => {
+    const pluginsForType = getPluginsForBlobType(blob.type);
+    if (!pluginsForType) {
+      return;
+    }
+
+    pluginsForType.forEach((plugin) => {
+      plugin.parseBlob(blob);
+    });
+  });
+
+  console.timeEnd('total');
+}
+
+export default class OctoLinkerCore {
+  constructor() {
+    initialize(this);
+  }
+
+  init() {
+    injection(window, run.bind(null, this));
+  }
+}
diff --git a/lib/plugin-manager.js b/lib/plugin-manager.js
@@ -0,0 +1,34 @@
+import LinkResolver from './plugins/link-resolver';
+import ManifestNPM from './plugins/manifest-npm';
+import ManifestGemfile from './plugins/manifest-gemfile';
+
+const plugins = [
+  LinkResolver,
+  ManifestNPM,
+  ManifestGemfile,
+];
+
+function generateCache() {
+  const list = new Map();
+
+  plugins.forEach((PluginClass) => {
+    const pluginInstance = new PluginClass();
+
+    pluginInstance.blobTypes().forEach((type) => {
+      const caller = list.get(type) || [];
+      caller.push(pluginInstance);
+
+      if (!list.has(type)) {
+        list.set(type, caller);
+      }
+    });
+  });
+
+  return list;
+}
+
+const cache = generateCache();
+
+export default function (pluginName) {
+  return cache.get(pluginName);
+}
diff --git a/packages/plugin-link-resolver/index.js → lib/plugins/link-resolver/index.js b/packages/plugin-link-resolver/index.js → lib/plugins/link-resolver/index.js
@@ -1,5 +1,5 @@
-import { REQUIRE, REQUIRE_RESOLVE, IMPORT } from '../helper-grammar-regex-collection/index.js';
-import replaceKeywords from '../helper-replace-keywords';
+import { REQUIRE, REQUIRE_RESOLVE, IMPORT } from '../../../packages/helper-grammar-regex-collection/index.js';
+import wrapKeyword from '../../wrap-keyword';
 
 export default class LiveResolver {
 
@@ -12,7 +12,7 @@ export default class LiveResolver {
 
   parseBlob(blob) {
     [REQUIRE, REQUIRE_RESOLVE, IMPORT].forEach((regex) => {
-      replaceKeywords(blob.el, regex, {
+      wrapKeyword(blob.el, regex, {
         resolver: 'javascriptUniversal',
         target: '$1',
         path: blob.path,

diff --git a/packages/plugin-manifest-gemfile/index.js → lib/plugins/manifest-gemfile/index.js b/packages/plugin-manifest-gemfile/index.js → lib/plugins/manifest-gemfile/index.js
@@ -1,6 +1,6 @@
 import { basename } from 'path';
-import replaceKeywords from '../helper-replace-keywords';
-import { GEM } from '../helper-grammar-regex-collection/index.js';
+import { GEM } from '../../../packages/helper-grammar-regex-collection/index.js';
+import wrapKeyword from '../../wrap-keyword';
 
 export default class GemManifest {
 
@@ -16,7 +16,7 @@ export default class GemManifest {
       return;
     }
 
-    replaceKeywords(blob.el, GEM, {
+    wrapKeyword(blob.el, GEM, {
       resolver: 'resolverAPI',
       target: '$1',
       type: 'rubygems',

diff --git a/packages/plugin-manifest-npm/index.js → lib/plugins/manifest-npm/index.js b/packages/plugin-manifest-npm/index.js → lib/plugins/manifest-npm/index.js
@@ -1,6 +1,6 @@
-import replaceKeywords from '../helper-replace-keywords';
-import escapeRegexString from 'escape-regex-string';
 import semver from 'semver';
+import escapeRegexString from 'escape-regex-string';
+import wrapKeyword from '../../wrap-keyword';
 
 function regexBuilder(key, value) {
   const regexKey = escapeRegexString(key);
@@ -18,7 +18,7 @@ function linker(blob, result) {
 
   const isSemver = isValidSemver(value);
 
-  replaceKeywords(blob.el, regex, {
+  wrapKeyword(blob.el, regex, {
     resolver: isSemver ? 'resolverAPI' : 'gitUrl|githubShorthand',
     target: isSemver ? '$1' : '$2',
     type: 'npm',
@@ -29,7 +29,7 @@ function mainLinker(blob, result) {
   const [key, value] = result;
   const regex = regexBuilder(key, value);
 
-  replaceKeywords(blob.el, regex, {
+  wrapKeyword(blob.el, regex, {
     resolver: 'javascriptFile',
     path: blob.path,
     target: '$2',

diff --git a/.../helper-click-handler/resolver/git-url.js → lib/resolver/git-url.js b/.../helper-click-handler/resolver/git-url.js → lib/resolver/git-url.js
diff --git a/...lick-handler/resolver/github-shorthand.js → lib/resolver/github-shorthand.js b/...lick-handler/resolver/github-shorthand.js → lib/resolver/github-shorthand.js
diff --git a/...click-handler/resolver/javascript-file.js → lib/resolver/javascript-file.js b/...click-handler/resolver/javascript-file.js → lib/resolver/javascript-file.js
diff --git a/...-handler/resolver/javascript-universal.js → lib/resolver/javascript-universal.js b/...-handler/resolver/javascript-universal.js → lib/resolver/javascript-universal.js
diff --git a/...r-click-handler/resolver/relative-file.js → lib/resolver/relative-file.js b/...r-click-handler/resolver/relative-file.js → lib/resolver/relative-file.js
diff --git a/...er-click-handler/resolver/resolver-api.js → lib/resolver/resolver-api.js b/...er-click-handler/resolver/resolver-api.js → lib/resolver/resolver-api.js
@@ -7,7 +7,7 @@ export default function ({ type, target }) {
   }
 
   return {
-    url: `https://githublinker.herokuapp.com/redirect?url=${target}`,
+    url: `https://githublinker.herokuapp.com/ping?url=${target}`,
     method: 'GET',
   };
 }
diff --git a/packages/helper-replace-keywords/index.js → lib/wrap-keyword.js b/packages/helper-replace-keywords/index.js → lib/wrap-keyword.js
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "engines": {
     "node": ">=4.0.0"
   },
+  "main": "lib/app.js",
   "scripts": {
     "bootstrap": "./scripts/bootstrap",
     "lint": "./scripts/lint",

diff --git a/packages/core/index.js b/packages/core/index.js
diff --git a/packages/plugin-link-resolver/README.md b/packages/plugin-link-resolver/README.md
diff --git a/scripts/build b/scripts/build
@@ -4,4 +4,4 @@ set -e
 NPM_BIN="$(npm bin)";
 cd "$(dirname "$0")/.."
 
-"$NPM_BIN/browserify" ./packages/core/index.js -t babelify --outfile ./chrome/app.js
+"$NPM_BIN/browserify" ./lib/app.js -t babelify --outfile ./chrome/app.js
diff --git a/scripts/watch-build b/scripts/watch-build
@@ -4,4 +4,4 @@ set -e
 NPM_BIN="$(npm bin)";
 cd "$(dirname "$0")/.."
 
-"$NPM_BIN/watchify" ./packages/core/index.js -t babelify --outfile ./chrome/app.js
+"$NPM_BIN/watchify" ./lib/app.js -t babelify --outfile ./chrome/app.js
diff --git a/packages/helper-click-handler/test.js → test/click-handler.test.js b/packages/helper-click-handler/test.js → test/click-handler.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert';
 import sinon from 'sinon';
 import $ from 'jquery';
-import clickHandler, { registerHandler } from './index.js';
+import clickHandler, { registerHandler } from '../lib/click-hanlder';
 
 describe.skip('helper-click-handler', () => {
   const sandbox = sinon.sandbox.create();

diff --git a/...-resolver/test/grammar/fixtures/import.js → test/grammar/fixtures/import.js b/...-resolver/test/grammar/fixtures/import.js → test/grammar/fixtures/import.js
diff --git a/...resolver/test/grammar/fixtures/require.js → test/grammar/fixtures/require.js b/...resolver/test/grammar/fixtures/require.js → test/grammar/fixtures/require.js
diff --git a/...ink-resolver/test/grammar/grammar.test.js → test/grammar/grammar.test.js b/...ink-resolver/test/grammar/grammar.test.js → test/grammar/grammar.test.js
diff --git a/packages/helper-replace-keywords/test.js → test/wrap-keyword.js b/packages/helper-replace-keywords/test.js → test/wrap-keyword.js
@@ -1,13 +1,13 @@
 import assert from 'assert';
 import $ from 'jquery';
-import insertLink from './index.js';
+import wrapKeyword from '../lib/wrap-keyword.js';
 
 describe('helper-replace-keywords', () => {
   function helper(html, options = { value: '$1' }, regex = /foo ("\w+")/, replaceIndex = '$1') {
     const el = document.createElement('div');
     el.innerHTML = html;
 
-    insertLink(el, regex, options, replaceIndex);
+    wrapKeyword(el, regex, options, replaceIndex);
 
     return el;
   }