msgpackr 1.6.2 → 1.6.3

package/index.js

@@ -1,5 +1,5 @@
-export { Packr, Encoder, addExtension, pack, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT, REUSE_BUFFER_MODE } from './pack.js'
-export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './unpack.js'
-export { decodeIter, encodeIter } from './iterators.js'
-export const useRecords = false
-export const mapsAsObjects = true
+export { Packr, Encoder, addExtension, pack, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT, REUSE_BUFFER_MODE } from './pack.js'
+export { Unpackr, Decoder, C1, unpack, unpackMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './unpack.js'
+export { decodeIter, encodeIter } from './iterators.js'
+export const useRecords = false
+export const mapsAsObjects = true

package/iterators.js

@@ -1,87 +1,87 @@
-import { Packr } from './pack.js'
-import { Unpackr } from './unpack.js'
-
-/**
- * Given an Iterable first argument, returns an Iterable where each value is packed as a Buffer
- * If the argument is only Async Iterable, the return value will be an Async Iterable.
- * @param {Iterable|Iterator|AsyncIterable|AsyncIterator} objectIterator - iterable source, like a Readable object stream, an array, Set, or custom object
- * @param {options} [options] - msgpackr pack options
- * @returns {IterableIterator|Promise.<AsyncIterableIterator>}
- */
-export function packIter (objectIterator, options = {}) {
-  if (!objectIterator || typeof objectIterator !== 'object') {
-    throw new Error('first argument must be an Iterable, Async Iterable, or a Promise for an Async Iterable')
-  } else if (typeof objectIterator[Symbol.iterator] === 'function') {
-    return packIterSync(objectIterator, options)
-  } else if (typeof objectIterator.then === 'function' || typeof objectIterator[Symbol.asyncIterator] === 'function') {
-    return packIterAsync(objectIterator, options)
-  } else {
-    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a Promise')
-  }
-}
-
-function * packIterSync (objectIterator, options) {
-  const packr = new Packr(options)
-  for (const value of objectIterator) {
-    yield packr.pack(value)
-  }
-}
-
-async function * packIterAsync (objectIterator, options) {
-  const packr = new Packr(options)
-  for await (const value of objectIterator) {
-    yield packr.pack(value)
-  }
-}
-
-/**
- * Given an Iterable/Iterator input which yields buffers, returns an IterableIterator which yields sync decoded objects
- * Or, given an Async Iterable/Iterator which yields promises resolving in buffers, returns an AsyncIterableIterator.
- * @param {Iterable|Iterator|AsyncIterable|AsyncIterableIterator} bufferIterator
- * @param {object} [options] - unpackr options
- * @returns {IterableIterator|Promise.<AsyncIterableIterator}
- */
-export function unpackIter (bufferIterator, options = {}) {
-  if (!bufferIterator || typeof bufferIterator !== 'object') {
-    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a promise')
-  }
-
-  const unpackr = new Unpackr(options)
-  let incomplete
-  const parser = (chunk) => {
-    let yields
-    // if there's incomplete data from previous chunk, concatinate and try again
-    if (incomplete) {
-      chunk = Buffer.concat([incomplete, chunk])
-      incomplete = undefined
-    }
-
-    try {
-      yields = unpackr.unpackMultiple(chunk)
-    } catch (err) {
-      if (err.incomplete) {
-        incomplete = chunk.slice(err.lastPosition)
-        yields = err.values
-      } else {
-        throw err
-      }
-    }
-    return yields
-  }
-
-  if (typeof bufferIterator[Symbol.iterator] === 'function') {
-    return (function * iter () {
-      for (const value of bufferIterator) {
-        yield * parser(value)
-      }
-    })()
-  } else if (typeof bufferIterator[Symbol.asyncIterator] === 'function') {
-    return (async function * iter () {
-      for await (const value of bufferIterator) {
-        yield * parser(value)
-      }
-    })()
-  }
-}
-export const decodeIter = unpackIter
+import { Packr } from './pack.js'
+import { Unpackr } from './unpack.js'
+
+/**
+ * Given an Iterable first argument, returns an Iterable where each value is packed as a Buffer
+ * If the argument is only Async Iterable, the return value will be an Async Iterable.
+ * @param {Iterable|Iterator|AsyncIterable|AsyncIterator} objectIterator - iterable source, like a Readable object stream, an array, Set, or custom object
+ * @param {options} [options] - msgpackr pack options
+ * @returns {IterableIterator|Promise.<AsyncIterableIterator>}
+ */
+export function packIter (objectIterator, options = {}) {
+  if (!objectIterator || typeof objectIterator !== 'object') {
+    throw new Error('first argument must be an Iterable, Async Iterable, or a Promise for an Async Iterable')
+  } else if (typeof objectIterator[Symbol.iterator] === 'function') {
+    return packIterSync(objectIterator, options)
+  } else if (typeof objectIterator.then === 'function' || typeof objectIterator[Symbol.asyncIterator] === 'function') {
+    return packIterAsync(objectIterator, options)
+  } else {
+    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a Promise')
+  }
+}
+
+function * packIterSync (objectIterator, options) {
+  const packr = new Packr(options)
+  for (const value of objectIterator) {
+    yield packr.pack(value)
+  }
+}
+
+async function * packIterAsync (objectIterator, options) {
+  const packr = new Packr(options)
+  for await (const value of objectIterator) {
+    yield packr.pack(value)
+  }
+}
+
+/**
+ * Given an Iterable/Iterator input which yields buffers, returns an IterableIterator which yields sync decoded objects
+ * Or, given an Async Iterable/Iterator which yields promises resolving in buffers, returns an AsyncIterableIterator.
+ * @param {Iterable|Iterator|AsyncIterable|AsyncIterableIterator} bufferIterator
+ * @param {object} [options] - unpackr options
+ * @returns {IterableIterator|Promise.<AsyncIterableIterator}
+ */
+export function unpackIter (bufferIterator, options = {}) {
+  if (!bufferIterator || typeof bufferIterator !== 'object') {
+    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a promise')
+  }
+
+  const unpackr = new Unpackr(options)
+  let incomplete
+  const parser = (chunk) => {
+    let yields
+    // if there's incomplete data from previous chunk, concatinate and try again
+    if (incomplete) {
+      chunk = Buffer.concat([incomplete, chunk])
+      incomplete = undefined
+    }
+
+    try {
+      yields = unpackr.unpackMultiple(chunk)
+    } catch (err) {
+      if (err.incomplete) {
+        incomplete = chunk.slice(err.lastPosition)
+        yields = err.values
+      } else {
+        throw err
+      }
+    }
+    return yields
+  }
+
+  if (typeof bufferIterator[Symbol.iterator] === 'function') {
+    return (function * iter () {
+      for (const value of bufferIterator) {
+        yield * parser(value)
+      }
+    })()
+  } else if (typeof bufferIterator[Symbol.asyncIterator] === 'function') {
+    return (async function * iter () {
+      for await (const value of bufferIterator) {
+        yield * parser(value)
+      }
+    })()
+  }
+}
+export const decodeIter = unpackIter
 export const encodeIter = packIter

package/pack.d.ts

@@ -1,9 +1,9 @@
-import { Unpackr } from './unpack'
-export { addExtension, FLOAT32_OPTIONS } from './unpack'
-export class Packr extends Unpackr {
-	pack(value: any): Buffer
-	encode(value: any): Buffer
-}
-export class Encoder extends Packr {}
-export function pack(value: any): Buffer
-export function encode(value: any): Buffer
+import { Unpackr } from './unpack'
+export { addExtension, FLOAT32_OPTIONS } from './unpack'
+export class Packr extends Unpackr {
+	pack(value: any): Buffer
+	encode(value: any): Buffer
+}
+export class Encoder extends Packr {}
+export function pack(value: any): Buffer
+export function encode(value: any): Buffer

package/package.json

@@ -1,83 +1,83 @@
-{
-  "name": "msgpackr",
-  "author": "Kris Zyp",
-  "version": "1.6.2",
-  "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
-  "license": "MIT",
-  "types": "./index.d.ts",
-  "main": "./dist/node.cjs",
-  "module": "./index.js",
-  "keywords": [
-    "MessagePack",
-    "msgpack",
-    "performance",
-    "structured",
-    "clone"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/kriszyp/msgpackr"
-  },
-  "scripts": {
-    "benchmark": "node ./tests/benchmark.cjs",
-    "build": "rollup -c",
-    "dry-run": "npm publish --dry-run",
-    "prepare": "npm run build",
-    "test": "mocha tests/test**.*js -u tdd --experimental-json-modules"
-  },
-  "type": "module",
-  "exports": {
-    ".": {
-      "node": {
-        "require": "./dist/node.cjs",
-        "import": "./node-index.js"
-      },
-      "bun": {
-        "require": "./dist/node.cjs",
-        "import": "./node-index.js"
-      },
-      "default": "./index.js"
-    },
-    "./pack": {
-      "node": {
-        "import": "./index.js",
-        "require": "./dist/node.cjs"
-      },
-      "bun": {
-        "import": "./index.js",
-        "require": "./dist/node.cjs"
-      },
-      "default": "./pack.js"
-    },
-    "./unpack": {
-      "node": {
-        "import": "./index.js",
-        "require": "./dist/node.cjs"
-      },
-      "bun": {
-        "import": "./index.js",
-        "require": "./dist/node.cjs"
-      },
-      "default": "./unpack.js"
-    }
-  },
-  "files": [
-    "/dist",
-    "*.md",
-    "/*.js",
-    "/*.ts"
-  ],
-  "optionalDependencies": {
-    "msgpackr-extract": "^2.0.2"
-  },
-  "devDependencies": {
-    "@rollup/plugin-json": "^4.1.0",
-    "@types/node": "latest",
-    "async": "^3",
-    "chai": "^4.3.4",
-    "esm": "^3.2.25",
-    "mocha": "^8.1.3",
-    "rollup": "^1.20.3",
-    "rollup-plugin-babel-minify": "^9.0.0"
-  }
-}
+{
+  "name": "msgpackr",
+  "author": "Kris Zyp",
+  "version": "1.6.3",
+  "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
+  "license": "MIT",
+  "types": "./index.d.ts",
+  "main": "./dist/node.cjs",
+  "module": "./index.js",
+  "keywords": [
+    "MessagePack",
+    "msgpack",
+    "performance",
+    "structured",
+    "clone"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/kriszyp/msgpackr"
+  },
+  "scripts": {
+    "benchmark": "node ./tests/benchmark.cjs",
+    "build": "rollup -c",
+    "dry-run": "npm publish --dry-run",
+    "prepare": "npm run build",
+    "test": "mocha tests/test**.*js -u tdd --experimental-json-modules"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "node": {
+        "require": "./dist/node.cjs",
+        "import": "./node-index.js"
+      },
+      "bun": {
+        "require": "./dist/node.cjs",
+        "import": "./node-index.js"
+      },
+      "default": "./index.js"
+    },
+    "./pack": {
+      "node": {
+        "import": "./index.js",
+        "require": "./dist/node.cjs"
+      },
+      "bun": {
+        "import": "./index.js",
+        "require": "./dist/node.cjs"
+      },
+      "default": "./pack.js"
+    },
+    "./unpack": {
+      "node": {
+        "import": "./index.js",
+        "require": "./dist/node.cjs"
+      },
+      "bun": {
+        "import": "./index.js",
+        "require": "./dist/node.cjs"
+      },
+      "default": "./unpack.js"
+    }
+  },
+  "files": [
+    "/dist",
+    "*.md",
+    "/*.js",
+    "/*.ts"
+  ],
+  "optionalDependencies": {
+    "msgpackr-extract": "^2.0.2"
+  },
+  "devDependencies": {
+    "@rollup/plugin-json": "^4.1.0",
+    "@types/node": "latest",
+    "async": "^3",
+    "chai": "^4.3.4",
+    "esm": "^3.2.25",
+    "mocha": "^8.1.3",
+    "rollup": "^1.20.3",
+    "rollup-plugin-babel-minify": "^9.0.0"
+  }
+}

