Skip to content

Commit 8975338

Browse files
committed
Fix class export and package.json
1 parent c32e901 commit 8975338

File tree

5 files changed

+23
-42
lines changed

5 files changed

+23
-42
lines changed

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"name": "ts-binary-serializer",
33
"version": "2.0.0-beta",
44
"description": "Binary serializer for typescript",
5-
"main": "dist/BinarySerializer.js",
6-
"module": "./dist/BinarySerializer.es.js",
7-
"typings": "./dist/BinarySerializer.d.ts",
5+
"main": "dist/src/BinarySerializer.js",
6+
"typings": "./dist/src/BinarySerializer.d.ts",
87
"scripts": {
98
"test": "mocha -r ts-node/register ./tests/**.test.ts",
109
"build": "tsc && rollup -c ./rollup.config.ts"
@@ -15,7 +14,6 @@
1514
"dependencies": {
1615
},
1716
"devDependencies": {
18-
"@types/chai": "^4.1.7",
1917
"@types/mocha": "^5.2.5",
2018
"chai": "^4.2.0",
2119
"mocha": "^5.2.0",

src/BinarySerializer.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import { BinaryBuffer } from './BinaryBuffer';
33
import { TypeMetaClass } from './TypeMetaClass';
44
import { BinaryBufferDebug, BinaryBufDbgInfo } from './BInaryBufferDebug';
55

6+
export * from './DataType';
7+
export * from './SerializeField';
8+
69
export class BinarySerializeOptions{
710
public fastUTF8string?:boolean = true;
811
}
@@ -12,25 +15,6 @@ export class BinaryDeserializeOptions{
1215
public serializeDbgInfo?:BinaryBufDbgInfo;
1316
}
1417

15-
/**
16-
* @deprecated since v2.0, use BinarySerializer.Serialize instead
17-
* @param obj
18-
* @param type
19-
* @param options
20-
*/
21-
export function BinarySerialize < T > (obj : T,type?:{new():T}):ArrayBuffer{
22-
return BinarySerializer.Serialize(obj,type);
23-
}
24-
25-
/**
26-
* @deprecated since v2.0, use BinarySerializer.Deserialize instead
27-
* @param type
28-
* @param databuffer
29-
*/
30-
export function BinaryDeserialize<T>(type:{new():T},databuffer:ArrayBuffer): T{
31-
return BinarySerializer.Deserialize(databuffer,type);
32-
}
33-
3418
export module BinarySerializer{
3519
function preSerialize<T>(obj:T,type?:{new():T}):TypeMetaClass{
3620
let p = Object.getPrototypeOf(obj);

tests/map.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { BinarySerialize, BinaryDeserialize } from "../src/BinarySerializer";
21
import { DataType } from "../src/DataType";
32
import { SerializeField } from "../src/SerializeField";
43
import { verfiy } from "./helper.test";
4+
import { BinarySerializer } from "../src/BinarySerializer";
55

66

77
describe("map",()=>{
@@ -28,8 +28,8 @@ describe("map",()=>{
2828
var obj1 = new TestClass();
2929
obj1.map = map;
3030

31-
let d = BinarySerialize(obj1,TestClass);
32-
let obj2 = BinaryDeserialize(TestClass,d);
31+
let d = BinarySerializer.Serialize(obj1,TestClass);
32+
let obj2 = BinarySerializer.Deserialize(d,TestClass);
3333
verfiy(obj2,obj1);
3434
});
3535

@@ -45,8 +45,8 @@ describe("map",()=>{
4545
var obj1 = new TestClass();
4646
obj1.map = map;
4747

48-
let d = BinarySerialize(obj1,TestClass);
49-
let obj2 = BinaryDeserialize(TestClass,d);
48+
let d = BinarySerializer.Serialize(obj1,TestClass);
49+
let obj2 = BinarySerializer.Deserialize(d,TestClass);
5050
verfiy(obj1,obj2);
5151
})
5252
})

tests/primitive.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as chai from 'chai';
2-
import { BinarySerialize, BinaryDeserialize } from '../src/BinarySerializer';
2+
import { BinarySerializer } from '../src/BinarySerializer';
33
import { Float16 } from '../src/Float16';
44
import { DataType } from '../src/DataType';
55
import { SerializeField } from '../src/SerializeField';
@@ -45,8 +45,8 @@ describe('primitive-type', () => {
4545
obja.mint32 = -(1 << 16);
4646
obja.muint32 = 1 << 31 - 1;
4747

48-
let buffer = BinarySerialize(obja, ClassA);
49-
let objb = <ClassA>BinaryDeserialize(ClassA, buffer);
48+
let buffer = BinarySerializer.Serialize(obja, ClassA);
49+
let objb = <ClassA>BinarySerializer.Deserialize(buffer, ClassA);
5050

5151
it("bool", () => {
5252
expect(objb.mbool).to.eq(obja.mbool);
@@ -131,8 +131,8 @@ describe('large-data', () => {
131131
ary.push(Math.random());
132132
}
133133
data.numary = ary;
134-
let serializedData = BinarySerialize(data);
135-
let deserializeObj = <LargeData>BinaryDeserialize(LargeData, serializedData);
134+
let serializedData = BinarySerializer.Serialize(data);
135+
let deserializeObj = <LargeData>BinarySerializer.Deserialize(serializedData, LargeData);
136136
let dary = deserializeObj.numary;
137137

138138
it('large-array', () => {
@@ -172,11 +172,11 @@ describe('attatch-type', () => {
172172
Object.setPrototypeOf(obj5, Object.getPrototypeOf(new AttatchType()));
173173
obj5['num'] = 10;
174174

175-
let d1 = <AttatchType>BinaryDeserialize(AttatchType, BinarySerialize(obj1));
176-
let d2 = <AttatchType>BinaryDeserialize(AttatchType, BinarySerialize(obj2, AttatchType));
177-
let d3 = <AttatchType>BinaryDeserialize(AttatchType, BinarySerialize(obj3, AttatchType));
178-
let d4 = <AttatchType>BinaryDeserialize(AttatchType, BinarySerialize(obj4, AttatchType));
179-
let d5 = <AttatchType>BinaryDeserialize(AttatchType, BinarySerialize(obj5));
175+
let d1 = <AttatchType>BinarySerializer.Deserialize(BinarySerializer.Serialize(obj1), AttatchType);
176+
let d2 = <AttatchType>BinarySerializer.Deserialize(BinarySerializer.Serialize(obj2, AttatchType), AttatchType);
177+
let d3 = <AttatchType>BinarySerializer.Deserialize(BinarySerializer.Serialize(obj3, AttatchType), AttatchType);
178+
let d4 = <AttatchType>BinarySerializer.Deserialize(BinarySerializer.Serialize(obj4, AttatchType), AttatchType);
179+
let d5 = <AttatchType>BinarySerializer.Deserialize(BinarySerializer.Serialize(obj5), AttatchType);
180180

181181
it('new()', () => {
182182
expect(d1.num).to.eq(10);
@@ -215,8 +215,8 @@ describe("array", () => {
215215
obj.ary2 = [10];
216216
obj.emptyAry = [];
217217

218-
let d = BinarySerialize(obj);
219-
var d1 = <ClassWithArray>BinaryDeserialize(ClassWithArray, d);
218+
let d = BinarySerializer.Serialize(obj);
219+
var d1 = <ClassWithArray>BinarySerializer.Deserialize(d, ClassWithArray);
220220

221221
it('Array<T>', () => {
222222
expect(d1.ary1[0]).to.eq(10);

tests/utf8.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { SerializeField } from "../src/SerializeField";
22
import { DataType } from "../src/DataType";
3-
import { BinarySerialize, BinaryDeserialize, BinarySerializer } from "../src/BinarySerializer";
4-
import * as chai from 'chai';
3+
import { BinarySerializer } from "../src/BinarySerializer";
54
import { verfiy } from "./helper.test";
65

76

0 commit comments

Comments
 (0)