feat: revamp code generation and input handling

.babelrc

@@ -1,3 +1,11 @@
 {
-  "presets": ["@babel/env"]
+  "presets": ["@babel/env"],
+  "plugins": [
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        "regenerator": true
+      }
+    ]
+  ]
 }

README.md

@@ -20,6 +20,12 @@ This repo is used to help maintain my [JavaScript solutions](https://github.com/
 YEAR=20XX DAY=0X yarn new
 ```
 
+## Copy your inputs
+
+Inside the `/inputs` directory, you'll see have an `input.txt` and `example.txt` for each day you are solving. The `input.txt` is your unique Advent of Code input. The `example.txt` is for the example input given in the text of the question.
+
+In the future, `input.txt` will be automatically downloaded for you.
+
 ## Run tests while you're solve the problem
 
 ```bash

_template/README.md

@@ -1 +1 @@
-# Day _______
+# Advent of Code {{YEAR}} Day {{DAY}}

_template/index.js

@@ -1,18 +1,9 @@
-import { example, data } from './input'
+export const parseInput = (input) => input.split('\n')
 
-export const inputParser = (input) => input.split('\n')
-
-const parsedData = inputParser(input)
-
-export const part1 = (input = parsedData) => {
+export const part1 = (input) => {
   return
 }
 
-export const part2 = (input = parsedData) => {
+export const part2 = (input) => {
   return
 }
-
-export default {
-  part1,
-  part2,
-}

_template/index.test.js

@@ -1,18 +1,18 @@
-const { inputParser, part1, part2 } = require('./index.js')
-const { example, data } = require('./input.js')
+const { parseInput, part1, part2 } = require('./index.js')
+const { getExampleInput, getInput } = require('./input.js')
 
-test('part 1 example', () => {
-  expect(part1(inputParser(example))).toBe(0)
+test('part 1 example', async () => {
+  expect(part1(parseInput(await getExampleInput()))).toBe(0)
 })
 
-test('part 1 data', () => {
-  expect(part1(inputParser(data))).toBe(0)
+test('part 1 data', async () => {
+  expect(part1(parseInput(await getInput()))).toBe(0)
 })
 
-test('part 2 example', () => {
-  expect(part2(inputParser(example))).toBe(0)
+test('part 2 example', async () => {
+  expect(part2(parseInput(await getExampleInput()))).toBe(0)
 })
 
-test('part 2 data', () => {
-  expect(part2(inputParser(data))).toBe(0)
+test('part 2 data', async () => {
+  expect(part2(parseInput(await getInput()))).toBe(0)
 })

_template/input.js

@@ -1,3 +1,16 @@
-export const example = ``
+import fs from 'fs'
+import path from 'path'
 
-export const data = ``
+export const getExampleInput = async () =>
+  fs
+    .readFileSync(
+      path.resolve(process.env.NODE_PATH, 'inputs/{{YEAR}}/{{DAY}}/example.txt')
+    )
+    .toString()
+
+export const getInput = async () =>
+  fs
+    .readFileSync(
+      path.resolve(process.env.NODE_PATH, 'inputs/{{YEAR}}/{{DAY}}/input.txt')
+    )
+    .toString()

bin/generate.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Make solution directory
+mkdir -p ./solutions/$YEAR/$DAY
+
+# Make input files
+mkdir -p ./inputs/$YEAR/$DAY
+touch ./inputs/$YEAR/$DAY/input.txt
+touch ./inputs/$YEAR/$DAY/example.txt
+
+# Copy the template files over
+cp -r ./_template/ ./solutions/$YEAR/$DAY/
+
+# Replace the year template variable
+sed -i '' "s/{{YEAR}}/$YEAR/g" ./solutions/$YEAR/$DAY/README.md
+sed -i '' "s/{{YEAR}}/$YEAR/g" ./solutions/$YEAR/$DAY/input.js
+
+# Replace the day template variable
+sed -i '' "s/{{DAY}}/$DAY/g" ./solutions/$YEAR/$DAY/README.md
+sed -i '' "s/{{DAY}}/$DAY/g" ./solutions/$YEAR/$DAY/input.js
+
+echo "Generated code for Advent of Code $YEAR Day $DAY 🎄"

main.js

@@ -6,6 +6,7 @@ const dayToSolve = process.argv[3]
 
 const days = []
 const solutions = {}
+const inputs = {}
 
 try {
   const files = fs.readdirSync(`./solutions/${year}`)
@@ -19,6 +20,7 @@ try {
 
 days.forEach(async (day) => {
   solutions[day] = import(`./solutions/${year}/${day}/index.js`)
+  inputs[day] = import(`./solutions/${year}/${day}/input.js`)
 })
 
-solve(year, dayToSolve, solutions[dayToSolve])
+solve(year, dayToSolve, solutions[dayToSolve], inputs[dayToSolve])

package.json

@@ -1,7 +1,4 @@
 {
-  "dependencies": {
-    "colors": "^1.4.0"
-  },
   "name": "advent-of-code",
   "version": "1.1.0",
   "description": "A template for solving of Advent of Code in JavaScript",
@@ -10,16 +7,19 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "new": "mkdir -p ./solutions/$YEAR/$DAY && cp -r ./_template/ ./solutions/$YEAR/$DAY/",
+    "new": "bin/generate.sh",
     "solve": "rollup -c ./rollup.config.js --silent && node ./dist/main.js $YEAR $DAY",
-    "test": "jest ./solutions/$YEAR/$DAY"
+    "test": "NODE_PATH=. jest ./solutions/$YEAR/$DAY"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-runtime": "^7.19.6",
     "@babel/preset-env": "^7.12.11",
     "@rollup/plugin-dynamic-import-vars": "^1.1.1",
     "babel-preset-es2015": "^6.24.1",
     "jest": "^26.6.3",
-    "rollup": "^1.27.8"
+    "rollup": "^1.27.8",
+    "rollup-plugin-inject-process-env": "^1.3.1",
+    "colors": "^1.4.0"
   }
 }

rollup.config.js

@@ -1,4 +1,6 @@
 import dynamicImportVars from '@rollup/plugin-dynamic-import-vars'
+import injectProcessEnv from 'rollup-plugin-inject-process-env'
+import path from 'path'
 
 module.exports = {
   input: 'main.js',
@@ -7,8 +9,9 @@ module.exports = {
     format: 'cjs',
   },
   plugins: [
-    dynamicImportVars({
-      // options
+    dynamicImportVars({}),
+    injectProcessEnv({
+      NODE_PATH: path.resolve(__dirname),
     }),
   ],
 }

solve.js

@@ -1,9 +1,9 @@
 import colors from 'colors'
 
-export default async (year, day, solutionsPromise) => {
+export default async (year, day, solutionsPromise, inputsPromise) => {
   // @TODO: Fix this jank
-  const resolvedSolutions = await solutionsPromise
-  const solutions = resolvedSolutions.default
+  const { part1, part2 } = await solutionsPromise
+  const { getInput } = await inputsPromise
 
   console.log('                                       '.bgRed)
 
@@ -16,10 +16,10 @@ export default async (year, day, solutionsPromise) => {
   console.log('')
 
   console.log(`🎄🎄 DAY ${day} PART ONE 🎄🎄`.bold.green)
-  console.log(`${await solutions.part1()}\n`)
+  console.log(`${await part1(getInput())}\n`)
 
   console.log(`🎄🎄 DAY ${day} PART TWO 🎄🎄`.bold.green)
-  console.log(await solutions.part2())
+  console.log(await part2(getInput()))
 
   console.log('')