jwalker 2.0.0 → 3.0.0

package/bin/index.js

@@ -1,50 +1,38 @@
 #!/usr/bin/env node
 
-'use strict';
-
-const
-	fs = require('fs');
-
-const
-	minimist = require('minimist');
-
-const
-	JWalker = require('../lib');
-
-const
-	args = minimist(process.argv.slice(2), {
-		alias: {
-			'h': 'help',
-			's': 'spaces',
-			'p': 'passthrough',
-			'i': 'input',
-			'o': 'output'
-		},
-		'--': false
-	});
-
-const help = () => {
-
-	console.info('Usage: jwalker [options]');
-	console.info();
-	console.info('  Use -- (or omit) for stdin or stdout.');
-	console.info();
-	console.info('  Options:');
-	console.info('    -i=[file], --input=[file]         Input file (-- for stdin) (default=stdin).');
-	console.info('    -o=[file], --output=[file]        Output file (-- for stdout) (default=stdout).');
-	console.info('    -p, --passthrough                 Passthrough non-JSON.');
-	console.info('    -s=[spaces], --spaces=[spaces]    Number of spaces per indentation (default=4).');
-	console.info();
-
-	process.exit(0);
-
-};
-
-if (args.help === true) return help();
-
-args.input = args.input || '--';
-args.output = args.output || '--';
-
-(args.input === '--' ? process.stdin : fs.createReadStream(args.input))
-	.pipe(new JWalker({ passthroughNonJSON: args.passthrough, spaces: args.spaces }))
-	.pipe((args.output === '--' ? process.stdout : fs.createWriteStream(args.output)));
+import fs from 'fs';
+
+import argumentsParser from '@trenskow/arguments-parser';
+
+import JWalker from '../lib/index.js';
+
+const {
+	input,
+	output,
+	spaces = '\t',
+	passthrough
+} = await argumentsParser().options({
+	'input': {
+		type: String,
+		default: '--',
+		description: 'Input file (-- for stdin).'
+	},
+	'output': {
+		type: String,
+		default: '--',
+		description: 'Output file (-- for stdout).'
+	},
+	'spaces': {
+		type: Number,
+		description: 'Use number of spaces for indentation (default is tab).'
+	},
+	'passthrough': {
+		type: Boolean,
+		default: false,
+		description: 'Passthrough non-JSON lines.'
+	}
+});
+
+(input === '--' ? process.stdin : fs.createReadStream(input))
+	.pipe(new JWalker({ passthroughNonJSON: passthrough, spaces: spaces }))
+	.pipe((output === '--' ? process.stdout : fs.createWriteStream(output)));

package/eslint.config.mjs

@@ -0,0 +1,63 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+import { includeIgnoreFile } from '@eslint/compat';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all
+});
+const gitIgnorePath = path.resolve(__dirname, '.gitignore');
+
+export default [...compat.extends('eslint:recommended'),
+	includeIgnoreFile(gitIgnorePath), {
+		languageOptions: {
+			globals: {
+				...globals.node,
+				...globals.mocha,
+				Router: true,
+				Endpoint: true,
+				app: true
+			},
+
+			ecmaVersion: 'latest',
+			sourceType: 'module'
+		},
+
+		rules: {
+			indent: ['error', 'tab', {
+				SwitchCase: 1
+			}],
+
+			'linebreak-style': ['error', 'unix'],
+			quotes: ['error', 'single'],
+			semi: ['error', 'always'],
+
+			'no-console': ['error', {
+				allow: ['warn', 'error', 'info']
+			}],
+
+			'no-unused-vars': ['warn', {
+				argsIgnorePattern: '^_',
+				caughtErrors: 'none'
+			}],
+
+			'no-empty': ['error', {
+				allowEmptyCatch: true
+			}],
+
+			'no-trailing-spaces': ['error', {
+				ignoreComments: true
+			}],
+
+			'require-atomic-updates': 'off',
+			'no-implicit-globals': ['error'],
+			'eol-last': ['error', 'always'],
+			'comma-dangle': ['error', 'never']
+		}
+	}];

package/lib/index.js

@@ -1,9 +1,7 @@
-'use strict';
 
-const
-	{ Transform } = require('stream');
+import { Transform } from 'stream';
 
-exports = module.exports = class JWalker extends Transform {
+export default class JWalker extends Transform {
 
 	constructor(options = {}) {
 

package/package.json

@@ -1,39 +1,44 @@
 {
-  "name": "jwalker",
-  "version": "2.0.0",
-  "description": "A JSON pretty-printer for each line in a stream. Useful for JSON logs.",
-  "main": "index.js",
-  "bin": {
-    "jwalker": "./bin/index.js"
-  },
-  "scripts": {
-    "test": "./node_modules/mocha/bin/mocha test/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/trenskow/jwalker.git"
-  },
-  "keywords": [
-    "JSON",
-    "lint",
-    "pretty",
-    "print",
-    "line",
-    "readline",
-    "log",
-    "logs",
-    "stream"
-  ],
-  "author": "Kristian Trenskow <trenskow@me.com>",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/trenskow/jwalker/issues"
-  },
-  "homepage": "https://github.com/trenskow/jwalker#readme",
-  "devDependencies": {
-    "eslint": "^7.5.0"
-  },
-  "dependencies": {
-    "minimist": "^1.2.5"
-  }
+	"name": "jwalker",
+	"version": "3.0.0",
+	"description": "A JSON pretty-printer for each line in a stream. Useful for JSON logs.",
+	"main": "index.js",
+	"type": "module",
+	"bin": {
+		"jwalker": "./bin/index.js"
+	},
+	"scripts": {
+		"test": "./node_modules/mocha/bin/mocha test/index.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/trenskow/jwalker.git"
+	},
+	"keywords": [
+		"JSON",
+		"lint",
+		"pretty",
+		"print",
+		"line",
+		"readline",
+		"log",
+		"logs",
+		"stream"
+	],
+	"author": "Kristian Trenskow <trenskow@me.com>",
+	"license": "BSD-3-Clause",
+	"bugs": {
+		"url": "https://github.com/trenskow/jwalker/issues"
+	},
+	"homepage": "https://github.com/trenskow/jwalker#readme",
+	"devDependencies": {
+		"@eslint/compat": "^2.0.0",
+		"@eslint/eslintrc": "^3.3.3",
+		"@eslint/js": "^9.39.2",
+		"eslint": "^9.39.2",
+		"globals": "^17.0.0"
+	},
+	"dependencies": {
+		"@trenskow/arguments-parser": "^0.3.54"
+	}
 }