Skip to content

Commit e252510

Browse files
krodakkrodak
committed
BridgeJS: Improve namespace JS code generation logic after introduction of static properties and static functions
1 parent 722fa70 commit e252510

File tree

8 files changed

+206
-248
lines changed

8 files changed

+206
-248
lines changed

‎Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"abiName" : "bjs_EnumRoundtrip_init",
66
"effects" : {
77
"isAsync" : false,
8+
"isStatic" : false,
89
"isThrows" : false
910
},
1011
"parameters" : [
@@ -16,6 +17,7 @@
1617
"abiName" : "bjs_EnumRoundtrip_take",
1718
"effects" : {
1819
"isAsync" : false,
20+
"isStatic" : false,
1921
"isThrows" : false
2022
},
2123
"name" : "take",
@@ -40,6 +42,7 @@
4042
"abiName" : "bjs_EnumRoundtrip_makeSuccess",
4143
"effects" : {
4244
"isAsync" : false,
45+
"isStatic" : false,
4346
"isThrows" : false
4447
},
4548
"name" : "makeSuccess",
@@ -56,6 +59,7 @@
5659
"abiName" : "bjs_EnumRoundtrip_makeFailure",
5760
"effects" : {
5861
"isAsync" : false,
62+
"isStatic" : false,
5963
"isThrows" : false
6064
},
6165
"name" : "makeFailure",
@@ -72,6 +76,7 @@
7276
"abiName" : "bjs_EnumRoundtrip_makeFlag",
7377
"effects" : {
7478
"isAsync" : false,
79+
"isStatic" : false,
7580
"isThrows" : false
7681
},
7782
"name" : "makeFlag",
@@ -88,6 +93,7 @@
8893
"abiName" : "bjs_EnumRoundtrip_makeRate",
8994
"effects" : {
9095
"isAsync" : false,
96+
"isStatic" : false,
9197
"isThrows" : false
9298
},
9399
"name" : "makeRate",
@@ -104,6 +110,7 @@
104110
"abiName" : "bjs_EnumRoundtrip_makePrecise",
105111
"effects" : {
106112
"isAsync" : false,
113+
"isStatic" : false,
107114
"isThrows" : false
108115
},
109116
"name" : "makePrecise",
@@ -120,6 +127,7 @@
120127
"abiName" : "bjs_EnumRoundtrip_makeInfo",
121128
"effects" : {
122129
"isAsync" : false,
130+
"isStatic" : false,
123131
"isThrows" : false
124132
},
125133
"name" : "makeInfo",
@@ -136,6 +144,7 @@
136144
"abiName" : "bjs_EnumRoundtrip_roundtrip",
137145
"effects" : {
138146
"isAsync" : false,
147+
"isStatic" : false,
139148
"isThrows" : false
140149
},
141150
"name" : "roundtrip",
@@ -168,6 +177,7 @@
168177
"abiName" : "bjs_ComplexResultRoundtrip_init",
169178
"effects" : {
170179
"isAsync" : false,
180+
"isStatic" : false,
171181
"isThrows" : false
172182
},
173183
"parameters" : [
@@ -179,6 +189,7 @@
179189
"abiName" : "bjs_ComplexResultRoundtrip_take",
180190
"effects" : {
181191
"isAsync" : false,
192+
"isStatic" : false,
182193
"isThrows" : false
183194
},
184195
"name" : "take",
@@ -203,6 +214,7 @@
203214
"abiName" : "bjs_ComplexResultRoundtrip_makeSuccess",
204215
"effects" : {
205216
"isAsync" : false,
217+
"isStatic" : false,
206218
"isThrows" : false
207219
},
208220
"name" : "makeSuccess",
@@ -219,6 +231,7 @@
219231
"abiName" : "bjs_ComplexResultRoundtrip_makeError",
220232
"effects" : {
221233
"isAsync" : false,
234+
"isStatic" : false,
222235
"isThrows" : false
223236
},
224237
"name" : "makeError",
@@ -235,6 +248,7 @@
235248
"abiName" : "bjs_ComplexResultRoundtrip_makeLocation",
236249
"effects" : {
237250
"isAsync" : false,
251+
"isStatic" : false,
238252
"isThrows" : false
239253
},
240254
"name" : "makeLocation",
@@ -251,6 +265,7 @@
251265
"abiName" : "bjs_ComplexResultRoundtrip_makeStatus",
252266
"effects" : {
253267
"isAsync" : false,
268+
"isStatic" : false,
254269
"isThrows" : false
255270
},
256271
"name" : "makeStatus",
@@ -267,6 +282,7 @@
267282
"abiName" : "bjs_ComplexResultRoundtrip_makeCoordinates",
268283
"effects" : {
269284
"isAsync" : false,
285+
"isStatic" : false,
270286
"isThrows" : false
271287
},
272288
"name" : "makeCoordinates",
@@ -283,6 +299,7 @@
283299
"abiName" : "bjs_ComplexResultRoundtrip_makeComprehensive",
284300
"effects" : {
285301
"isAsync" : false,
302+
"isStatic" : false,
286303
"isThrows" : false
287304
},
288305
"name" : "makeComprehensive",
@@ -299,6 +316,7 @@
299316
"abiName" : "bjs_ComplexResultRoundtrip_makeInfo",
300317
"effects" : {
301318
"isAsync" : false,
319+
"isStatic" : false,
302320
"isThrows" : false
303321
},
304322
"name" : "makeInfo",
@@ -315,6 +333,7 @@
315333
"abiName" : "bjs_ComplexResultRoundtrip_roundtrip",
316334
"effects" : {
317335
"isAsync" : false,
336+
"isStatic" : false,
318337
"isThrows" : false
319338
},
320339
"name" : "roundtrip",
@@ -347,6 +366,7 @@
347366
"abiName" : "bjs_StringRoundtrip_init",
348367
"effects" : {
349368
"isAsync" : false,
369+
"isStatic" : false,
350370
"isThrows" : false
351371
},
352372
"parameters" : [
@@ -358,6 +378,7 @@
358378
"abiName" : "bjs_StringRoundtrip_take",
359379
"effects" : {
360380
"isAsync" : false,
381+
"isStatic" : false,
361382
"isThrows" : false
362383
},
363384
"name" : "take",
@@ -382,6 +403,7 @@
382403
"abiName" : "bjs_StringRoundtrip_make",
383404
"effects" : {
384405
"isAsync" : false,
406+
"isStatic" : false,
385407
"isThrows" : false
386408
},
387409
"name" : "make",
@@ -474,6 +496,12 @@
474496
],
475497
"emitStyle" : "const",
476498
"name" : "APIResult",
499+
"staticMethods" : [
500+
501+
],
502+
"staticProperties" : [
503+
504+
],
477505
"swiftCallName" : "APIResult"
478506
},
479507
{
@@ -664,6 +692,12 @@
664692
],
665693
"emitStyle" : "const",
666694
"name" : "ComplexResult",
695+
"staticMethods" : [
696+
697+
],
698+
"staticProperties" : [
699+
700+
],
667701
"swiftCallName" : "ComplexResult"
668702
}
669703
],
@@ -672,6 +706,7 @@
672706
"abiName" : "bjs_run",
673707
"effects" : {
674708
"isAsync" : false,
709+
"isStatic" : false,
675710
"isThrows" : false
676711
},
677712
"name" : "run",

