Make room for 2017.

Author: hugojosefson

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig: http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[package.json]
+indent_style = space
+indent_size = 2

01/test.js

@@ -1,5 +1,5 @@
 import Bacon from 'baconjs'
-import sum from '../lib/sum'
+import sum from '../../lib/sum'
 
 export default input$ => input$
     .flatMap(input => Bacon.fromArray(input.split('')))

01/gold.js renamed to 2015/01/gold.js

@@ -0,0 +1,24 @@
+/* eslint-env mocha */
+
+import describeTestCases from '../../lib/describe-test-cases'
+
+import silver from './silver'
+import gold from './gold'
+
+describe('2015-12-01', () => {
+  describeTestCases('silver', silver, [
+            ['(())', 0],
+            ['()()', 0],
+            ['(((', 3],
+            ['(()(()(', 3],
+            ['))(((((', 3],
+            ['())', -1],
+            ['))(', -1],
+            [')))', -3],
+            [')())())', -3]
+  ])
+  describeTestCases('gold', gold, [
+            [')', 1],
+            ['()())', 5]
+  ])
+})

01/input renamed to 2015/01/input

@@ -1,7 +1,7 @@
 import Bacon from 'baconjs'
-import sum from '../lib/sum'
+import sum from '../../lib/sum'
 import lengthOfRibbon from './length-of-ribbon'
-import numericCompare from '../lib/numeric-compare'
+import numericCompare from '../../lib/numeric-compare'
 
 const OK_LINE = /\d+x\d+x\d+/
 

01/silver.js renamed to 2015/01/silver.js

@@ -1,7 +1,7 @@
 import Bacon from 'baconjs'
-import sum from '../lib/sum'
+import sum from '../../lib/sum'
 import areaOfBox from './area-of-box'
-import numericCompare from '../lib/numeric-compare'
+import numericCompare from '../../lib/numeric-compare'
 
 const OK_LINE = /\d+x\d+x\d+/
 

2015/01/test.js

