Skip to content

Commit c3ca9a7

Browse files
author
fengwan
committed
fix(Fix options error):
1 parent cb7134c commit c3ca9a7

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/optionsUtils.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import schema from "./options.bytes.json";
1+
import {properties} from "./options.bytes.json";
22
function isEmpty(obj){
33
if(typeof obj == "undefined" || obj == null || obj == ""){
44
return true;
@@ -8,25 +8,25 @@ function isEmpty(obj){
88
}
99
export default function(params,options){
1010
for(var o in options){
11-
let so = schema[o];
11+
let so = properties[o];
1212
let oo = options[o];
1313
if(!so){
1414
continue;
1515
}
16-
if(so.type=="bool"){
17-
if(oo==true){
16+
if(so.type=="boolean"){
17+
if(oo==true||(so.default&&oo==so.default)){
1818
params.push("--"+o);
1919
}
2020
}
2121
if(so.type=="string"){
22-
if(isEmpty(oo)){
22+
if(isEmpty(oo)||(so.default&&oo==so.default)){
2323
continue;
2424
}
2525
params.push("--"+o);
2626
params.push(oo);
2727
}
2828
if(so.type=="number"){
29-
if(oo==0){
29+
if(oo==0||(so.default&&oo==so.default)){
3030
continue;
3131
}
3232
params.push("--"+o);

test/__snapshots__/loader.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ exports[`Loader Defaults 1`] = `
66
var p = new Promise(function(resolve){
77
var compatibleModule;
88
if (typeof WebAssembly !== 'undefined') {
9-
var buffer = new ArrayBuffer(444);
9+
var buffer = new ArrayBuffer(414);
1010
var uint8 = new Uint8Array(buffer);
11-
uint8.set([0,97,115,109,1,0,0,0,1,9,2,96,2,127,127,0,96,0,0,3,4,3,0,1,1,4,4,1,112,0,1,5,3,1,0,0,6,21,4,127,1,65,0,11,127,1,65,0,11,127,1,65,0,11,127,0,65,8,11,7,32,4,6,109,101,109,111,114,121,2,0,5,116,97,98,108,101,1,0,4,105,110,105,116,0,0,4,115,116,101,112,0,1,9,7,1,0,65,0,11,1,2,10,211,2,3,17,0,32,0,36,0,32,1,36,1,35,0,35,1,108,36,2,11,187,2,1,10,127,35,1,65,1,107,33,0,35,0,65,1,107,33,1,2,64,65,0,33,2,3,64,32,2,35,1,73,69,13,1,2,64,32,0,32,2,65,1,107,32,2,65,0,70,27,33,3,65,0,32,2,65,1,106,32,2,32,0,70,27,33,4,2,64,65,0,33,5,3,64,32,5,35,0,73,69,13,1,2,64,32,1,32,5,65,1,107,32,5,65,0,70,27,33,6,65,0,32,5,65,1,106,32,5,32,1,70,27,33,7,32,3,35,0,108,32,6,106,45,0,0,32,3,35,0,108,32,5,106,45,0,0,106,32,3,35,0,108,32,7,106,45,0,0,106,32,2,35,0,108,32,6,106,45,0,0,106,32,2,35,0,108,32,7,106,45,0,0,106,32,4,35,0,108,32,6,106,45,0,0,106,32,4,35,0,108,32,5,106,45,0,0,106,32,4,35,0,108,32,7,106,45,0,0,106,33,8,32,2,35,0,108,32,5,106,45,0,0,4,64,32,8,65,2,72,34,9,4,127,32,9,5,32,8,65,3,74,11,4,64,35,2,32,2,35,0,108,106,32,5,106,65,0,58,0,0,11,5,32,8,65,3,70,4,64,35,2,32,2,35,0,108,106,32,5,106,65,1,58,0,0,11,11,11,32,5,65,1,106,33,5,12,0,0,11,0,11,11,32,2,65,1,106,33,2,12,0,0,11,0,11,11,2,0,11]);
11+
uint8.set([0,97,115,109,1,0,0,0,1,9,2,96,2,127,127,0,96,0,0,3,4,3,0,1,1,4,4,1,112,0,1,5,3,1,0,0,6,16,3,127,1,65,0,11,127,1,65,0,11,127,1,65,0,11,7,32,4,6,109,101,109,111,114,121,2,0,5,116,97,98,108,101,1,0,4,105,110,105,116,0,0,4,115,116,101,112,0,1,9,7,1,0,65,0,11,1,2,10,186,2,3,17,0,32,0,36,0,32,1,36,1,35,0,35,1,108,36,2,11,161,2,1,8,127,35,1,65,1,107,33,6,35,0,65,1,107,33,7,3,64,2,64,32,0,35,1,79,13,0,32,0,65,1,107,32,6,32,0,27,33,4,65,0,32,0,65,1,106,32,0,32,6,70,27,33,5,65,0,33,1,3,64,2,64,32,1,35,0,79,13,0,65,0,32,1,65,1,106,32,1,32,7,70,27,34,2,32,5,35,0,108,106,45,0,0,32,5,35,0,108,32,1,106,45,0,0,32,1,65,1,107,32,7,32,1,27,34,3,32,5,35,0,108,106,45,0,0,32,0,35,0,108,32,2,106,45,0,0,32,0,35,0,108,32,3,106,45,0,0,32,4,35,0,108,32,2,106,45,0,0,32,4,35,0,108,32,3,106,45,0,0,32,4,35,0,108,32,1,106,45,0,0,106,106,106,106,106,106,106,33,2,32,0,35,0,108,32,1,106,45,0,0,4,64,32,2,65,2,72,34,3,4,127,32,3,5,32,2,65,3,74,11,4,64,35,2,32,0,35,0,108,106,32,1,106,65,0,58,0,0,11,5,32,2,65,3,70,4,64,35,2,32,0,35,0,108,106,32,1,106,65,1,58,0,0,11,11,32,1,65,1,106,33,1,12,1,11,11,32,0,65,1,106,33,0,12,1,11,11,11,3,0,1,11]);
1212
var WebAssemblyModule = function(deps) {
1313
var defaultDeps = {
1414
'global': { },

test/fixtures/temp/assembly/step.wasm

-30 Bytes
Binary file not shown.

test/loader.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ describe('Loader', () => {
77
loader: {
88
test: /(ts)/,
99
options: {
10-
name: '[path][name].wasm'
10+
name: '[path][name].wasm',
11+
optimize:"-1",
12+
validate:true
1113
}
1214
},
1315
};

0 commit comments

Comments
 (0)