package/rollup.config.js

@@ -1,45 +1,45 @@
-import minify from "rollup-plugin-babel-minify";
-import json  from "@rollup/plugin-json";
-
-export default [
-    {
-        input: "node-index.js",
-        output: [
-            {
-                file: "dist/node.cjs",
-                format: "cjs"
-            }
-        ]
-    },
-    {
-        input: "index.js",
-        output: {
-            file: "dist/index.js",
-            format: "umd",
-            name: "msgpackr"
-        }
-    },    
-    {
-        input: "index.js",
-        plugins: [minify({
-        })],
-        output: {
-            file: "dist/index.min.js",
-            format: "umd",
-            name: "msgpackr"
-        }
-    },
-    {
-        input: "tests/test.js",
-        plugins: [json()],
-        external: ['chai', '../index.js'],
-        output: {
-            file: "dist/test.js",
-            format: "iife",
-            globals: {
-                chai: 'chai',
-                './index.js': 'msgpackr',
-            },
-        }
-    }
-];
+import minify from "rollup-plugin-babel-minify";
+import json  from "@rollup/plugin-json";
+
+export default [
+    {
+        input: "node-index.js",
+        output: [
+            {
+                file: "dist/node.cjs",
+                format: "cjs"
+            }
+        ]
+    },
+    {
+        input: "index.js",
+        output: {
+            file: "dist/index.js",
+            format: "umd",
+            name: "msgpackr"
+        }
+    },    
+    {
+        input: "index.js",
+        plugins: [minify({
+        })],
+        output: {
+            file: "dist/index.min.js",
+            format: "umd",
+            name: "msgpackr"
+        }
+    },
+    {
+        input: "tests/test.js",
+        plugins: [json()],
+        external: ['chai', '../index.js'],
+        output: {
+            file: "dist/test.js",
+            format: "iife",
+            globals: {
+                chai: 'chai',
+                './index.js': 'msgpackr',
+            },
+        }
+    }
+];

