1.2.8

- Fix CLI argument parsing
- Fix CLI crashing on use

Author: Nixinova

bin/index.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/src/cli.js');
+require('../dist/cli.js');

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.8
+*2021-10-03*
+- Changed CLI arguments `--help` and `--version` to override other arguments.
+- Fixed CLI argument `--version` not returning the current version.
+- Fixed command-line usage not working.
+
 ## 1.2.7
 *2021-10-03*
 - Fixed snapshots appearing malformed when using `getVersions()`.

package-lock.json

@@ -1,10 +1,10 @@
 {
     "name": "pack-format",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "description": "Returns the pack_format of any Minecraft version, including snapshots",
     "scripts": {
         "prepublish": "tsc",
-        "test": "tsc && node dist/test/test"
+        "test": "tsc && node test/test"
     },
     "keywords": [
         "minecraft",
@@ -14,13 +14,13 @@
         "data pack",
         "pack format"
     ],
-    "main": "dist/src/index.js",
+    "main": "dist/index.js",
     "bin": {
         "pack-format": "bin/index.js"
     },
     "files": [
         "bin/",
-        "dist/src/"
+        "dist/"
     ],
     "engines": {
         "node": ">=12"

package.json

@@ -19,13 +19,10 @@ const args = {
     latest: rawArgs.some(arg => /^-+L|^-+latest/.test(arg)),
     _: rawArgs.filter(arg => !arg.startsWith('-')),
 }
-const ver = args._[0]
+const ver = !args.help && !args.version && args._[0]
 
 if (ver) {
-    if (args.version) {
-        console.log(`pack-format v${VERSION}`)
-    }
-    else if (args.list) {
+    if (args.list) {
         if (Number.isNaN(ver)) console.error(`'${ver}' is not a valid pack format`)
         else if (Math.round(+ver) !== +ver) console.error(`'${ver}' is a version number, not a pack format`)
         else {
@@ -45,6 +42,9 @@ else if (args.latest) {
     if (type) console.log(`The latest ${type} pack format version is ${LATEST[type]}.`)
     else console.log(`The latest pack format version is ${Math.max(LATEST.resource, LATEST.data)}.`)
 }
+else if (args.version) {
+    console.log(`pack-format ${VERSION}`)
+}
 if (args.help) {
     console.log(`\n${indent(1)}pack-format arguments:`)
     log(

src/cli.ts

@@ -1,11 +1,10 @@
-import { getPackFormat as packFormat, getVersions } from '../src/index'
-import { PackType, FormatResult, VersionsResult } from '../src/types'
+const { getPackFormat: packFormat, getVersions } = require('../dist/index')
 
-let [total, passed, failed]: number[] = [0, 0, 0]
+let [total, passed, failed] = [0, 0, 0]
 
-function testPackFormat([input, type]: [string, PackType?], expected: FormatResult): void {
-    let ver: FormatResult = packFormat(input, type)
-    let pass: boolean = ver === expected
+function testPackFormat([input, type], expected) {
+    const ver = packFormat(input, type)
+    const pass = ver === expected
     if (pass) passed++
     else failed++
     total++
@@ -17,13 +16,13 @@ function testPackFormat([input, type]: [string, PackType?], expected: FormatResu
     )
 }
 
-function testVersions([input, type]: [number, PackType?], expected: VersionsResult) {
-    let obj: VersionsResult = getVersions(input, type)
+function testVersions([input, type], expected) {
+    const obj = getVersions(input, type)
     let pass = obj.releases.max === expected.releases.max && obj.snapshots.min === expected.snapshots.min
     if (pass) passed++
     else failed++
     total++
-    const cleanObj = (obj: VersionsResult) => JSON.stringify(obj).replace(/"([^"]*?)":/g, '$1:')
+    const cleanObj = (obj) => JSON.stringify(obj).replace(/"([^"]*?)":/g, '$1:')
     console.log(
         (pass ? '  ' : '! ')
         + `Versions with ${type ? type + ' ' : ''}pack format ${input}: ${cleanObj(obj)}`