‎Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"abiName" : "bjs_PlayBridgeJS_init",
66
"effects" : {
77
"isAsync" : false,
8+
"isStatic" : false,
89
"isThrows" : false
910
},
1011
"parameters" : [
@@ -16,6 +17,7 @@
1617
"abiName" : "bjs_PlayBridgeJS_update",
1718
"effects" : {
1819
"isAsync" : false,
20+
"isStatic" : false,
1921
"isThrows" : true
2022
},
2123
"name" : "update",
@@ -58,6 +60,7 @@
5860
"abiName" : "bjs_PlayBridgeJSOutput_outputJs",
5961
"effects" : {
6062
"isAsync" : false,
63+
"isStatic" : false,
6164
"isThrows" : false
6265
},
6366
"name" : "outputJs",
@@ -74,6 +77,7 @@
7477
"abiName" : "bjs_PlayBridgeJSOutput_outputDts",
7578
"effects" : {
7679
"isAsync" : false,
80+
"isStatic" : false,
7781
"isThrows" : false
7882
},
7983
"name" : "outputDts",
@@ -90,6 +94,7 @@
9094
"abiName" : "bjs_PlayBridgeJSOutput_importSwiftGlue",
9195
"effects" : {
9296
"isAsync" : false,
97+
"isStatic" : false,
9398
"isThrows" : false
9499
},
95100
"name" : "importSwiftGlue",
@@ -106,6 +111,7 @@
106111
"abiName" : "bjs_PlayBridgeJSOutput_exportSwiftGlue",
107112
"effects" : {
108113
"isAsync" : false,
114+
"isStatic" : false,
109115
"isThrows" : false
110116
},
111117
"name" : "exportSwiftGlue",

0 commit comments

Comments
 (0)