package/stream.js

@@ -1,57 +1,57 @@
-import { Transform } from 'stream'
-import { Packr } from './pack.js'
-import { Unpackr } from './unpack.js'
-var DEFAULT_OPTIONS = {objectMode: true}
-
-export class PackrStream extends Transform {
-	constructor(options) {
-		if (!options)
-			options = {}
-		options.writableObjectMode = true
-		super(options)
-		options.sequential = true
-		this.packr = options.packr || new Packr(options)
-	}
-	_transform(value, encoding, callback) {
-		this.push(this.packr.pack(value))
-		callback()
-	}
-}
-
-export class UnpackrStream extends Transform {
-	constructor(options) {
-		if (!options)
-			options = {}
-		options.objectMode = true
-		super(options)
-		options.structures = []
-		this.unpackr = options.unpackr || new Unpackr(options)
-	}
-	_transform(chunk, encoding, callback) {
-		if (this.incompleteBuffer) {
-			chunk = Buffer.concat([this.incompleteBuffer, chunk])
-			this.incompleteBuffer = null
-		}
-		let values
-		try {
-			values = this.unpackr.unpackMultiple(chunk)
-		} catch(error) {
-			if (error.incomplete) {
-				this.incompleteBuffer = chunk.slice(error.lastPosition)
-				values = error.values
-			}
-			else
-				throw error
-		} finally {
-			for (let value of values || []) {
-				if (value === null)
-					value = this.getNullValue()
-				this.push(value)
-			}
-		}
-		if (callback) callback()
-	}
-	getNullValue() {
-		return Symbol.for(null)
-	}
-}
+import { Transform } from 'stream'
+import { Packr } from './pack.js'
+import { Unpackr } from './unpack.js'
+var DEFAULT_OPTIONS = {objectMode: true}
+
+export class PackrStream extends Transform {
+	constructor(options) {
+		if (!options)
+			options = {}
+		options.writableObjectMode = true
+		super(options)
+		options.sequential = true
+		this.packr = options.packr || new Packr(options)
+	}
+	_transform(value, encoding, callback) {
+		this.push(this.packr.pack(value))
+		callback()
+	}
+}
+
+export class UnpackrStream extends Transform {
+	constructor(options) {
+		if (!options)
+			options = {}
+		options.objectMode = true
+		super(options)
+		options.structures = []
+		this.unpackr = options.unpackr || new Unpackr(options)
+	}
+	_transform(chunk, encoding, callback) {
+		if (this.incompleteBuffer) {
+			chunk = Buffer.concat([this.incompleteBuffer, chunk])
+			this.incompleteBuffer = null
+		}
+		let values
+		try {
+			values = this.unpackr.unpackMultiple(chunk)
+		} catch(error) {
+			if (error.incomplete) {
+				this.incompleteBuffer = chunk.slice(error.lastPosition)
+				values = error.values
+			}
+			else
+				throw error
+		} finally {
+			for (let value of values || []) {
+				if (value === null)
+					value = this.getNullValue()
+				this.push(value)
+			}
+		}
+		if (callback) callback()
+	}
+	getNullValue() {
+		return Symbol.for(null)
+	}
+}

