Rewrite as ES module

Author: p3k

bin/germknoedel

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import '../lib/main.js';

bin/germknoedel.js

@@ -1,4 +1,7 @@
-module.exports = {
-  calculate: require('./lib/calculate.js'),
-  validate: require('./lib/validate')
+import calculate from './lib/calculate.js';
+import validate from './lib/validate.js';
+
+export {
+  calculate,
+  validate
 };

index.js

@@ -1,8 +1,9 @@
-const fs = require('fs');
-const http = require('http');
-const zlib = require('zlib');
+import fs from 'fs';
+import http from 'http';
+import zlib from 'zlib';
 
-const { success, fail } = require('./feedback');
+import { success, fail } from './feedback.js';
+import { __dirname } from './util.js';
 
 const url = 'http://www.pruefziffernberechnung.de/Begleitdokumente/BKZ.sh.gz';
 const authorities = JSON.parse(fs.readFileSync(__dirname + '/../authorities.json'));
@@ -95,4 +96,4 @@ const update = () => {
     });
 };
 
-module.exports = { authorities, query, update };
+export { authorities, query, update };

lib/authorities.js

@@ -27,7 +27,7 @@ const format = date => {
   ].join('');
 };
 
-module.exports = (serial = '0'.repeat(9), gender = 'x', dateOfBirth = new Date(0), dateOfExpiry = new Date()) => {
+export default (serial = '0'.repeat(9), gender = 'x', dateOfBirth = new Date(0), dateOfExpiry = new Date()) => {
   if (typeof serial === 'object') {
     const params = serial;
     var { serial = '0'.repeat(9), gender = 'x', dateOfBirth = new Date(0), dateOfExpiry = new Date() } = params;

lib/calculate.js

@@ -1,18 +1,16 @@
-const chalk = require('chalk');
+import chalk from 'chalk';
 
-module.exports = {
-  success: (...args) => {
-    args.unshift('✅');
-    console.log.apply(console, args.map(arg => chalk.green.bold(arg)));
-  },
+export const success = (...args) => {
+  args.unshift('✅');
+  console.log.apply(console, args.map(arg => chalk.green.bold(arg)));
+};
 
-  warn: (...args) => {
-    args.unshift('⚠️');
-    console.warn.apply(console, args.map(arg => chalk.yellow.bold(arg)));
-  },
+export const warn = (...args) => {
+  args.unshift('⚠️');
+  console.warn.apply(console, args.map(arg => chalk.yellow.bold(arg)));
+};
 
-  fail: (...args) => {
-    args.unshift('‼️');
-    console.error.apply(console, args.map(arg => chalk.red.bold(arg)));
-  }
+export const fail = (...args) => {
+  args.unshift('‼️');
+  console.error.apply(console, args.map(arg => chalk.red.bold(arg)));
 };

lib/feedback.js

@@ -1,16 +1,15 @@
-const chalk = require('chalk');
-const commandLineUsage = require('command-line-usage');
+import chalk from 'chalk';
+import commandLineUsage from 'command-line-usage';
 
-module.exports = args => {
+export default args => {
   const usage = commandLineUsage([
     {
       header: 'Name'.toUpperCase(),
       content: 'germknoedel – generate passport codes.'
     },
     {
       header: 'Synopsis'.toUpperCase(),
-      content: `germknoedel <date-of-birth> <date-of-expiry>
-        germknodel (alternative spelling)`
+      content: 'germknoedel <date-of-birth> <date-of-expiry>'
     },
     {
       header: 'Examples'.toUpperCase(),

lib/help.js

@@ -1,12 +1,16 @@
-const chalk = require('chalk');
-const commandLineArgs = require('command-line-args');
+import chalk from 'chalk';
+import commandLineArgs from 'command-line-args';
+import fs from 'fs';
 
-const calculate = require('./calculate');
-const { fail } = require('./feedback');
-const help = require('./help');
-const package = require('../package.json');
-const { query, update } = require('./authorities');
-const validate = require('./validate');
+import calculate from './calculate.js';
+import { fail } from './feedback.js';
+import help from './help.js';
+import { query, update } from './authorities.js';
+import validate from './validate.js';
+
+import { __dirname } from './util.js';
+
+const module = JSON.parse(fs.readFileSync(__dirname + '/../package.json'));
 
 const mainArgs = [
   { name: 'authority', alias: 'a', type: String, description: 'The ID of the issuing authority' },
@@ -33,7 +37,7 @@ args.dateOfExpiry = argv[1];
 if (args.help) {
   help(mainArgs);
 } else if (args.version) {
-  console.log(package.version)
+  console.log(module.version);
 } else if (args.update) {
   update();
 } else if (typeof args.query !== 'undefined') {

lib/main.js

@@ -0,0 +1,5 @@
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+export const __filename = fileURLToPath(import.meta.url);
+export const __dirname = dirname(__filename);

lib/util.js

@@ -1,5 +1,5 @@
-const { authorities } = require('./authorities');
-const { warn } = require('./feedback');
+import { authorities } from './authorities.js';
+import { warn } from './feedback.js';
 
 const CHARACTERS = '0123456789abcdefghijklmnpqrstuvwxyz';
 const GENDERS = { female: 'f', male: 'm', unspecified: 'x' };
@@ -15,7 +15,7 @@ const randomDate = () => {
   return new Date(randomInt(new Date().getFullYear()), randomInt(12) - 1, randomInt(31));
 };
 
-module.exports = args => {
+export default args => {
   const validated = Object.assign({}, args);
 
   if (validated.dateOfBirth) {