1.2.4

- Update `LATEST` to `8`
- Revamp CLI

Author: Nixinova

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.4
+- Updated `LATEST` pack formats to `8`.
+- Changed CLI argument parsing to no longer require a fixed argument order.
+
 ## 1.2.3
 *2021-09-16*
 - Updated to support 1.18 snapshots.

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "pack-format",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "Returns the pack_format of any Minecraft version, including snapshots",
     "scripts": {
         "prepublish": "tsc",
@@ -34,8 +34,12 @@
         "url": "https://github.com/Nixinova/pack-format/issues"
     },
     "license": "ISC",
+    "dependencies": {
+        "yargs-parser": "^20.2.9"
+    },
     "devDependencies": {
         "@types/node": "ts4.4",
+        "@types/yargs-parser": "ts4.4",
         "typescript": "~4.4.3"
     }
 }

package.json

@@ -29,7 +29,7 @@ const packFormat = require('pack-format')
 packFormat('1.14.4') // 4
 packFormat('1.16.2-pre1', 'resource') // 5
 packFormat('20w45a', 'data') // 6
-packFormat.LATEST.data // 7
+packFormat.LATEST.data // 8
 ```
 
 Retrieve a list of versions corresponding to a specific `pack_format`, again optionally specifying resource/data pack version.

readme.md

@@ -1,7 +1,8 @@
+import yargs from 'yargs-parser';
+
 import { getPackFormat, getVersions, LATEST } from './index'
 import { version as VERSION } from '../package.json';
 
-const arg = (n: number): string => process.argv[n + 1]
 const indent = (n: number): string => ' '.repeat(n * 4)
 const log = function (arg: string, desc: string[], example: string): void {
     console.log(`\n${indent(2)}pack-format ${arg}`)
@@ -10,33 +11,47 @@ const log = function (arg: string, desc: string[], example: string): void {
     console.log(`${indent(3)}Example: ${example}`)
 }
 
-if (arg(1) && !arg(1).includes('h')) {
-    const cmd = arg(1)
-    if (/^-*v/.test(cmd)) {
-        console.log(`The current version of pack-format is ${VERSION}`)
+const argOpts: yargs.Options = {
+    alias: {
+        help: ['h'],
+        version: ['v'],
+        resource: ['r'],
+        data: ['d'],
+        list: ['l'],
+        latest: ['L'],
+    },
+    boolean: ['help', 'version', 'resource', 'data', 'list', 'latest'],
+}
+const args = yargs(process.argv.slice(2), argOpts)
+const ver = args._[0];
+
+if (ver) {
+    if (args.version) {
+        console.log(`pack-format v${VERSION}`)
+    }
+    else if (args.list) {
+        console.debug(ver, args)
+        if (Number.isNaN(ver)) throw new Error(`'${ver}' is not a valid pack format`)
+        if (Math.round(+ver) !== +ver) throw new Error(`'${ver}' is a version number, not a pack format`)
+        const type = args.data ? 'data' : 'resource'
+        console.log(getVersions(+ver, type))
     }
-    else if (/^-*d/.test(cmd)) {
-        const ver = arg(2)
+    else if (args.data) {
         console.log(`Data pack format of ${ver} is ${getPackFormat(ver, 'data')}`)
     }
-    else if (/^-*r/.test(cmd)) {
-        const ver = arg(2)
+    else if (args.resource) {
         console.log(`Resource pack format of ${ver} is ${getPackFormat(ver, 'resource')}`)
     }
-    else if (/^-*l/.test(cmd)) {
-        if (arg(3)) console.log(getVersions(+arg(3), /^-*d/.test(arg(2)) ? 'data' : 'resource'))
-        else console.log(getVersions(+arg(2)))
-    }
-    else if (/^-*L/.test(cmd)) {
-        const type = /^-*d/.test(arg(2)) ? 'data' : 'resource'
-        if (arg(2)) console.log(`The latest ${type} pack version is ${LATEST[type]}.`)
-        else console.log(`The latest pack version is ${LATEST.resource}.`)
-    }
     else {
-        console.log(`Pack format of ${cmd} is ${getPackFormat(cmd)}`)
+        console.log(`Pack format of ${ver} is ${getPackFormat(ver)}`)
     }
 }
-else {
+else if (args.latest) {
+    const type = args.data ? 'data' : args.resource ? 'resource' : ''
+    if (type) console.log(`The latest ${type} pack version is ${LATEST[type]}.`)
+    else console.log(`The latest pack version is ${LATEST.resource}.`)
+}
+if (args.help) {
     console.log(`\n${indent(1)}pack-format arguments:`)
     log(
         '<version>',

src/cli.ts

@@ -8,7 +8,7 @@ class Snapshot {
     get id(): number { return (this.year - 10) * 52 + this.week }
 }
 
-const LATEST = { resource: 7, data: 7 }
+const LATEST = { resource: 8, data: 8 }
 
 const RELEASES: Record<number, VersionName[]> = {
     1: ['1.6.x', '1.7.x', '1.8.x'],