Skip to content

Commit 0090a28

Browse files
jjrvjjrv
committed
Update dependencies, fix lint issues and bump version.
1 parent e492410 commit 0090a28

23 files changed

+86
-71
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
node_modules/
22
build/
33
dist/
4+
package-lock.json
45
*.log.*
56
*.log
67
*.tgz

‎.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ example/
55
build/
66
test/
77
doc/
8+
package-lock.json
89
*.log.*
910
*.log
1011
*.tgz

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbind",
3-
"version": "0.3.12",
3+
"version": "0.3.13",
44
"description": "Magical headers that make your C++ library accessible from JavaScript",
55
"main": "dist/nbind.js",
66
"typings": "dist/nbind.d.ts",
@@ -57,12 +57,12 @@
5757
"nan": "^2.6.2"
5858
},
5959
"devDependencies": {
60-
"@types/node": "^7.0.22",
60+
"@types/node": "^8.0.12",
6161
"autogypi": "~0.2.2",
6262
"cbuild": "~0.1.2",
63-
"node-gyp": "^3.6.1",
64-
"tap": "^10.3.2",
65-
"tslint": "^5.3.2",
66-
"typescript": "^2.3.3"
63+
"node-gyp": "^3.6.2",
64+
"tap": "^10.7.0",
65+
"tslint": "^5.5.0",
66+
"typescript": "^2.4.1"
6767
}
6868
}

‎src/em/BindClass.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// This file is part of nbind, copyright (C) 2014-2016 BusFaster Ltd.
22
// Released under the MIT license, see LICENSE.
33

4-
import {setEvil, prepareNamespace} from 'emscripten-library-decorator';
5-
import {_nbind as _globals} from './Globals';
6-
import {_nbind as _type} from './BindingType';
7-
import {_nbind as _value} from './ValueObj';
8-
import {_nbind as _caller} from './Caller';
9-
import {_nbind as _wrapper} from './Wrapper';
10-
import {_nbind as _resource} from './Resource';
11-
import {SignatureType} from '../common';
12-
import {TypeFlags, TypeSpecWithName, TypeSpecWithParam, PolicyTbl} from '../Type';
4+
import { setEvil, prepareNamespace } from 'emscripten-library-decorator';
5+
import { _nbind as _globals } from './Globals';
6+
import { _nbind as _type } from './BindingType';
7+
import { _nbind as _value } from './ValueObj';
8+
import { _nbind as _caller } from './Caller';
9+
import { _nbind as _wrapper } from './Wrapper';
10+
import { _nbind as _resource } from './Resource';
11+
import { SignatureType } from '../common';
12+
import { TypeFlags, TypeSpecWithName, TypeSpecWithParam, PolicyTbl } from '../Type';
1313

1414
// Let decorators run eval in current scope to read function source code.
1515
setEvil((code: string) => eval(code));

‎src/em/BindingStd.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
// This file handles type conversion of C++ standard library types
55
// to / from JavaScript.
66

7-
import {setEvil, prepareNamespace} from 'emscripten-library-decorator';
8-
import {_nbind as _globals} from './Globals';
9-
import {_nbind as _type} from './BindingType';
10-
import {_nbind as _resource} from './Resource';
11-
import {TypeSpecWithParam, PolicyTbl} from '../Type';
7+
import { setEvil, prepareNamespace } from 'emscripten-library-decorator';
8+
import { _nbind as _globals } from './Globals';
9+
import { _nbind as _type } from './BindingType';
10+
import { _nbind as _resource } from './Resource';
11+
import { TypeSpecWithParam, PolicyTbl } from '../Type';
1212

1313
// Let decorators run eval in current scope to read function source code.
1414
setEvil((code: string) => eval(code));

‎src/em/BindingType.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// the type passed between the two is called WireType.
77
// Anything from the standard library is instead in BindingStd.ts
88

9-
import {setEvil, prepareNamespace} from 'emscripten-library-decorator';
10-
import {_nbind as _globals} from './Globals';
11-
import {_nbind as _resource} from './Resource';
12-
import {typeModule, TypeFlags, TypeSpecWithSize, PolicyTbl} from '../Type';
9+
import { setEvil, prepareNamespace } from 'emscripten-library-decorator';
10+
import { _nbind as _globals } from './Globals';
11+
import { _nbind as _resource } from './Resource';
12+
import { typeModule, TypeFlags, TypeSpecWithSize, PolicyTbl } from '../Type';
1313