package/unpack.js

@@ -231,7 +231,10 @@ export function read() {
 			if (currentUnpackr.mapsAsObjects) {
 				let object = {}
 				for (let i = 0; i < token; i++) {
-					object[readKey()] = read()
+					let key = readKey()
+					if (key === '__proto__')
+						key = '__proto_'
+					object[key] = read()
 				}
 				return object
 			} else {
@@ -457,7 +460,8 @@ function createStructureReader(structure, firstId) {
 	function readObject() {
 		// This initial function is quick to instantiate, but runs slower. After several iterations pay the cost to build the faster function
 		if (readObject.count++ > inlineObjectReadThreshold) {
-			let readObject = structure.read = (new Function('r', 'return function(){return {' + structure.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '}}'))(read)
+			let readObject = structure.read = (new Function('r', 'return function(){return {' + structure.map(key => key === '__proto__' ? '__proto_:r()' :
+				validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '}}'))(read)
 			if (structure.highByte === 0)
 				structure.read = createSecondByteReader(firstId, structure.read)
 			return readObject() // second byte is already read, if there is one so immediately read object
@@ -465,6 +469,8 @@ function createStructureReader(structure, firstId) {
 		let object = {}
 		for (let i = 0, l = structure.length; i < l; i++) {
 			let key = structure[i]
+			if (key === '__proto__')
+				key = '__proto_'
 			object[key] = read()
 		}
 		return object
@@ -611,7 +617,10 @@ function readMap(length) {
 	if (currentUnpackr.mapsAsObjects) {
 		let object = {}
 		for (let i = 0; i < length; i++) {
-			object[readKey()] = read()
+			let key = readKey()
+			if (key === '__proto__')
+				key = '__proto_';
+			object[key] = read()
 		}
 		return object
 	} else {