@@ -1,10 +1,10 @@
 /* eslint-env mocha */
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe('02', () => {
+describe('2015-12-02', () => {
   describeTestCases('silver', silver, [
         ['2x3x4', 58],
         ['1x1x10', 43]

02/area-of-box.js renamed to 2015/02/area-of-box.js

@@ -1,10 +1,10 @@
 /* eslint-env mocha */
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe('03', () => {
+describe('2015-12-03', () => {
   describeTestCases('silver', silver, [
         ['>', 2],
         ['^>v<', 4],

02/gold.js renamed to 2015/02/gold.js

@@ -1,12 +1,12 @@
 /* eslint-env mocha */
 import fs from 'fs'
 import path from 'path'
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe.skip('04 - skipped because quite slow', () => {
+describe.skip('2015-12-04 - skipped because quite slow', () => {
   describeTestCases('silver', silver, [
         ['abcdef', 609043],
         ['pqrstuv', 1048970],

02/input renamed to 2015/02/input

@@ -1,6 +1,6 @@
 import Bacon from 'baconjs'
 
-import count from '../lib/count'
+import count from '../../lib/count'
 
 export default input$ => input$
     .flatMap(input => Bacon.fromArray(input.split('\n')))

02/length-of-ribbon-around.js renamed to 2015/02/length-of-ribbon-around.js

@@ -1,6 +1,6 @@
 import Bacon from 'baconjs'
 
-import count from '../lib/count'
+import count from '../../lib/count'
 
 export default input$ => input$
     .flatMap(input => Bacon.fromArray(input.split('\n')))

02/length-of-ribbon-bow.js renamed to 2015/02/length-of-ribbon-bow.js

@@ -1,12 +1,12 @@
 /* eslint-env mocha */
 import fs from 'fs'
 import path from 'path'
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe('05', () => {
+describe('2015-12-05', () => {
   describeTestCases('silver', silver, [
         ['ugknbfddgicrmopn', 1],
         ['aaa', 1],

02/length-of-ribbon.js renamed to 2015/02/length-of-ribbon.js

@@ -1,6 +1,6 @@
 import Bacon from 'baconjs'
 import _ from 'lodash'
-import numericCompare from '../lib/numeric-compare'
+import numericCompare from '../../lib/numeric-compare'
 
 const operateOnLights = (lights, [operation, x1, y1, x2, y2]) => {
   const [fromX, toX] = [x1, x2].sort(numericCompare)

02/silver.js renamed to 2015/02/silver.js

@@ -1,12 +1,12 @@
 /* eslint-env mocha */
 import fs from 'fs'
 import path from 'path'
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe.skip('06 - skipped because quite slow', () => {
+describe.skip('2015-12-06 - skipped because quite slow', () => {
   describeTestCases('silver', silver, [
         ['turn on 0,0 through 999,999', 1000000],
         ['toggle 0,0 through 999,0', 1000],

02/test.js renamed to 2015/02/test.js

@@ -1,14 +1,14 @@
 /* eslint-env mocha */
 import fs from 'fs'
 import path from 'path'
-import describeTestCases from '../lib/describe-test-cases'
-import describeSimpleTestCases from '../lib/describe-simple-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
+import describeSimpleTestCases from '../../lib/describe-simple-test-cases'
 
 import jsExpression from './js-expression'
 import silver from './silver'
 import gold from './gold'
 
-describe('07', () => {
+describe('2015-12-07', () => {
   describeSimpleTestCases('js-expression', jsExpression, [
         ['123', '123'],
         ['x', '_x()'],

03/gold.js renamed to 2015/03/gold.js

@@ -1,7 +1,7 @@
 import Bacon from 'baconjs'
 import _ from 'lodash'
 
-import sum from '../lib/sum'
+import sum from '../../lib/sum'
 
 export default input$ => input$
     .flatMap(input => Bacon.fromArray(input.split('\n')))

03/input renamed to 2015/03/input

@@ -1,6 +1,6 @@
 import Bacon from 'baconjs'
 
-import sum from '../lib/sum'
+import sum from '../../lib/sum'
 
 export default input$ => input$
     .flatMap(input => Bacon.fromArray(input.split('\n')))

03/silver.js renamed to 2015/03/silver.js

@@ -1,12 +1,12 @@
 /* eslint-env mocha */
 import fs from 'fs'
 import path from 'path'
-import describeTestCases from '../lib/describe-test-cases'
+import describeTestCases from '../../lib/describe-test-cases'
 
 import silver from './silver'
 import gold from './gold'
 
-describe('08', () => {
+describe('2015-12-08', () => {
   describeTestCases('silver', silver, [
         ['""', 2 - 0],
         ['"abc"', 5 - 3],

03/test.js renamed to 2015/03/test.js

@@ -8,31 +8,33 @@ import safeRequire from './lib/safe-require'
 import formatWithTwoDigits from './lib/format-with-two-digits'
 import numericCompareProperty from './lib/numeric-compare-property'
 
+const year = process.argv[2]
+
 Bacon.constant(process)
-    .map(process => process.argv.splice(2))
-    .flatMap(args => Bacon.fromArray(args))
-    .map(Number)
-    .map(formatWithTwoDigits)
-    .map(number => ({
-      number,
-      silverMod: safeRequire(`${__dirname}/${number}/silver`),
-      goldMod: safeRequire(`${__dirname}/${number}/gold`),
-      inputFilename: path.join(__dirname, number, 'input')
-    }))
-    .map(({number, silverMod, goldMod, inputFilename}) => ({
-      number,
-      silverFn: silverMod && silverMod.default,
-      goldFn: goldMod && goldMod.default,
-      input$: Bacon.fromNodeCallback(readFile, inputFilename, 'utf-8')
-    }))
-    .flatMap(
+      .map(process => process.argv.splice(3))
+      .flatMap(args => Bacon.fromArray(args))
+      .map(Number)
+      .map(formatWithTwoDigits)
+      .map(number => ({
+        number,
+        silverMod: safeRequire(`${__dirname}/${year}/${number}/silver`),
+        goldMod: safeRequire(`${__dirname}/${year}/${number}/gold`),
+        inputFilename: path.join(__dirname, year, number, 'input')
+      }))
+      .map(({number, silverMod, goldMod, inputFilename}) => ({
+        number,
+        silverFn: silverMod && silverMod.default,
+        goldFn: goldMod && goldMod.default,
+        input$: Bacon.fromNodeCallback(readFile, inputFilename, 'utf-8')
+      }))
+      .flatMap(
         ({number, silverFn, goldFn, input$}) => Bacon.zipAsArray([
           Bacon.once(number),
           (silverFn && silverFn(input$)) || Bacon.once(null),
           (goldFn && goldFn(input$)) || Bacon.once(null)
         ])
-    )
-    .map(([number, silver, gold]) => ({number, silver, gold}))
-    .reduce([], (results, result) => results.concat(result))
-    .map(results => results.sort(numericCompareProperty('number')))
-    .onValue(console.log)
+      )
+      .map(([number, silver, gold]) => ({year, number, silver, gold}))
+      .reduce([], (results, result) => results.concat(result))
+      .map(results => results.sort(numericCompareProperty('number')))
+      .onValue(console.log)

04/algorithm.js renamed to 2015/04/algorithm.js

@@ -4,7 +4,7 @@
   "description": "Me doing the adventofcode.com exercises.",
   "scripts": {
     "start": "node -r @std/esm .",
-    "test": "mocha --require @std/esm */test.js",
+    "test": "mocha --require @std/esm 20*/*/test.js",
     "precommit": "lint-staged"
   },
   "lint-staged": {