1414
const _typeModule = typeModule;
1515

‎src/em/Buffer.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// This file is part of nbind, copyright (C) 2014-2016 BusFaster Ltd.
22
// Released under the MIT license, see LICENSE.
33

4-
import {setEvil, prepareNamespace} from 'emscripten-library-decorator';
5-
import {_nbind as _globals} from './Globals';
6-
import {_nbind as _type} from './BindingType';
7-
import {_nbind as _external} from './External';
8-
import {_nbind as _resource} from './Resource';
9-
import {PolicyTbl} from '../Type';
4+
import { setEvil, prepareNamespace } from 'emscripten-library-decorator';
5+
import { _nbind as _globals } from './Globals';
6+
import { _nbind as _type } from './BindingType';
7+
import { _nbind as _external } from './External';
8+
import { _nbind as _resource } from './Resource';
9+
import { PolicyTbl } from '../Type';
1010

1111
// Let decorators run eval in current scope to read function source code.
1212
setEvil((code: string) => eval(code));

‎src/em/Callback.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import {
1111
dep
1212
} from 'emscripten-library-decorator';
1313

14-
import {_nbind as _globals} from './Globals';
15-
import {_nbind as _type} from './BindingType';
16-
import {_nbind as _caller} from './Caller';
17-
import {_nbind as _external} from './External';
14+
import { _nbind as _globals } from './Globals';
15+
import { _nbind as _type } from './BindingType';
16+
import { _nbind as _caller } from './Caller';
17+
import { _nbind as _external } from './External';
1818

1919
// Let decorators run eval in current scope to read function source code.
2020
setEvil((code: string) => eval(code));

‎src/em/Caller.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// This file handles creating invoker functions for Emscripten dyncalls
55
// wrapped in type conversions for arguments and return values.
66

7-
import {setEvil, prepareNamespace} from 'emscripten-library-decorator';
8-
import {_nbind as _globals} from './Globals';
9-
import {_nbind as _type} from './BindingType';
10-
import {_nbind as _class} from './BindClass';
11-
import {_nbind as _wrapper} from './Wrapper';
12-
import {_nbind as _external} from './External';
13-
import {_nbind as _resource} from './Resource';
14-
import {TypeFlags, PolicyTbl} from '../Type';
7+
import { setEvil, prepareNamespace } from 'emscripten-library-decorator';
8+
import { _nbind as _globals } from './Globals';
9+
import { _nbind as _type } from './BindingType';
10+
import { _nbind as _class } from './BindClass';
11+
import { _nbind as _wrapper } from './Wrapper';
12+
import { _nbind as _external } from './External';
13+
import { _nbind as _resource } from './Resource';
14+
import { TypeFlags, PolicyTbl } from '../Type';
1515

1616
// Let decorators run eval in current scope to read function source code.
1717
setEvil((code: string) => eval(code));
@@ -342,13 +342,14 @@ export namespace _nbind {
342342
const needsWireRead = returnType.needsWireRead(spec.policyTbl!);
343343
const needsWireWrite = anyNeedsWireWrite(argTypeList, spec.policyTbl!);
344344
const direct = spec.direct!;
345+
let dynCall: (...args: any[]) => any;
345346
let ptr = spec.ptr;
346347

347348
if(spec.direct && !needsWireRead && !needsWireWrite) {
348349
// If there are only a few arguments not requiring type conversion,
349350
// build a simple invoker function without using eval.
350351

351-
const dynCall = getDynCall(typeList, spec.title);
352+
dynCall = getDynCall(typeList, spec.title);
352353

353354
switch(argCount) {
354355
case 0: return(() =>
@@ -386,7 +387,7 @@ export namespace _nbind {
386387
}
387388

388389
// Type ID list was changed.
389-
const dynCall = getDynCall(typeList, spec.title);
390+
dynCall = getDynCall(typeList, spec.title);
390391

391392
return(buildCallerFunction(
392393
dynCall,

‎src/em/External.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
exportLibrary,
1212
dep
1313
} from 'emscripten-library-decorator';
14-
import {_nbind as _type} from './BindingType';
14+
import { _nbind as _type } from './BindingType';
1515

1616
// Let decorators run eval in current scope to read function source code.
1717
setEvil((code: string) => eval(code));

0 commit comments

Comments
 (0)