1.2.2

- Add support for 1.18-experimental and combat tests

Author: Nixinova

.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: CI Testing
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x, 14.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test Node.js v${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm test

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 *.js
 *.d.ts
+!bin/*

bin/index.js

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

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.2
+*2021-07-23*
+- Added support for Combat Test snapshots.
+- Updated to support 1.18 experimental snapshots.
+
 ## 1.2.1
 *2021-04-06*
 - Added constant `LATEST` which returns the latest `pack_format` for both resource and data pack formats.

package-lock.json

@@ -1,10 +1,10 @@
 {
     "name": "pack-format",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "Returns the pack_format of any Minecraft version, including snapshots",
     "scripts": {
         "prepublish": "tsc",
-        "test": "node test"
+        "test": "tsc && node test/test"
     },
     "keywords": [
         "minecraft",
@@ -14,9 +14,10 @@
     ],
     "main": "src/index.js",
     "bin": {
-        "pack-format": "src/cli.js"
+        "pack-format": "bin/index.js"
     },
     "files": [
+        "bin/*.js",
         "src/*.js",
         "src/*.d.ts"
     ],
@@ -30,7 +31,7 @@
     },
     "license": "ISC",
     "devDependencies": {
-        "@types/node": "^14.14.31",
-        "typescript": "~4.2.3"
+        "@types/node": "ts4.3",
+        "typescript": "~4.3.5"
     }
 }

package.json

@@ -1,8 +1,5 @@
-#!/usr/bin/env node
-
-const VERSION: string = '1.2.1'
-
 import { getPackFormat, getVersions, LATEST } from './index'
+const VERSION: string = require('../package.json').version
 
 const arg = (n: number): string => process.argv[n + 1]
 const indent = (n: number): string => ' '.repeat(n * 4)

src/cli.ts

@@ -8,19 +8,27 @@ class Snapshot {
     get id(): number { return (this.year - 10) * 52 + this.week }
 }
 
+const LATEST = { resource: 7, data: 7 }
+
 const RELEASES: Record<number, VersionName[]> = {
     1: ['1.6.x', '1.7.x', '1.8.x'],
     2: ['1.9.x', '1.10.x'],
     3: ['1.11.x', '1.12.x'],
     4: ['1.13.x', '1.14.x'],
     5: ['1.15.x', '1.16.0', '1.16.1'],
     6: ['1.16.x'],
-    7: ['1.17.x'],
+    7: ['1.17.x', '1.18.0'],
+}
+
+const SPECIAL: Record<number, string[]> = {
+    4: ['combat1', 'combat2', 'combat3'],
+    5: ['combat4', 'combat5'],
+    6: ['combat6', 'combat7a', 'combat7b', 'combat8a', 'combat8b', 'combat8c'],
 }
 
-const d = new Date()
-const fauxCurrentSnapshot = (d.getFullYear() - 2000) + 'w' + ((d.getMonth() + 1) * 5).toString().padStart(2, '0') + 'a' as SnapshotName
-const START_SNAPSHOTS: Record<SnapshotName | string, Record<PackType, FormatResult>> = {
+const d = new Date(), year = d.getFullYear() - 2000, maxWeek = (d.getMonth() + 1) * 5
+const fauxCurrentSnapshot: SnapshotName = `${year}w${maxWeek.toString().padStart(2, '0')}a`
+const START_SNAPSHOTS: Record<SnapshotName, Record<PackType, FormatResult>> = {
     '13w24a': { resource: 1, data: undefined },
     '15w31a': { resource: 2, data: undefined },
     '16w32a': { resource: 3, data: undefined },
@@ -31,19 +39,23 @@ const START_SNAPSHOTS: Record<SnapshotName | string, Record<PackType, FormatResu
     [fauxCurrentSnapshot]: { resource: undefined, data: undefined },
 }
 
-const LATEST = { resource: 7, data: 7 }
-
 function getPackFormat(version: string, type: PackType = 'resource'): FormatResult {
     if (!version) return undefined
     version = version.toString().toLowerCase().trim()
 
+    // Special //
+    for (const format in SPECIAL) {
+        if (SPECIAL[format].includes(version)) return +format;
+    }
+
     // Snapshot //
 
     if (/^\d\d[w]\d\d[a-z]$/.test(version)) {
         const snapshot = new Snapshot(version)
         let ver: FormatResult
-        for (let testSnap of Object.keys(START_SNAPSHOTS)) {
+        for (const testSnap in START_SNAPSHOTS) {
             if (snapshot.id >= (new Snapshot(testSnap)).id) {
+                // @ts-ignore: #45159
                 ver = START_SNAPSHOTS[testSnap][type]
             }
         }
@@ -58,14 +70,14 @@ function getPackFormat(version: string, type: PackType = 'resource'): FormatResu
         if (version.includes('1.16.2-pre')) return 5
         else version = version.replace(/-.+$/, '')
     }
-    if (version.match(/^\d+\.\d+$/)) version += '.0'
+    if (/^\d+\.\d+$/.test(version)) version += '.0'
 
-    for (let i in RELEASES) {
-        if (+i < 4 && type === 'data') continue
-        for (let testVer of RELEASES[i]) {
+    for (const format in RELEASES) {
+        if (+format < 4 && type === 'data') continue
+        for (let testVer of RELEASES[format]) {
             const matchExact = testVer === version
             const matchMinor = testVer.includes('x') && version.includes(testVer.replace('.x', ''))
-            if (matchExact || matchMinor) return +i
+            if (matchExact || matchMinor) return +format
         }
     }
 
@@ -84,6 +96,7 @@ function getVersions(format: number, type: PackType = 'resource'): VersionsResul
 
     const startSnaps: string[] = Object.keys(START_SNAPSHOTS)
     for (const snap in START_SNAPSHOTS) {
+        // @ts-ignore: #45159
         if (START_SNAPSHOTS[snap][type] === format) {
             let maxSnap = snap as SnapshotName
             let i = 1

src/index.ts

@@ -1,5 +1,5 @@
 export type VersionName = `1.${number}.${number | 'x'}`
-export type SnapshotName = `${number}w${number}${string}`
+export type SnapshotName = `${number}w${string}${string}`
 
 export type PackType = 'resource' | 'data'
 export type PackMap = Record<PackType, FormatResult>

src/types.ts

@@ -23,7 +23,7 @@ function testVersions([input, type]: [number, PackType?], expected: VersionsResu
     if (pass) passed++
     else failed++
     total++
-    const cleanObj = (obj: VersionsResult) => JSON.stringify(obj).replace(/"(?!")/g, '')
+    const cleanObj = (obj: VersionsResult) => JSON.stringify(obj).replace(/"([^"]*?)":/g, '$1:')
     console.log(
         (pass ? '  ' : '! ')
         + `Versions with ${type ? type + ' ' : ''}pack format ${input}: ${cleanObj(obj)}`
@@ -53,9 +53,11 @@ testPackFormat(['20w45a'], 7)
 testPackFormat(['20w45a', 'resource'], 7)
 testPackFormat(['20w45a', 'data'], 6)
 testPackFormat(['20w46a', 'data'], 7)
+testPackFormat(['combat3'], 4)
+testPackFormat(['1.18-exp1'], 7)
 
 testVersions([3, 'data'], { releases: { min: '', max: '' }, snapshots: { min: '', max: '' } })
 testVersions([6, 'resource'], { releases: { min: '1.16.x', max: '1.16.x' }, snapshots: { min: '', max: '' } })
-testVersions([7], { releases: { min: '1.17.x', max: '1.17.x' }, snapshots: { min: '20w45a', max: '21w14a' } })
+testVersions([6, 'data'], { releases: { min: '1.16.x', max: '1.16.x' }, snapshots: { min: '20w45a', max: '20w45a' } })
 
 console.log(`\nRan ${total} tests | ${passed} passed | ${failed} failed`)