Plugins

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
   extends: "eslint:recommended",
   rules: {
     "arrow-body-style": [ERROR, "as-needed"],
-    "array-bracket-spacing": [ ERROR, "always" ],
+    "array-bracket-spacing": [ ERROR, "never" ],
     "arrow-parens": [ ERROR, "always" ],
     "arrow-spacing": [ ERROR ],
     "block-spacing": [ ERROR, "always" ],
@@ -68,7 +68,7 @@ module.exports = {
     "no-var": [ ERROR ],
     "no-void": [ ERROR ],
     "no-with": [ ERROR ],
-    "object-curly-spacing": [ ERROR, "always" ],
+    "object-curly-spacing": [ ERROR, "never" ],
     "one-var": [ ERROR, { "uninitialized": "always", "initialized": "never" } ],
     "operator-assignment": [ ERROR, "always" ],
     "operator-linebreak": [ ERROR, "after" ],

.gitignore

@@ -1,4 +1,3 @@
-client/dist/
 client/lib/
 rethinkdb_data_test
 rethinkdb_data/
@@ -11,3 +10,10 @@ node_modules/
 .hz/
 config.toml
 **/.vscode
+**/.*.swp
+
+**/dist/
+
+# RethinkDB stuff
+**/rethinkdb_data/
+**/rethinkdb_data_test/

Dockerfile

@@ -11,7 +11,7 @@ RUN apt update && apt install -y git
 
 COPY . /usr/horizon/
 WORKDIR /usr/horizon
-RUN cd test; ./setupDev.sh
+RUN ./setupDev.sh
 
 EXPOSE 8181
 

babelify.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+dirs="server plugins plugin-router plugin-utils test"
+for path in `find $dirs -name .babelrc | grep -v node_modules`; do
+    {
+        babel ${path%%.babelrc}src -d ${path%%.babelrc}dist -s true -w
+    } &
+done
+
+wait

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "horizon",
-  "version": "2.0.0",
+  "version": "3.0.0-alpha-0",
   "description": "An open-source developer platform for building realtime, scalable web apps.",
   "main": "src/main.js",
   "repository": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/rethinkdb/horizon#readme",
   "dependencies": {
-    "@horizon/server": "2.0.0",
+    "@horizon/server": "3.0.0-alpha-0",
     "argparse": "^1.0.3",
     "bluebird": "^3.4.1",
     "chalk": "^1.1.3",
@@ -37,9 +37,9 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "eslint": "^2.3.0",
+    "eslint": "^3.1.0",
     "istanbul": "^0.4.3",
-    "mocha": "2.4.5",
+    "mocha": "^2.5.3",
     "mock-fs": "^3.10.0",
     "sinon": "1.17.3",
     "strip-ansi": "^3.0.1",

cli/src/create-cert.js

@@ -18,7 +18,7 @@ const run = (args) => {
   };
 
   // generate the arguments to the command
-  const binArgs = [ 'req', '-x509', '-nodes', '-batch',
+  const binArgs = ['req', '-x509', '-nodes', '-batch',
     '-newkey', `${settings.algo}:${settings.bits}`,
     '-keyout', settings.keyOutName,
     '-out', settings.certOutName,
@@ -39,8 +39,8 @@ const run = (args) => {
       const sslProc = spawn(settings.binaryName, binArgs);
 
       // pipe output appropriately
-      sslProc.stdout.pipe(process.stdout, { end: false });
-      sslProc.stderr.pipe(process.stderr, { end: false });
+      sslProc.stdout.pipe(process.stdout, {end: false});
+      sslProc.stderr.pipe(process.stderr, {end: false});
 
       // say nice things to the user when it's done
       sslProc.on('error', reject);

cli/src/init.js

@@ -165,9 +165,9 @@ rethinkdb_data
 `;
 
 const parseArguments = (args) => {
-  const parser = new argparse.ArgumentParser({ prog: 'hz init' });
-  parser.addArgument([ 'projectName' ],
-    { action: 'store',
+  const parser = new argparse.ArgumentParser({prog: 'hz init'});
+  parser.addArgument(['projectName'],
+    {action: 'store',
       help: 'Name of directory to create. Defaults to current directory',
       nargs: '?',
     }

cli/src/make-token.js

@@ -1,28 +1,24 @@
 'use strict';
 
-const interrupt = require('./utils/interrupt');
 const config = require('./utils/config');
-const horizon_server = require('@horizon/server');
 
 const path = require('path');
 const jwt = require('jsonwebtoken');
 
-const r = horizon_server.r;
-const logger = horizon_server.logger;
 const argparse = require('argparse');
 
 const parseArguments = (args) => {
-  const parser = new argparse.ArgumentParser({ prog: 'hz make-token' });
+  const parser = new argparse.ArgumentParser({prog: 'hz make-token'});
 
   parser.addArgument(
-    [ '--token-secret' ],
-    { type: 'string', metavar: 'SECRET',
-      help: 'Secret key for signing the token.' });
+    ['--token-secret'],
+    {type: 'string', metavar: 'SECRET',
+     help: 'Secret key for signing the token.'});
 
   parser.addArgument(
-    [ 'user' ],
-    { type: 'string', metavar: 'USER_ID',
-      help: 'The ID of the user to issue a token for.' });
+    ['user'],
+    {type: 'string', metavar: 'USER_ID',
+      help: 'The ID of the user to issue a token for.'});
 
   return parser.parseArgs(args);
 };
@@ -43,7 +39,7 @@ const processConfig = (parsed) => {
     options.project_name = path.basename(path.resolve(options.project_path));
   }
 
-  return Object.assign(options, { user: parsed.user });
+  return Object.assign(options, {user: parsed.user});
 };
 
 const run = (args) => Promise.resolve().then(() => {
@@ -53,9 +49,9 @@ const run = (args) => Promise.resolve().then(() => {
     throw new Error('No token secret specified, unable to sign the token.');
   }
   const token = jwt.sign(
-    { id: options.user, provider: null },
+    {id: options.user, provider: null},
     new Buffer(options.token_secret, 'base64'),
-    { expiresIn: '1d', algorithm: 'HS512' }
+    {expiresIn: '1d', algorithm: 'HS512'}
   );
   console.log(`${token}`);
 });

cli/src/migrate.js

@@ -14,12 +14,12 @@ const parse_yes_no_option = require('./utils/parse_yes_no_option');
 const start_rdb_server = require('./utils/start_rdb_server');
 const NiceError = require('./utils/nice_error.js');
 
-const VERSION_2_0 = [ 2, 0, 0 ];
+const VERSION_2_0 = [2, 0, 0];
 
 function run(cmdArgs) {
   const options = processConfig(cmdArgs);
   interrupt.on_interrupt(() => teardown());
-  return Promise.resolve().bind({ options })
+  return Promise.resolve().bind({options})
     .then(setup)
     .then(validateMigration)
     .then(makeBackup)
@@ -45,45 +45,45 @@ function white() {
 
 function processConfig(cmdArgs) {
   // do boilerplate to get config args :/
-  const parser = new argparse.ArgumentParser({ prog: 'hz migrate' });
+  const parser = new argparse.ArgumentParser({prog: 'hz migrate'});
 
-  parser.addArgument([ 'project_path' ], {
+  parser.addArgument(['project_path'], {
     default: '.',
     nargs: '?',
     help: 'Change to this directory before migrating',
   });
 
-  parser.addArgument([ '--project-name', '-n' ], {
+  parser.addArgument(['--project-name', '-n'], {
     help: 'Name of the Horizon project server',
   });
 
-  parser.addArgument([ '--connect', '-c' ], {
+  parser.addArgument(['--connect', '-c'], {
     metavar: 'host:port',
     default: undefined,
     help: 'Host and port of the RethinkDB server to connect to.',
   });
 
-  parser.addArgument([ '--rdb-user' ], {
+  parser.addArgument(['--rdb-user'], {
     default: 'admin',
     metavar: 'USER',
     help: 'RethinkDB User',
   });
 
-  parser.addArgument([ '--rdb-password' ], {
+  parser.addArgument(['--rdb-password'], {
     default: undefined,
     metavar: 'PASSWORD',
     help: 'RethinkDB Password',
   });
 
-  parser.addArgument([ '--start-rethinkdb' ], {
+  parser.addArgument(['--start-rethinkdb'], {
     metavar: 'yes|no',
     default: 'yes',
     constant: 'yes',
     nargs: '?',
     help: 'Start up a RethinkDB server in the current directory',
   });
 
-  parser.addArgument([ '--skip-backup' ], {
+  parser.addArgument(['--skip-backup'], {
     metavar: 'yes|no',
     default: 'no',
     constant: 'yes',
@@ -92,7 +92,7 @@ function processConfig(cmdArgs) {
       ' before migrating',
   });
 
-  parser.addArgument([ '--nonportable-backup' ], {
+  parser.addArgument(['--nonportable-backup'], {
     metavar: 'yes|no',
     default: 'no',
     constant: 'yes',
@@ -149,7 +149,7 @@ function setup() {
     // start rethinkdb server if necessary
     if (this.options.start_rethinkdb) {
       green(' ├── Starting RethinkDB server');
-      return start_rdb_server({ quiet: true }).then((server) => {
+      return start_rdb_server({quiet: true}).then((server) => {
         this.rdb_server = server;
         this.options.rdb_host = 'localhost';
         this.options.rdb_port = server.driver_port;
@@ -193,15 +193,15 @@ function validateMigration() {
   const tablesHaveHzPrefix = `Some tables in ${project} have an hz_ prefix`;
   const checkForHzTables = r.db('rethinkdb')
           .table('table_config')
-          .filter({ db: project })('name')
+          .filter({db: project})('name')
           .contains((x) => x.match('^hz_'))
           .branch(r.error(tablesHaveHzPrefix), true);
   const waitForCollections = r.db(`${project}_internal`)
           .table('collections')
-          .wait({ timeout: 30 })
+          .wait({timeout: 30})
           .do(() => r.db(project).tableList())
           .forEach((tableName) =>
-            r.db(project).table(tableName).wait({ timeout: 30 })
+            r.db(project).table(tableName).wait({timeout: 30})
           );
 
   return Promise.resolve().then(() => {
@@ -292,11 +292,11 @@ function renameUserTables() {
   const project = this.options.project_name;
   return Promise.resolve().then(() => {
     white('Removing suffix from user tables');
-    return r.db(`${project}_internal`).wait({ timeout: 30 }).
+    return r.db(`${project}_internal`).wait({timeout: 30}).
       do(() => r.db(`${project}_internal`).table('collections')
          .forEach((collDoc) => r.db('rethinkdb').table('table_config')
-                  .filter({ db: project, name: collDoc('table') })
-                  .update({ name: collDoc('id') }))
+                  .filter({db: project, name: collDoc('table')})
+                  .update({name: collDoc('id')}))
         ).run(this.conn)
       .then(() => green(' └── Suffixes removed'));
   });
@@ -310,7 +310,7 @@ function moveInternalTables() {
   return Promise.resolve().then(() => {
     white(`Moving internal tables from ${project}_internal to ${project}`);
     return r.db('rethinkdb').table('table_config')
-      .filter({ db: `${project}_internal` })
+      .filter({db: `${project}_internal`})
       .update((table) => ({
         db: project,
         name: r.branch(
@@ -336,19 +336,17 @@ function renameIndices() {
     white('Renaming indices to new JSON format');
     return r.db(project).tableList().forEach((tableName) =>
       r.db(project).table(tableName).indexList().forEach((indexName) =>
-        r.db(project).table(tableName)
-          .indexRename(indexName, rename(indexName))
+        r.db(project).table(tableName).indexRename(indexName, rename(indexName))
       )
-    ).run(this.conn)
-    .then(() => green(' └── Indices renamed.'));
+    ).run(this.conn).then(() => green(' └── Indices renamed.'));
   });
 
   function rename(name) {
     // ReQL to rename the index name to the new format
     const initialState = {
       escaped: false,
       field: '',
-      fields: [ ],
+      fields: [],
     };
     return name.split('')
       .fold(initialState, (acc, c) =>
@@ -359,22 +357,20 @@ function renameIndices() {
               field: acc('field').add(c),
             }),
           c.eq('\\'),
-            acc.merge({ escaped: true }),
+            acc.merge({escaped: true}),
           c.eq('_'),
             acc.merge({
               fields: acc('fields').append(acc('field')),
               field: '',
             }),
-          acc.merge({ field: acc('field').add(c) })
+          acc.merge({field: acc('field').add(c)})
         )
       ).do((state) =>
           // last field needs to be appended to running list
           state('fields').append(state('field'))
           // wrap each field in an array
-          .map((field) => [ field ])
-         )
-      .toJSON()
-      .do((x) => r('hz_').add(x));
+          .map((field) => [field])
+      ).toJSON().do((x) => r('hz_').add(x));
   }
 }
 
@@ -385,15 +381,15 @@ function rewriteHzCollectionDocs() {
   return Promise.resolve().then(() => {
     white('Rewriting hz_collections to new format');
     return r.db(project).table('hz_collections')
-      .update({ table: r.literal() })
+      .update({table: r.literal()})
       .run(this.conn);
   }).then(() => green(' ├── "table" field removed'))
     .then(() => r.db(project).table('hz_collections')
-          .insert({ id: 'users' })
+          .insert({id: 'users'})
           .run(this.conn))
     .then(() => green(' ├── Added document for "users" table'))
     .then(() => r.db(project).table('hz_collections')
-          .insert({ id: 'hz_metadata', version: VERSION_2_0 })
+          .insert({id: 'hz_metadata', version: VERSION_2_0})
           .run(this.conn))
     .then(() => green(' └── Adding the metadata document with schema version:' +
                       `${JSON.stringify(VERSION_2_0)}`));