Skip to content

Commit 8b2b014

Browse files
committed
Update dependencies, fix lint issues and bump version.
1 parent f460126 commit 8b2b014

File tree

9 files changed

+26
-29
lines changed

9 files changed

+26
-29
lines changed

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbind",
3-
"version": "0.3.9",
3+
"version": "0.3.10",
44
"description": "Magical headers that make your C++ library accessible from JavaScript",
55
"main": "dist/nbind.js",
66
"typings": "dist/nbind.d.ts",
@@ -18,7 +18,7 @@
1818
"tslint": "tslint",
1919
"cbuild": "cbuild",
2020
"dump-lib": "dump-em-lib dist/em-api.js",
21-
"lint": "tslint -c src/tslint.json src/*.ts src/em/*.ts",
21+
"lint": "tslint --type-check -c src/tslint.json -p src/tsconfig.json && tslint --type-check -c src/tslint.json -p src/em/tsconfig.json",
2222
"prepublish": "npm run lint && tsc -p src/em && tsc -p src && cbuild -x -v -s dist/bundle/em/em-api.js -o dist/em-api.js",
2323
"clean-asm": "cd test/em && node-gyp clean",
2424
"config-test": "autogypi -c test/autogypi.json",
@@ -52,16 +52,17 @@
5252
"win32"
5353
],
5454
"dependencies": {
55-
"emscripten-library-decorator": "~0.2.0",
55+
"@types/node": "^7.0.13",
56+
"emscripten-library-decorator": "~0.2.2",
5657
"mkdirp": "~0.5.1",
57-
"nan": "^2.5.0"
58+
"nan": "^2.6.2"
5859
},
5960
"devDependencies": {
6061
"autogypi": "~0.2.2",
61-
"cbuild": "~0.1.1",
62-
"node-gyp": "^3.5.0",
63-
"tap": "^9.0.3",
64-
"tslint": "^4.3.1",
65-
"typescript": "^2.1.5"
62+
"cbuild": "~0.1.2",
63+
"node-gyp": "^3.6.0",
64+
"tap": "^10.3.2",
65+
"tslint": "^5.1.0",
66+
"typescript": "^2.2.2"
6667
}
6768
}

src/Type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ export function typeModule(self: any) {
332332
spec.name = (
333333
(flags & TypeFlags.isUnsigned ? 'u' : '') +
334334
(flags & TypeFlags.isFloat ? 'float' : 'int') +
335-
(spec.ptrSize * 8 + '_t')
335+
(spec.ptrSize! * 8 + '_t')
336336
);
337337
}
338338
}

src/em/Caller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export namespace _nbind {
286286

287287
const dynCall = getDynCall(typeList, spec.title);
288288

289-
const mask = ~spec.flags & TypeFlags.isConst;
289+
const mask = ~spec.flags! & TypeFlags.isConst;
290290

291291
function err() {
292292
throw(new Error('Calling a non-const method on a const object'));

src/em/External.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export namespace _nbind {
6767
// Called by C++ side destructor through unregisterExternal
6868
// to free any related JavaScript resources.
6969

70-
free?(): void
70+
free?(): void;
7171

7272
refCount = 1;
7373
data: any;

src/em/GC.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export namespace _nbind {
1717

1818
let dirtyList: Wrapper[] = [];
1919

20-
let gcTimer = 0;
20+
let gcTimer: number | NodeJS.Timer = 0;
2121

2222
function sweep() {
2323
for(let obj of dirtyList) {
@@ -48,4 +48,4 @@ export namespace _nbind {
4848

4949
@prepareNamespace('_nbind')
5050
export class _ {} // tslint:disable-line:class-name
51-
};
51+
}

src/em/Wrapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export namespace _nbind {
3030
export class Wrapper {
3131
persist() { this.__nbindState |= StateFlags.isPersistent; }
3232

33-
free?(): void
33+
free?(): void;
3434

3535
/* tslint:disable:variable-name */
3636

src/em/emscripten.d.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,3 @@ declare var HEAPU16: Uint16Array;
3232
declare var HEAPU32: Uint32Array;
3333
declare var HEAPF32: Float32Array;
3434
declare var HEAPF64: Float64Array;
35-
36-
declare class Buffer {
37-
constructor(src: Uint8Array);
38-
39-
static from(src: Uint8Array): Buffer;
40-
41-
copy(target: Buffer): number;
42-
43-
length: number;
44-
45-
[index: number]: number;
46-
}

src/reflect.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,10 @@ export class Reflect {
188188
hitch(this, this.readMethod)
189189
);
190190

191-
function compareName({ name: a }: {name: string}, { name: b }: {name: string}) {
191+
function compareName(
192+
{ name: a }: { name: string },
193+
{ name: b }: { name: string }
194+
) {
192195
return(~~(a > b) - ~~(a < b));
193196
}
194197

src/tslint.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"rules": {
3+
"adjacent-overload-signatures": true,
34
"align": true,
45
"ban": false,
56
"class-name": true,
@@ -41,11 +42,15 @@
4142
"no-default-export": true,
4243
"no-duplicate-variable": true,
4344
"no-empty": true,
45+
"no-empty-interface": true,
4446
"no-eval": false,
47+
"no-import-side-effect": true,
4548
"no-inferrable-types": true,
4649
"no-internal-module": true,
4750
"no-invalid-this": false,
51+
"no-magic-numbers": false,
4852
"no-namespace": false,
53+
"no-non-null-assertion": false,
4954
"no-null-keyword": false,
5055
"no-reference": true,
5156
"no-require-imports": false,
@@ -54,7 +59,7 @@
5459
"no-switch-case-fall-through": true,
5560
"no-trailing-whitespace": true,
5661
"no-unused-expression": true,
57-
"no-use-before-declare": true,
62+
"no-use-before-declare": false,
5863
"no-var-keyword": true,
5964
"no-var-requires": true,
6065
"object-literal-sort-keys": true,

0 commit comments

Comments
 (0)