node-pkware 1.0.1 → 1.0.2

package/bin/explode.js

@@ -10,8 +10,8 @@ const args = minimist(process.argv.slice(2), {
   string: ['output', 'offset', 'input-buffer-size', 'output-buffer-size'],
   boolean: ['version', 'drop-before-offset', 'debug'],
   alias: {
-    v: 'version'
-  }
+    v: 'version',
+  },
 })
 
 const decompress = (input, output, offset, keepHeader, config) => {
@@ -27,7 +27,8 @@ const decompress = (input, output, offset, keepHeader, config) => {
 
 ;(async () => {
   if (args.version) {
-    console.log(await getPackageVersion())
+    const version = await getPackageVersion()
+    console.log(`node-pkware - version ${version}`)
     process.exit(0)
   }
 
@@ -63,14 +64,14 @@ const decompress = (input, output, offset, keepHeader, config) => {
   const config = {
     debug: args.debug,
     inputBufferSize: parseNumberString(args['input-buffer-size'], 0x10000),
-    outputBufferSize: parseNumberString(args['output-buffer-size'], 0x40000)
+    outputBufferSize: parseNumberString(args['output-buffer-size'], 0x40000),
   }
 
   decompress(input, output, offset, keepHeader, config)
     .then(() => {
       process.exit(0)
     })
-    .catch(e => {
+    .catch((e) => {
       console.error(`error: ${e.message}`)
       process.exit(1)
     })

package/bin/implode.js

@@ -7,7 +7,7 @@ const {
   COMPRESSION_ASCII,
   DICTIONARY_SIZE_SMALL,
   DICTIONARY_SIZE_MEDIUM,
-  DICTIONARY_SIZE_LARGE
+  DICTIONARY_SIZE_LARGE,
 } = require('../src/constants.js')
 const { getPackageVersion, parseNumberString, fileExists } = require('../src/helpers/functions.js')
 const { implode } = require('../src/implode.js')
@@ -33,13 +33,14 @@ const args = minimist(process.argv.slice(2), {
     s: 'small',
     m: 'medium',
     l: 'large',
-    v: 'version'
-  }
+    v: 'version',
+  },
 })
 
 ;(async () => {
   if (args.version) {
-    console.log(await getPackageVersion())
+    const version = await getPackageVersion()
+    console.log(`node-pkware - version ${version}`)
     process.exit(0)
   }
 
@@ -67,7 +68,9 @@ const args = minimist(process.argv.slice(2), {
     hasErrors = true
   }
 
-  const sizes = [args.small, args.medium, args.large].filter(x => x === true)
+  const sizes = [args.small, args.medium, args.large].filter((x) => {
+    return x === true
+  })
   if (sizes.length > 1) {
     console.error('error: multiple size types specified, can only work with one of --small, --medium and --large')
     hasErrors = true
@@ -99,14 +102,14 @@ const args = minimist(process.argv.slice(2), {
   const config = {
     debug: args.debug,
     inputBufferSize: parseNumberString(args['input-buffer-size'], 0x10000),
-    outputBufferSize: parseNumberString(args['output-buffer-size'], 0x12000)
+    outputBufferSize: parseNumberString(args['output-buffer-size'], 0x12000),
   }
 
   decompress(input, output, offset, keepHeader, compressionType, dictionarySize, config)
     .then(() => {
       process.exit(0)
     })
-    .catch(e => {
+    .catch((e) => {
       console.error(`error: ${e.message}`)
       process.exit(1)
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pkware",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The nodejs implementation of StormLib's pkware compressor/de-compressor",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "implode": "bin/implode.js"
   },
   "scripts": {
-    "lint": "eslint \"src/**/*.js\"",
+    "lint": "eslint \"{bin,src,test}/**/*.{js,ts}\"",
     "lint:fix": "npm run lint -- --fix",
     "lint:staged": "lint-staged",
     "test:unit": "set FORCE_COLOR=true && mocha test/**/*.spec.js --timeout 5000",
@@ -33,28 +33,30 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "minimist-lite": "^2.2.1",
-    "ramda": "^0.28.0",
-    "ramda-adjunct": "^3.1.0"
+    "ramda": "^0.28.0"
   },
   "devDependencies": {
+    "@types/node": "^18.7.14",
     "arx-header-size": "^0.7.0",
     "binary-comparator": "^0.5.0",
-    "eslint": "^8.15.0",
+    "esbuild": "^0.15.6",
+    "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-prettier-standard": "^4.0.1",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.0.1",
     "eslint-plugin-ramda": "^2.5.1",
     "eslint-plugin-standard": "^4.1.0",
-    "lint-staged": "^12.4.1",
+    "lint-staged": "^13.0.3",
     "mocha": "^10.0.0",
-    "nodemon": "^2.0.16",
+    "nodemon": "^2.0.19",
     "pre-commit": "^1.2.2",
-    "prettier": "^2.6.2",
-    "prettier-config-standard": "^5.0.0"
+    "prettier": "^2.7.1",
+    "prettier-config-standard": "^5.0.0",
+    "typescript": "^4.8.2"
   },
   "pre-commit": [
     "lint:staged",

package/src/constants.js

@@ -135,5 +135,5 @@ module.exports = {
   ExLenBits,
   LenBase,
   ChBitsAsc,
-  ChCodeAsc
+  ChCodeAsc,
 }

package/src/errors.js

@@ -46,5 +46,5 @@ module.exports = {
   InvalidDataError,
   AbortedError,
   ExpectedBufferError,
-  ExpectedFunctionError
+  ExpectedFunctionError,
 }

package/src/explode.js

@@ -1,14 +1,13 @@
-const { repeat, unfold, reduce, has, includes } = require('ramda')
-const { isFunction } = require('ramda-adjunct')
+const { repeat, unfold, has } = require('ramda')
 const {
   InvalidDataError,
   InvalidCompressionTypeError,
   InvalidDictionarySizeError,
   ExpectedBufferError,
   ExpectedFunctionError,
-  AbortedError
+  AbortedError,
 } = require('./errors.js')
-const { mergeSparseArrays, getLowestNBits, nBitsOfOnes, toHex } = require('./helpers/functions.js')
+const { mergeSparseArrays, getLowestNBits, nBitsOfOnes, toHex, isFunction } = require('./helpers/functions.js')
 const {
   ChBitsAsc,
   ChCodeAsc,
@@ -26,11 +25,11 @@ const {
   ExLenBits,
   DistBits,
   LenCode,
-  DistCode
+  DistCode,
 } = require('./constants.js')
 const ExpandingBuffer = require('./helpers/ExpandingBuffer.js')
 
-const readHeader = buffer => {
+const readHeader = (buffer) => {
   if (!Buffer.isBuffer(buffer)) {
     throw new ExpectedBufferError()
   }
@@ -40,22 +39,24 @@ const readHeader = buffer => {
 
   const compressionType = buffer.readUInt8(0)
   const dictionarySizeBits = buffer.readUInt8(1)
-  if (compressionType !== COMPRESSION_BINARY && compressionType !== COMPRESSION_ASCII) {
+  if (![COMPRESSION_BINARY, COMPRESSION_ASCII].includes(compressionType)) {
     throw new InvalidCompressionTypeError()
   }
-  if (!includes(dictionarySizeBits, [DICTIONARY_SIZE_SMALL, DICTIONARY_SIZE_MEDIUM, DICTIONARY_SIZE_LARGE])) {
+  if (![DICTIONARY_SIZE_SMALL, DICTIONARY_SIZE_MEDIUM, DICTIONARY_SIZE_LARGE].includes(dictionarySizeBits)) {
     throw new InvalidDictionarySizeError()
   }
 
   return {
     compressionType,
-    dictionarySizeBits
+    dictionarySizeBits,
   }
 }
 
 // PAT = populate ascii table
-const createPATIterator = (limit, stepper) => n => {
-  return n >= limit ? false : [n, n + (1 << stepper)]
+const createPATIterator = (limit, stepper) => {
+  return (n) => {
+    return n >= limit ? false : [n, n + (1 << stepper)]
+  }
 }
 
 const populateAsciiTable = (value, index, bits, limit) => {
@@ -63,14 +64,10 @@ const populateAsciiTable = (value, index, bits, limit) => {
   const seed = ChCodeAsc[index] >> bits
   const idxs = unfold(iterator, seed)
 
-  return reduce(
-    (acc, idx) => {
-      acc[idx] = index
-      return acc
-    },
-    [],
-    idxs
-  )
+  return idxs.reduce((acc, idx) => {
+    acc[idx] = index
+    return acc
+  }, [])
 }
 
 const generateAsciiTables = () => {
@@ -78,7 +75,7 @@ const generateAsciiTables = () => {
     asciiTable2C34: repeat(0, 0x100),
     asciiTable2D34: repeat(0, 0x100),
     asciiTable2E34: repeat(0, 0x80),
-    asciiTable2EB4: repeat(0, 0x100)
+    asciiTable2EB4: repeat(0, 0x100),
   }
 
   tables.chBitsAsc = ChBitsAsc.map((value, index) => {
@@ -132,7 +129,7 @@ const parseInitialData = (state, debug = false) => {
     console.log(
       `explode: compression level: ${
         state.dictionarySizeBits === 4 ? 'small' : state.dictionarySizeBits === 5 ? 'medium' : 'large'
-      }`
+      }`,
     )
   }
 
@@ -158,7 +155,7 @@ const wasteBits = (state, numberOfBits) => {
   return PKDCL_OK
 }
 
-const decodeNextLiteral = state => {
+const decodeNextLiteral = (state) => {
   const lastBit = state.bitBuffer & 1
 
   if (wasteBits(state, 1) === PKDCL_STREAM_END) {
@@ -354,7 +351,7 @@ const explode = (config = {}) => {
   handler._state = {
     _backup: {
       extraBits: null,
-      bitBuffer: null
+      bitBuffer: null,
     },
     needMoreInput: true,
     isFirstChunk: true,
@@ -364,7 +361,7 @@ const explode = (config = {}) => {
     distPosCodes: generateDecodeTables(DistCode, DistBits),
     inputBuffer: new ExpandingBuffer(inputBufferSize),
     outputBuffer: new ExpandingBuffer(outputBufferSize),
-    onInputFinished: callback => {
+    onInputFinished: (callback) => {
       const state = handler._state
 
       if (debug) {
@@ -393,8 +390,8 @@ const explode = (config = {}) => {
       state.inputBuffer._restoreIndices()
     },
     stats: {
-      chunkCounter: 0
-    }
+      chunkCounter: 0,
+    },
   }
 
   return handler
@@ -410,5 +407,5 @@ module.exports = {
   wasteBits,
   decodeNextLiteral,
   decodeDistance,
-  generateDecodeTables
+  generateDecodeTables,
 }

package/src/helpers/ExpandingBuffer.js

@@ -9,7 +9,7 @@ class ExpandingBuffer {
 
     this._backup = {
       _startIndex: 0,
-      _endIndex: 0
+      _endIndex: 0,
     }
   }
 

package/src/helpers/functions.js

@@ -1,6 +1,24 @@
 const fs = require('fs')
-const { repeat, test } = require('ramda')
-const { isNumber, isString } = require('ramda-adjunct')
+const { repeat, test, type } = require('ramda')
+
+const isNumber = (x) => {
+  return typeof x === 'number'
+}
+
+const isString = (x) => {
+  return typeof x === 'string'
+}
+
+const isFunction = (x) => {
+  return type(x) === 'Function'
+}
+
+const noop = () => {}
+
+// https://stackoverflow.com/a/68989785/1806628
+const isPlainObject = (x) => {
+  return x.constructor === Object
+}
 
 const isBetween = (min, max, num) => {
   if (!isNumber(min) || !isNumber(max) || !isNumber(num)) {
@@ -13,7 +31,7 @@ const isBetween = (min, max, num) => {
   return num >= min && num <= max
 }
 
-const nBitsOfOnes = numberOfBits => {
+const nBitsOfOnes = (numberOfBits) => {
   if (!Number.isInteger(numberOfBits) || numberOfBits < 0) {
     return null
   }
@@ -37,7 +55,7 @@ const getLowestNBits = (numberOfBits, number) => {
 
 const isDecimalString = test(/^\d+$/)
 
-const isFullHexString = str => {
+const isFullHexString = (str) => {
   if (isString(str)) {
     return /^\s*0x[0-9a-f]+\s*$/.test(str)
   } else {
@@ -77,7 +95,9 @@ const mergeSparseArrays = (a, b) => {
 /*
 export const dumpBytes = bytes => {
   const formattedBytes = Array.from(bytes)
-    .map(byte => toHex(byte, 2, true))
+    .map(byte => {
+      return toHex(byte, 2, true)
+    })
     .join(' ')
   return `<${formattedBytes}>`
 }
@@ -102,7 +122,7 @@ const getPackageVersion = async () => {
   }
 }
 
-const fileExists = async filename => {
+const fileExists = async (filename) => {
   try {
     await fs.promises.access(filename, fs.constants.R_OK)
     return true
@@ -112,6 +132,11 @@ const fileExists = async filename => {
 }
 
 module.exports = {
+  isNumber,
+  isString,
+  isFunction,
+  noop,
+  isPlainObject,
   isBetween,
   nBitsOfOnes,
   maskBits,
@@ -121,5 +146,5 @@ module.exports = {
   mergeSparseArrays,
   parseNumberString,
   getPackageVersion,
-  fileExists
+  fileExists,
 }

package/src/helpers/stream.js

@@ -1,7 +1,7 @@
 const { Transform, Writable } = require('stream')
 const { promisify } = require('util')
-const { isFunction } = require('ramda-adjunct')
 const ExpandingBuffer = require('./ExpandingBuffer.js')
+const { isFunction } = require('./functions.js')
 
 const emptyBuffer = Buffer.from([])
 
@@ -15,7 +15,7 @@ class QuasiTransform {
   }
 }
 
-const splitAt = index => {
+const splitAt = (index) => {
   let cntr = 0
 
   if (!Number.isInteger(index) || index < 0) {
@@ -24,7 +24,7 @@ const splitAt = index => {
     }
   }
 
-  return chunk => {
+  return (chunk) => {
     let left
     let right
     let isLeftDone = true
@@ -66,9 +66,9 @@ const transformEmpty = () => {
   }
 }
 
-const through = handler => {
+const through = (handler) => {
   return new Transform({
-    transform: handler
+    transform: handler,
   })
 }
 
@@ -89,7 +89,7 @@ const transformSplitBy = (predicate, leftHandler, rightHandler) => {
 
     if (isFirstChunk) {
       isFirstChunk = false
-      this._flush = flushCallback => {
+      this._flush = (flushCallback) => {
         if (!dam.isEmpty()) {
           this.push(dam.read())
         }
@@ -122,10 +122,10 @@ const transformSplitBy = (predicate, leftHandler, rightHandler) => {
         }
 
         Promise.all([leftFiller, rightFiller])
-          .then(buffers => {
+          .then((buffers) => {
             flushCallback(null, Buffer.concat(buffers))
           })
-          .catch(err => {
+          .catch((err) => {
             flushCallback(err)
           })
       }
@@ -146,7 +146,7 @@ const transformSplitBy = (predicate, leftHandler, rightHandler) => {
     }
 
     Promise.all([_left, filler, _right])
-      .then(buffers => {
+      .then((buffers) => {
         dam.append(Buffer.concat(buffers))
         if (dam.size() > damChunkSize) {
           const chunks = Math.floor(dam.size() / damChunkSize)
@@ -160,13 +160,13 @@ const transformSplitBy = (predicate, leftHandler, rightHandler) => {
           callback(null, emptyBuffer)
         }
       })
-      .catch(err => {
+      .catch((err) => {
         callback(err)
       })
   }
 }
 
-const streamToBuffer = done => {
+const streamToBuffer = (done) => {
   const buffer = new ExpandingBuffer()
   return new Writable({
     write(chunk, encoding, callback) {
@@ -176,7 +176,7 @@ const streamToBuffer = done => {
     final(callback) {
       done(buffer.getHeap())
       callback()
-    }
+    },
   })
 }
 
@@ -186,5 +186,5 @@ module.exports = {
   transformEmpty,
   through,
   transformSplitBy,
-  streamToBuffer
+  streamToBuffer,
 }

package/src/helpers/testing.js

@@ -8,10 +8,12 @@ const isPromise = promise => {
   return typeof promise === 'object' && promise.constructor.name === 'Promise'
 }
 
-const toConsole = () => (chunk, encoding, callback) => {
-  process.stdout.write(chunk)
-  process.stdout.write(Buffer.from(EOL))
-  callback(null, chunk)
+const toConsole = () => {
+  return (chunk, encoding, callback) => {
+    process.stdout.write(chunk)
+    process.stdout.write(Buffer.from(EOL))
+    callback(null, chunk)
+  }
 }
 
 const readToBuffer = (fileName, chunkSizeInBytes = 1024) => {
@@ -30,7 +32,7 @@ const readToBuffer = (fileName, chunkSizeInBytes = 1024) => {
 */
 
 // source: https://stackoverflow.com/a/43197340/1806628
-const isClass = obj => {
+const isClass = (obj) => {
   const isCtorClass = obj.constructor && obj.constructor.toString().substring(0, 5) === 'class'
   if (obj.prototype === undefined) {
     return isCtorClass
@@ -74,5 +76,5 @@ module.exports = {
   isClass,
   buffersShouldEqual,
   bufferToString,
-  transformToABC
+  transformToABC,
 }

package/src/implode.js

@@ -1,7 +1,6 @@
 const { has, repeat, clone, last, clamp } = require('ramda')
-const { isFunction } = require('ramda-adjunct')
 const ExpandingBuffer = require('./helpers/ExpandingBuffer.js')
-const { toHex, getLowestNBits, nBitsOfOnes } = require('./helpers/functions.js')
+const { toHex, getLowestNBits, nBitsOfOnes, isFunction } = require('./helpers/functions.js')
 const { ExpectedFunctionError, InvalidDictionarySizeError, InvalidCompressionTypeError } = require('./errors.js')
 const {
   ChBitsAsc,
@@ -16,10 +15,10 @@ const {
   LenBits,
   LenCode,
   DistCode,
-  DistBits
+  DistBits,
 } = require('./constants.js')
 
-const setup = state => {
+const setup = (state) => {
   state.nChBits = repeat(0, 0x306)
   state.nChCodes = repeat(0, 0x306)
 
@@ -128,7 +127,7 @@ const findRepetitions = (inputBytes, endOfLastMatch, cursor) => {
     const distance = cursor - endOfLastMatch - matchIndex
     return {
       distance: distance - 1,
-      size: distance > 2 ? getSizeOfMatching(inputBytes, endOfLastMatch + matchIndex, cursor) : 2
+      size: distance > 2 ? getSizeOfMatching(inputBytes, endOfLastMatch + matchIndex, cursor) : 2,
     }
   }
 
@@ -162,7 +161,7 @@ const isRepetitionFlushable = (size, distance, startIndex, inputBufferSize) => {
 
 // repetitions are at least 2 bytes long,
 // so the initial 2 bytes can be moved to the output as is
-const handleFirstTwoBytes = state => {
+const handleFirstTwoBytes = (state) => {
   if (state.handledFirstTwoBytes) {
     return
   }
@@ -319,15 +318,15 @@ const implode = (compressionType, dictionarySizeBits, config = {}) => {
   handler._state = {
     isFirstChunk: true,
     streamEnded: false,
-    compressionType: compressionType,
-    dictionarySizeBits: dictionarySizeBits,
+    compressionType,
+    dictionarySizeBits,
     distCodes: clone(DistCode),
     distBits: clone(DistBits),
     startIndex: 0,
     inputBuffer: new ExpandingBuffer(inputBufferSize),
     outputBuffer: new ExpandingBuffer(outputBufferSize),
     handledFirstTwoBytes: false,
-    onInputFinished: callback => {
+    onInputFinished: (callback) => {
       const state = handler._state
       state.streamEnded = true
       try {
@@ -346,8 +345,8 @@ const implode = (compressionType, dictionarySizeBits, config = {}) => {
       }
     },
     stats: {
-      chunkCounter: 0
-    }
+      chunkCounter: 0,
+    },
   }
 
   return handler
@@ -361,5 +360,5 @@ module.exports = {
   isRepetitionFlushable,
   handleFirstTwoBytes,
   processChunkData,
-  implode
+  implode,
 }

package/src/index.js

@@ -14,5 +14,5 @@ module.exports = {
   decompress,
   constants,
   errors,
-  stream
+  stream,
 }

package/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "skipLibCheck": true,
+    "target": "esnext",
+    "moduleResolution": "node",
+    "allowJs": true,
+    "noImplicitAny": false,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
+    "module": "commonjs",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "incremental": true,
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules"]
+}

package/types/helpers/functions.d.ts

@@ -1,3 +1,8 @@
+export function isNumber(x: any): boolean
+export function isString(x: any): boolean
+export function isFunction(x: any): boolean
+export function noop(): void
+export function isPlainObject(x: any): boolean
 export function isBetween(min: number, max: number, num: number): boolean
 export function nBitsOfOnes(numberOfBits: number): number
 export function maskBits(numberOfBits: number, number: number): number