1.2.3

- Update to 1.18 snapshots

Author: Nixinova

.gitattributes

@@ -1,8 +1,2 @@
 # General
 * text=auto
-
-# Project
-package-lock.json -diff
-
-# Linguist
-*.ts linguist-language=TypeScript

.gitignore

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

bin/index.js

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

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3
+*2021-09-16*
+- Updated to support 1.18 snapshots.
+
 ## 1.2.2
 *2021-07-23*
 - Added support for Combat Test snapshots.

package-lock.json

@@ -1,26 +1,30 @@
 {
     "name": "pack-format",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "Returns the pack_format of any Minecraft version, including snapshots",
     "scripts": {
         "prepublish": "tsc",
-        "test": "tsc && node test/test"
+        "test": "tsc && node dist/test/test"
     },
     "keywords": [
         "minecraft",
         "resourcepack",
+        "resource pack",
         "datapack",
-        "pack_format"
+        "data pack",
+        "pack format"
     ],
-    "main": "src/index.js",
+    "main": "dist/src/index.js",
     "bin": {
         "pack-format": "bin/index.js"
     },
     "files": [
-        "bin/*.js",
-        "src/*.js",
-        "src/*.d.ts"
+        "bin/",
+        "dist/src/"
     ],
+    "engines": {
+        "node": ">=12"
+    },
     "repository": {
         "type": "git",
         "url": "git+https://github.com/Nixinova/pack-format.git"
@@ -31,7 +35,7 @@
     },
     "license": "ISC",
     "devDependencies": {
-        "@types/node": "ts4.3",
-        "typescript": "~4.3.5"
+        "@types/node": "ts4.4",
+        "typescript": "~4.4.3"
     }
 }

package.json

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

src/cli.ts

@@ -17,7 +17,8 @@ const RELEASES: Record<number, VersionName[]> = {
     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', '1.18.0'],
+    7: ['1.17.x'],
+    8: ['1.18.x'],
 }
 
 const SPECIAL: Record<number, string[]> = {
@@ -36,6 +37,7 @@ const START_SNAPSHOTS: Record<SnapshotName, Record<PackType, FormatResult>> = {
     '20w06a': { resource: 5, data: 5 },
     '20w45a': { resource: 7, data: 6 },
     '20w46a': { resource: 7, data: 7 },
+    '21w37a': { resource: 8, data: 8 },
     [fauxCurrentSnapshot]: { resource: undefined, data: undefined },
 }
 
@@ -64,11 +66,17 @@ function getPackFormat(version: string, type: PackType = 'resource'): FormatResu
 
     // Release //
 
-    version = version.replace(/-? *pre[- ]?(release)? */, '-pre').replace(/ *release candidate */, '-rc')
+    version = version
+        .replace(/-? *pre[- ]?(release)? */, '-pre')
+        .replace(/ *release candidate */, '-rc')
+        .replace(/ *experimental *snapshot|-es/, '-exp')
 
     if (version.includes('-')) {
+        // Special cases for specific development versions
         if (version.includes('1.16.2-pre')) return 5
-        else version = version.replace(/-.+$/, '')
+        if (version.includes('1.18-e')) return 7
+        // Default to the parent version
+        version = version.replace(/-.+$/, '')
     }
     if (/^\d+\.\d+$/.test(version)) version += '.0'
 

src/index.ts

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

src/types.ts

@@ -50,11 +50,15 @@ testPackFormat(['16w31a'], 2)
 testPackFormat(['16w32a'], 3)
 testPackFormat(['20w30a'], 5)
 testPackFormat(['20w45a'], 7)
+testPackFormat(['21w37a'], 8)
 testPackFormat(['20w45a', 'resource'], 7)
 testPackFormat(['20w45a', 'data'], 6)
 testPackFormat(['20w46a', 'data'], 7)
 testPackFormat(['combat3'], 4)
 testPackFormat(['1.18-exp1'], 7)
+testPackFormat(['1.18-es2'], 7)
+testPackFormat(['1.18 experimental snapshot 3'], 7)
+testPackFormat(['1.18'], 8)
 
 testVersions([3, 'data'], { releases: { min: '', max: '' }, snapshots: { min: '', max: '' } })
 testVersions([6, 'resource'], { releases: { min: '1.16.x', max: '1.16.x' }, snapshots: { min: '', max: '' } })