cbor-x 0.8.0 → 0.9.0

package/tests/test-node-stream.js

@@ -1,11 +1,16 @@
-import { PackrStream, UnpackrStream } from '../node.js'
+import { EncoderStream, DecoderStream } from '../node-index.js'
 import stream from 'stream'
+import chai from 'chai'
+import util from 'util'
+import fs from 'fs'
+const finished = util.promisify(stream.finished)
+var assert = chai.assert
 
-suite('msgpackr node stream tests', function(){
+suite('cbor-x node stream tests', function(){
 	test('serialize/parse stream', () => {
-		const serializeStream = new PackrStream({
+		const serializeStream = new EncoderStream({
 		})
-		const parseStream = new UnpackrStream()
+		const parseStream = new DecoderStream()
 		serializeStream.pipe(parseStream)
 		const received = []
 		parseStream.on('data', data => {
@@ -31,7 +36,7 @@ suite('msgpackr node stream tests', function(){
 		})
 	})
 	test('stream from buffer', () => new Promise(async resolve => {
-		const parseStream = new UnpackrStream()
+		const parseStream = new DecoderStream()
 		let values = []
 		parseStream.on('data', (value) => {
 			values.push(value)
@@ -45,4 +50,11 @@ suite('msgpackr node stream tests', function(){
 		bufferStream.push(new Uint8Array([1, 2]))
 		bufferStream.push(null)
 	}))
+
+	teardown(function() {
+		try {
+			fs.unlinkSync('test-output.msgpack')
+		}catch(error){}
+	})
 })
+

package/tests/test.js

@@ -1,8 +1,7 @@
 import * as CBOR from '../index.js'
 import chai from 'chai'
-//import('./test.mjs')
 import sampleData from './example4.json'
-//import inspector from 'inspector'; inspector.open(9330, null, true); debugger
+//import inspector from 'inspector'; inspector.open(9229, null, true); debugger
 function tryRequire(module) {
 	try {
 		return require(module)
@@ -85,6 +84,13 @@ suite('CBOR basic tests', function(){
 		assert.deepEqual(deserialized, data)
 	})
 
+	test('255 chars', function() {
+		const data = 'RRZG9A6I7xupPeOZhxcOcioFsuhszGOdyDUcbRf4Zef2kdPIfC9RaLO4jTM5JhuZvTsF09fbRHMGtqk7YAgu3vespeTe9l61ziZ6VrMnYu2CamK96wCkmz0VUXyqaiUoTPgzk414LS9yYrd5uh7w18ksJF5SlC2e91rukWvNqAZJjYN3jpkqHNOFchCwFrhbxq2Lrv1kSJPYCx9blRg2hGmYqTbElLTZHv20iNqwZeQbRMgSBPT6vnbCBPnOh1W'
+		var serialized = CBOR.encode(data)
+		var deserialized = CBOR.decode(serialized)
+		assert.equal(deserialized, data)
+	})
+
 	test('encode/decode sample data', function(){
 		var data = sampleData
 		var serialized = CBOR.encode(data)
@@ -215,10 +221,13 @@ suite('CBOR basic tests', function(){
 		let fa = new Float32Array(b.buffer, 8, 2)
 		fa[0] = 2.25
 		fa[1] = 6
+		let map = new Map()
+		map.set('key', 'value')
 		let object = {
 			error: new Error('test'),
 			set: new Set(['a', 'b']),
 			regexp: /test/gi,
+			map,
 			float32Array: fa,
 			uint16Array: new Uint16Array([3,4])
 		}
@@ -228,6 +237,7 @@ suite('CBOR basic tests', function(){
 		var serialized = encoder.encode(object)
 		var deserialized = encoder.decode(serialized)
 		assert.deepEqual(Array.from(deserialized.set), Array.from(object.set))
+		assert.equal(deserialized.map.get('key'), 'value')
 		assert.equal(deserialized.error.message, object.error.message)
 		assert.equal(deserialized.regexp.test('TEST'), true)
 		assert.equal(deserialized.float32Array.constructor.name, 'Float32Array')
@@ -238,6 +248,19 @@ suite('CBOR basic tests', function(){
 		assert.equal(deserialized.uint16Array[1], 4)
 	})
 
+	test('explicit maps and sets', function () {
+		let map = new Map()
+		map.set('key', { inside: 'value'})
+		let object = {
+			set: new Set(['a', 'b']),
+			map,
+		}
+		var serialized = encode(object) // default encoder
+		var deserialized = decode(serialized)
+		assert.deepEqual(Array.from(deserialized.set), Array.from(object.set))
+		assert.equal(deserialized.map.get('key').inside, 'value')
+	})
+
 	test('object without prototype', function(){
 		var data = Object.create(null)
 		data.test = 3
@@ -253,6 +276,13 @@ suite('CBOR basic tests', function(){
 		var decoded = decode(encoded)
 		assert.equal(decoded.length, size)
 	})
+	test('little buffer', function() {
+		var data = typeof Buffer == 'undefined' ? new Uint8Array(0) : Buffer.alloc(0)
+		var encoded = encode(data)
+		assert.equal(encoded.length, 1) // make sure to use canonical form
+		var decoded = decode(encoded)
+		assert.equal(decoded.length, 0)
+	})
 
 	test('random strings', function(){
 		var data = []
@@ -300,6 +330,7 @@ suite('CBOR basic tests', function(){
 		let encoder = new Encoder({
 			mapsAsObjects: true,
 			useTimestamp32: true,
+			useTag259ForMaps: false,
 		})
 		var serialized = encoder.encode(data)
 		var deserialized = encoder.decode(serialized)

package/index.mjs

@@ -1,35 +0,0 @@
-import encodeModule from './encode.js'
-import decodeModule from './decode.js'
-import { createRequire } from 'module'
-
-export const Encoder = encodeModule.Encoder
-export const addExtension = encodeModule.addExtension
-let extractor = tryRequire('cbor-extract')
-if (extractor)
-	decodeModule.setExtractor(extractor.extractStrings)
-export const Decoder = decodeModule.Decoder
-export const Tag = decodeModule.Tag
-import stream from './stream.js'
-export const EncoderStream = stream.EncoderStream
-export const DecoderStream = stream.DecoderStream
-let encoder = new encodeModule.Encoder({ useRecords: false })
-export const decode = encoder.decode
-export const encode = encoder.encode
-export const useRecords = false
-export const mapsAsObjects = true
-export const ALWAYS = 1
-export const DECIMAL_ROUND = 3
-export const DECIMAL_FIT = 4
-
-
-function tryRequire(moduleId) {
-	try {
-		let require = createRequire(import.meta.url)
-		return require(moduleId)
-	} catch (error) {
-		if (typeof window == 'undefined')
-			console.warn('Native extraction module not loaded, cbor-x will still run, but with decreased performance. ' + error.message.split('\n')[0])
-		else
-			console.warn('For browser usage, directly use encode/decode modules. ' + error.message.split('\n')[0])
-	}
-}

package/node.js

@@ -1,25 +0,0 @@
-export { Encoder, addExtension, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } from './encode.js'
-export { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS } from './decode.js'
-export { EncoderStream, DecoderStream } from './stream.js'
-export const useRecords = false
-export const mapsAsObjects = true
-import { setExtractor } from './decode.js'
-import { createRequire } from 'module'
-
-const extractor = tryRequire('msgpackr-extract')
-if (extractor)
-	setExtractor(extractor.extractStrings)
-/*
-Object.assign(exports, unpackModule.FLOAT32_OPTIONS)
-*/
-function tryRequire(moduleId) {
-	try {
-		let require = createRequire(import.meta.url)
-		return require(moduleId)
-	} catch (error) {
-		if (typeof window == 'undefined')
-			console.warn('Native extraction module not loaded, msgpackr will still run, but with decreased performance. ' + error.message.split('\n')[0])
-		else
-			console.warn('For browser usage, directly use msgpackr/unpack or msgpackr/pack modules. ' + error.message.split('\n')[0])
-	}
-}

package/pack.d.ts

@@ -1,9 +0,0 @@
-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/tests/test.mjs

@@ -1,31 +0,0 @@
-import { pack, unpack } from '../index.mjs'
-var ITERATIONS = 10000
-
-suite('msgpackr basic tests from module', function(){
-	test('pack/unpack data', function(){
-		var data = {
-			data: [
-				{ a: 1, name: 'one', type: 'odd', isOdd: true },
-				{ a: 2, name: 'two', type: 'even'},
-				{ a: 3, name: 'three', type: 'odd', isOdd: true },
-				{ a: 4, name: 'four', type: 'even'},
-				{ a: 5, name: 'five', type: 'odd', isOdd: true },
-				{ a: 6, name: 'six', type: 'even', isOdd: null }
-			],
-			description: 'some names',
-			types: ['odd', 'even'],
-			convertEnumToNum: [
-				{ prop: 'test' },
-				{ prop: 'test' },
-				{ prop: 'test' },
-				{ prop: 1 },
-				{ prop: 2 },
-				{ prop: [undefined] },
-				{ prop: null }
-			]
-		}
-		var serialized = pack(data)
-		var deserialized = unpack(serialized)
-		assert.deepEqual(deserialized, data)
-	})
-})