Skip to content

Commit 8a60174

Browse files
dcodeIOdcodeIO
committed
CLI: Fixed computed array indexes not being renamed in static code, see #726 
1 parent 8d99815 commit 8a60174

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎cli/targets/static.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function beautifyCode(code) {
170170
estraverse.replace(ast, {
171171
enter: function(node, parent) {
172172
// rename short vars
173-
if (node.type === "Identifier" && parent.property !== node && shortVars[node.name])
173+
if (node.type === "Identifier" && (parent.property !== node || parent.computed) && shortVars[node.name])
174174
return {
175175
"type": "Identifier",
176176
"name": shortVars[node.name]

‎tests/data/package.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -275,39 +275,39 @@ $root.Package = (function() {
275275
message.bin = {};
276276
key = reader.string();
277277
reader.pos++;
278-
message.bin[k] = reader.string();
278+
message.bin[key] = reader.string();
279279
break;
280280
case 12:
281281
reader.skip().pos++;
282282
if (message.scripts === $util.emptyObject)
283283
message.scripts = {};
284284
key = reader.string();
285285
reader.pos++;
286-
message.scripts[k] = reader.string();
286+
message.scripts[key] = reader.string();
287287
break;
288288
case 13:
289289
reader.skip().pos++;
290290
if (message.dependencies === $util.emptyObject)
291291
message.dependencies = {};
292292
key = reader.string();
293293
reader.pos++;
294-
message.dependencies[k] = reader.string();
294+
message.dependencies[key] = reader.string();
295295
break;
296296
case 14:
297297
reader.skip().pos++;
298298
if (message.optionalDependencies === $util.emptyObject)
299299
message.optionalDependencies = {};
300300
key = reader.string();
301301
reader.pos++;
302-
message.optionalDependencies[k] = reader.string();
302+
message.optionalDependencies[key] = reader.string();
303303
break;
304304
case 15:
305305
reader.skip().pos++;
306306
if (message.devDependencies === $util.emptyObject)
307307
message.devDependencies = {};
308308
key = reader.string();
309309
reader.pos++;
310-
message.devDependencies[k] = reader.string();
310+
message.devDependencies[key] = reader.string();
311311
break;
312312
case 17:
313313
message.types = reader.string();

‎tests/data/test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -6385,15 +6385,15 @@ $root.jspb = (function() {
63856385
message.mapStringString = {};
63866386
key = reader.string();
63876387
reader.pos++;
6388-
message.mapStringString[k] = reader.string();
6388+
message.mapStringString[key] = reader.string();
63896389
break;
63906390
case 2:
63916391
reader.skip().pos++;
63926392
if (message.mapStringInt32 === $util.emptyObject)
63936393
message.mapStringInt32 = {};
63946394
key = reader.string();
63956395
reader.pos++;
6396-
message.mapStringInt32[k] = reader.int32();
6396+
message.mapStringInt32[key] = reader.int32();
63976397
break;
63986398
case 3:
63996399
reader.skip().pos++;
@@ -6409,55 +6409,55 @@ $root.jspb = (function() {
64096409
message.mapStringBool = {};
64106410
key = reader.string();
64116411
reader.pos++;
6412-
message.mapStringBool[k] = reader.bool();
6412+
message.mapStringBool[key] = reader.bool();
64136413
break;
64146414
case 5:
64156415
reader.skip().pos++;
64166416
if (message.mapStringDouble === $util.emptyObject)
64176417
message.mapStringDouble = {};
64186418
key = reader.string();
64196419
reader.pos++;
6420-
message.mapStringDouble[k] = reader.double();
6420+
message.mapStringDouble[key] = reader.double();
64216421
break;
64226422
case 6:
64236423
reader.skip().pos++;
64246424
if (message.mapStringEnum === $util.emptyObject)
64256425
message.mapStringEnum = {};
64266426
key = reader.string();
64276427
reader.pos++;
6428-
message.mapStringEnum[k] = reader.uint32();
6428+
message.mapStringEnum[key] = reader.uint32();
64296429
break;
64306430
case 7:
64316431
reader.skip().pos++;
64326432
if (message.mapStringMsg === $util.emptyObject)
64336433
message.mapStringMsg = {};
64346434
key = reader.string();
64356435
reader.pos++;
6436-
message.mapStringMsg[k] = $root.jspb.test.MapValueMessageNoBinary.decode(reader, reader.uint32());
6436+
message.mapStringMsg[key] = $root.jspb.test.MapValueMessageNoBinary.decode(reader, reader.uint32());
64376437
break;
64386438
case 8:
64396439
reader.skip().pos++;
64406440
if (message.mapInt32String === $util.emptyObject)
64416441
message.mapInt32String = {};
64426442
key = reader.int32();
64436443
reader.pos++;
6444-
message.mapInt32String[k] = reader.string();
6444+
message.mapInt32String[key] = reader.string();
64456445
break;
64466446
case 9:
64476447
reader.skip().pos++;
64486448
if (message.mapInt64String === $util.emptyObject)
64496449
message.mapInt64String = {};
64506450
key = reader.int64();
64516451
reader.pos++;
6452-
message.mapInt64String[k] = reader.string();
6452+
message.mapInt64String[key] = reader.string();
64536453
break;
64546454
case 10:
64556455
reader.skip().pos++;
64566456
if (message.mapBoolString === $util.emptyObject)
64576457
message.mapBoolString = {};
64586458
key = reader.bool();
64596459
reader.pos++;
6460-
message.mapBoolString[k] = reader.string();
6460+
message.mapBoolString[key] = reader.string();
64616461
break;
64626462
case 11:
64636463
message.testMapFields = $root.jspb.test.TestMapFieldsNoBinary.decode(reader, reader.uint32());
@@ -6468,7 +6468,7 @@ $root.jspb = (function() {
64686468
message.mapStringTestmapfields = {};
64696469
key = reader.string();
64706470
reader.pos++;
6471-
message.mapStringTestmapfields[k] = $root.jspb.test.TestMapFieldsNoBinary.decode(reader, reader.uint32());
6471+
message.mapStringTestmapfields[key] = $root.jspb.test.TestMapFieldsNoBinary.decode(reader, reader.uint32());
64726472
break;
64736473
default:
64746474
reader.skipType(tag & 7);

0 commit comments

Comments
 (0)