ES6ify

package.json

@@ -1,6 +1,7 @@
 {
   "name": "gitlab-time-tracker",
   "version": "1.8.0",
+  "type": "module",
   "description": "A command line interface for GitLabs time tracking feature.",
   "bugs": {
     "url": "https://github.com/ndu2/gitlab-time-tracker/issues"
@@ -20,15 +21,7 @@
     "gtt": "src/gtt.js"
   },
   "engines": {
-    "node": ">=18"
-  },
-  "pkg": {
-    "scripts": "src/**/*.js",
-    "targets": [
-      "node18-linux-x64",
-      "node18-macos-x64",
-      "node18-win-x64"
-    ]
+    "node": ">=20"
   },
   "author": "kriskbx",
   "license": "GPL-2.0",

spec/_setup.spec.js

@@ -1,8 +1,7 @@
-const sinon = require('sinon');
-const chai = require('chai');
+import sinon from "sinon";
 
 beforeEach(function () {
-    this.sandbox = sinon.sandbox.create()
+    this.sandbox = sinon.createSandbox()
 });
 
 afterEach(function () {

spec/include/config.spec.js

@@ -1,5 +1,5 @@
-const config = require('./../../src/include/config');
-const expect = require('chai').expect;
+import config from '../../src/include/config.js';
+import { expect } from 'chai';
 
 describe('The config class', () => {
     it('stores data', () => {

spec/models/time.title.spec.js

@@ -1,29 +1,30 @@
-const moment = require('moment');
-const Config = require('../../src/include/config');
-const Time = require('./../../src/models/time');
-const issue = require('../../src/models/issue');
-const mergeRequest = require('../../src/models/mergeRequest');
-const expect = require('chai').expect;
+
+import moment from 'moment';
+import Config from '../../src/include/file-config.js';
+import Time from '../../src/models/time.js';
+import issue from '../../src/models/issue.js';
+import mergeRequest from '../../src/models/mergeRequest.js';
+import { expect } from 'chai';
 
 describe('time class', () => {
     it('Returns title of parent Issue', () => {
-        const config = new Config();
+        const config = new Config(process.cwd());
         const parent = new issue(config, {title: "Test title"})
         const time = new Time('1h', moment(), {}, parent,  config);
 
         expect(time.title).to.be.equal("Test title");
     });
 
     it('Returns title of parent MergeRequest', () => {
-        const config = new Config();
+        const config = new Config(process.cwd());
         const parent = new mergeRequest(config, {title: "Test title"})
         const time = new Time('1h', moment(), {}, parent,  config);
 
         expect(time.title).to.be.equal("Test title");
     });
 
     it('Returns Null for missed title or parent', () => {
-        const config = new Config();
+        const config = new Config(process.cwd());
         const parent = new mergeRequest(config, {});
         let time;
         time = new Time('1h', moment(), {}, parent,  config);

src/gtt-cancel.js

@@ -1,10 +1,9 @@
-const program = require('commander');
-const colors = require('colors');
-const moment = require('moment');
-
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Tasks = require('./include/tasks');
+import {program} from 'commander';
+import colors from 'colors';
+import moment from 'moment';
+import Config from './include/file-config.js';
+import Cli from './include/cli.js';
+import Tasks from './include/tasks.js';
 
 program
     .option('--verbose', 'show verbose output')

src/gtt-config.js

@@ -1,7 +1,6 @@
-const program = require('commander');
-
-const Config = require('./include/file-config');
-const Fs = require('./include/filesystem');
+import {program} from 'commander';
+import Config from './include/file-config.js';
+import Fs from './include/filesystem.js';
 
 let config = new Config(process.cwd());
 

src/gtt-create.js

@@ -1,10 +1,9 @@
-const colors = require('colors');
-const moment = require('moment');
-const program = require('commander');
-
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Tasks = require('./include/tasks');
+import colors from 'colors';
+import moment from 'moment';
+import program from 'commander';
+import Config from './include/file-config';
+import Cli from './include/cli';
+import Tasks from './include/tasks';
 
 program
     .arguments('[project] [title]')

src/gtt-delete.js

@@ -1,9 +1,8 @@
-const program = require('commander');
-
-const Frame = require('./models/frame');
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Fs = require('./include/filesystem');
+import program from 'commander';
+import Frame from './models/frame';
+import Config from './include/file-config';
+import Cli from './include/cli';
+import Fs from './include/filesystem';
 
 program
     .arguments('[id]')

src/gtt-edit.js

@@ -1,11 +1,11 @@
-const program = require('commander');
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Fs = require('./include/filesystem');
-const _ = require('underscore');
-const Time = require('./models/time');
-const Frame = require('./models/frame');
-const inquirer = require('inquirer');
+import {program} from 'commander';
+import Config from './include/file-config.js';
+import Cli from './include/cli.js';
+import Fs from './include/filesystem.js';
+import _ from 'underscore';
+import Time from './models/time.js';
+import Frame from './models/frame.js';
+import inquirer from 'inquirer';
 
 
 program
@@ -29,12 +29,12 @@ function toHumanReadable(input) {
 }
 
 if (!id) {
-  lastFrames = Fs.all(config.frameDir).slice(-listSize); // last listSize frames (one page of inquirer)
+  let lastFrames = Fs.all(config.frameDir).slice(-listSize); // last listSize frames (one page of inquirer)
   lastFrames = lastFrames.map((file) =>
     Frame.fromFile(config, Fs.join(config.frameDir, file))
   );
 
-  lastFramesDetails = lastFrames
+  let lastFramesDetails = lastFrames
     .sort((a, b) => (a.start.isBefore(b.start) ? -1 : 1))
     .map((frame) => {
       let issue = `${

src/gtt-list.js

@@ -1,28 +1,25 @@
-const program = require('commander');
-const colors = require('colors');
-const moment = require('moment');
-const Table = require('cli-table');
+import { program } from 'commander';
+import colors from 'colors';
+import moment from 'moment';
+import Table from 'cli-table';
 
 
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Tasks = require('./include/tasks');
+import Config from './include/file-config.js';
+import cli from './include/cli.js';
+import Tasks from './include/tasks.js';
 
-program
-    .arguments('[project]')
+program.arguments('[project]')
     .option('--verbose', 'show verbose output')
     .option('-c, --closed', 'show closed issues (instead of opened only)')
     .option('--my', 'show only issues assigned to me')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
-
 let config = new Config(process.cwd()),
     tasks = new Tasks(config),
-    type = program.type ? program.type : 'issue',
+    type = program.opts().type ? program.opts().type : 'issue',
     project = program.args[0];
 
-tasks.list(project, program.closed ? 'closed' : 'opened', program.my)
+tasks.list(project, program.opts().closed ? 'closed' : 'opened', program.opts().my)
   .then(issues => {
     let table = new Table({
       style : {compact : true, 'padding-left' : 1}
@@ -35,5 +32,5 @@ tasks.list(project, program.closed ? 'closed' : 'opened', program.my)
     })
     console.log(table.toString());
   })
-  .catch(error => Cli.error(error));
+  .catch(error => cli.error(error));
 

src/gtt-log.js

@@ -1,13 +1,12 @@
-const _ = require('underscore');
-const program = require('commander');
-const colors = require('colors');
-const moment = require('moment-timezone');
-
-const Config = require('./include/file-config');
-const Cli = require('./include/cli');
-const Time = require('./models/time');
-const Tasks = require('./include/tasks');
-const mergeRequest = require('./models/mergeRequest');
+import _ from 'underscore';
+import program from 'commander';
+import colors from 'colors';
+import moment from 'moment-timezone';
+import Config from './include/file-config';
+import Cli from './include/cli';
+import Time from './models/time';
+import Tasks from './include/tasks';
+import mergeRequest from './models/mergeRequest';
 
 program
     .option('--verbose', 'show verbose output')
@@ -31,7 +30,7 @@ function column(str, n){
         str = str.substr(0, n-1) + "…"
     }
     return str.padEnd(n);
-  };
+  }
 
 const logCSV = (frames, times) => {
     console.log("frameId, project, issueid, date, starttime, endtime, duration (s), title, note");
@@ -43,7 +42,7 @@ const logCSV = (frames, times) => {
         });
     });
 };
-    
+
 const logCli =  (frames, times) => {
     Object.keys(frames).sort().forEach(date => {
         if (!frames.hasOwnProperty(date)) return;

src/gtt-report.js

@@ -1,22 +1,28 @@
-const _ = require('underscore');
-const fs = require('fs');
-const program = require('commander');
-const moment = require('moment');
-
-const Cli = require('./include/cli');
-const Config = require('./include/file-config');
-const Report = require('./models/report');
-const Owner = require('./models/owner');
-const ReportCollection = require('./models/reportCollection');
+import _ from 'underscore';
+import fs from 'fs';
+import {program} from 'commander';
+import moment from 'moment';
+import Cli from './include/cli.js';
+import Config from './include/file-config.js';
+import Report from './models/report.js';
+import Owner from './models/owner.js';
+import ReportCollection from './models/reportCollection.js';
+import table from './output/table.js';
+import csv from './output/csv.js';
+import markdown from './output/markdown.js';
+import invoice from './output/invoice.js';
+import invoice2 from './output/invoice2.js';
+import dump from './output/dump.js';
+import xlsx from './output/xlsx.js';
 
 const Output = {
-    table: require('./output/table'),
-    csv: require('./output/csv'),
-    markdown: require('./output/markdown'),
-    invoice: require('./output/invoice'),
-    invoice2: require('./output/invoice2'),
-    dump: require('./output/dump'),
-    xlsx: require('./output/xlsx')
+    table,
+    csv,
+    markdown,
+    invoice,
+    invoice2,
+    dump,
+    xlsx
 };
 
 // this collects options
@@ -168,7 +174,7 @@ if (program.opts().this_month)
     config
         .set('from', moment().startOf('month'))
         .set('to', moment().endOf('month'));
-if (program.last_month)
+if (program.opts().last_month)
     config
         .set('from', moment().subtract(1, 'months').startOf('month'))
         .set('to', moment().subtract(1, 'months').endOf('month'));
@@ -382,7 +388,7 @@ new Promise(resolve => {
             Cli.error('No issues or merge requests matched your criteria.');
 
         Cli.list(`${Cli.output}  Making report`);
-        output = new Output[config.get('output')](config, master);
+        output = new (Output[config.get('output')])(config, master);
         output.make();
         Cli.mark();
         resolve();