Skip to content

convert to TS sources #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2019
+1,856 −1,600
Merged

convert to TS sources #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ad6065
convert to TS sources
Jun 2, 2019
4faf836
rebase to master
Jun 2, 2019
002ef73
address feedback
Jun 2, 2019
3bf12cb
run prettier
Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- run:
command: npm install
- run:
command: npm test
command: npx tsc && npm test
- run:
command: npm run check-fmt
- save_cache:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ node_modules

coverage/
.nyc_output/
dist/
7 changes: 7 additions & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parser": "typescript",
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
50 changes: 25 additions & 25 deletions example/bmp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Parser = require("../lib/binary_parser.js").Parser;
var Parser = require('../lib/binary_parser.js').Parser;

// C structure BITMAPFILEHEADER
// typedef struct tagBITMAPFILEHEADER {
Expand All @@ -9,15 +9,15 @@ var Parser = require("../lib/binary_parser.js").Parser;
// DWORD bfOffBits;
// } BITMAPFILEHEADER, *PBITMAPFILEHEADER;
var bmpFileHeader = new Parser()
.endianess("little")
.string("type", {
.endianess('little')
.string('type', {
length: 2,
assert: "BM"
assert: 'BM',
})
.uint32("size")
.uint16("reserved1")
.uint16("reserved2")
.uint32("offBits");
.uint32('size')
.uint16('reserved1')
.uint16('reserved2')
.uint32('offBits');

// C structure BITMAPINFOHEADER definition
// typedef struct tagBITMAPINFOHEADER {
Expand All @@ -34,27 +34,27 @@ var bmpFileHeader = new Parser()
// DWORD biClrImportant;
// } BITMAPINFOHEADER;
var bmpInfoHeader = new Parser()
.endianess("little")
.uint32("size")
.int32("width")
.int32("height")
.uint16("planes")
.uint16("bitCount")
.uint32("compression")
.uint32("sizeImage")
.int32("xPelsPerMeter")
.int32("yPelsPerMeter")
.uint32("clrUsed")
.uint32("clrImportant");
.endianess('little')
.uint32('size')
.int32('width')
.int32('height')
.uint16('planes')
.uint16('bitCount')
.uint32('compression')
.uint32('sizeImage')
.int32('xPelsPerMeter')
.int32('yPelsPerMeter')
.uint32('clrUsed')
.uint32('clrImportant');

var bmpFile = new Parser()
.nest("fileHeader", {
type: bmpFileHeader
.nest('fileHeader', {
type: bmpFileHeader,
})
.nest("infoHeader", {
type: bmpInfoHeader
.nest('infoHeader', {
type: bmpInfoHeader,
});

require("fs").readFile("test.bmp", function(err, data) {
require('fs').readFile('test.bmp', function(err, data) {
console.log(bmpFile.parse(data));
});
76 changes: 38 additions & 38 deletions example/classfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
var Parser = require("../lib/binary_parser").Parser;
var Parser = require('../lib/binary_parser').Parser;

var ConstantClassInfo = Parser.start().uint16be("name_index");
var ConstantClassInfo = Parser.start().uint16be('name_index');

var ConstantFieldrefInfo = Parser.start()
.uint16be("class_index")
.uint16be("name_and_type_index");
.uint16be('class_index')
.uint16be('name_and_type_index');

var ConstantMethodrefInfo = Parser.start()
.uint16be("class_index")
.uint16be("name_and_type_index");
.uint16be('class_index')
.uint16be('name_and_type_index');

var ConstantInterfaceMethodrefInfo = Parser.start()
.uint16be("class_index")
.uint16be("name_and_type_index");
.uint16be('class_index')
.uint16be('name_and_type_index');

var ConstantStringInfo = Parser.start().uint16be("string_index");
var ConstantStringInfo = Parser.start().uint16be('string_index');

var ConstantIntegerInfo = Parser.start().uint32be("bytes");
var ConstantIntegerInfo = Parser.start().uint32be('bytes');

var ConstantFloatInfo = Parser.start().uint32be("bytes");
var ConstantFloatInfo = Parser.start().uint32be('bytes');

var ConstantLongInfo = Parser.start()
.uint32be("high_bytes")
.uint32be("low_bytes");
.uint32be('high_bytes')
.uint32be('low_bytes');

var ConstantDoubleInfo = Parser.start()
.uint32be("high_bytes")
.uint32be("low_bytes");
.uint32be('high_bytes')
.uint32be('low_bytes');

var ConstantNameAndTypeInfo = Parser.start()
.uint16be("name_index")
.uint16be("descriptor_index");
.uint16be('name_index')
.uint16be('descriptor_index');

var ConstantUtf8Info = Parser.start()
.uint16be("len")
.string("bytes", { length: "len" });
.uint16be('len')
.string('bytes', { length: 'len' });

var ConstantMethodHandleInfo = Parser.start()
.uint8("reference_kind")
.uint16be("reference_index");
.uint8('reference_kind')
.uint16be('reference_index');

var ConstantMethodTypeInfo = Parser.start().uint16be("descriptor_index");
var ConstantMethodTypeInfo = Parser.start().uint16be('descriptor_index');

var ConstantInvokeDynamicInfo = Parser.start()
.uint16be("bootstrap_method_attr_index")
.uint16be("name_and_type_index");
.uint16be('bootstrap_method_attr_index')
.uint16be('name_and_type_index');

var CpInfo = Parser.start()
.uint8("tag")
.choice("info", {
tag: "tag",
.uint8('tag')
.choice('info', {
tag: 'tag',
choices: {
7: ConstantClassInfo,
9: ConstantFieldrefInfo,
Expand All @@ -63,23 +63,23 @@ var CpInfo = Parser.start()
12: ConstantNameAndTypeInfo,
1: ConstantUtf8Info,
16: ConstantMethodTypeInfo,
18: ConstantInvokeDynamicInfo
}
18: ConstantInvokeDynamicInfo,
},
});

var ClassFile = Parser.start()
.endianess("big")
.uint32("magic", { assert: 0xcafebabe })
.uint16("minor_version")
.uint16("major_version")
.uint16("constant_pool_count")
.array("cp_info", {
.endianess('big')
.uint32('magic', { assert: 0xcafebabe })
.uint16('minor_version')
.uint16('major_version')
.uint16('constant_pool_count')
.array('cp_info', {
type: CpInfo,
length: function() {
return this.constant_pool_count - 1;
}
},
});

require("fs").readFile("Hello.class", function(err, data) {
console.log(require("util").inspect(ClassFile.parse(data), { depth: null }));
require('fs').readFile('Hello.class', function(err, data) {
console.log(require('util').inspect(ClassFile.parse(data), { depth: null }));
});
38 changes: 19 additions & 19 deletions example/ip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
var Parser = require("../lib/binary_parser").Parser;
var Parser = require('../lib/binary_parser').Parser;

var ipHeader = new Parser()
.endianess("big")
.bit4("version")
.bit4("headerLength")
.uint8("tos")
.uint16("packetLength")
.uint16("id")
.bit3("offset")
.bit13("fragOffset")
.uint8("ttl")
.uint8("protocol")
.uint16("checksum")
.array("src", {
type: "uint8",
length: 4
.endianess('big')
.bit4('version')
.bit4('headerLength')
.uint8('tos')
.uint16('packetLength')
.uint16('id')
.bit3('offset')
.bit13('fragOffset')
.uint8('ttl')
.uint8('protocol')
.uint16('checksum')
.array('src', {
type: 'uint8',
length: 4,
})
.array("dst", {
type: "uint8",
length: 4
.array('dst', {
type: 'uint8',
length: 4,
});

var buf = Buffer.from("450002c5939900002c06ef98adc24f6c850186d1", "hex");
var buf = Buffer.from('450002c5939900002c06ef98adc24f6c850186d1', 'hex');

console.log(ipHeader.parse(buf));
Loading