File tree 1 file changed +7
-1
lines changed 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -151,6 +151,8 @@ module InputIdlJson =
151
151
let hasType itemName =
152
152
allTypedefsMap.ContainsKey itemName
153
153
154
+ // Converts new JSON types to existing matching XML types
155
+ // to reduce code duplication before removing XML support
154
156
module Compat =
155
157
let xNamespace = XNamespace.Get " http://schemas.microsoft.com/ie/webidl-xml"
156
158
@@ -1489,15 +1491,19 @@ module Emit =
1489
1491
let emitTypeDefFromJson ( typeDef : InputJsonType.Root ) =
1490
1492
Pt.Printl " type %s = %s ;" typeDef.Name.Value typeDef.Type.Value
1491
1493
1494
+ // Load typedefs from XML input
1492
1495
let mutable map = browser.Typedefs |> Array.map( fun i -> ( i.NewType, i)) |> Map.ofArray
1496
+ // Load and merge typedefs from new JSON input
1493
1497
InputIdlJson.inputIdl.Typedefs
1494
1498
|> Array.iter ( InputIdlJson.Compat.convertTypedef >> ( fun i -> map <- map.Add( i.NewType, i)))
1495
-
1499
+
1500
+ // Filter by removedType.json + knownWorkerInterfaces.json
1496
1501
map |> Map.toArray |> Array.map snd
1497
1502
|> Array.filter ( fun typedef -> getRemovedItemByName typedef.NewType ItemKind.TypeDef " " |> Option.isNone)
1498
1503
|> Array.filter ( fun i -> ( flavor <> Flavor.Worker || knownWorkerInterfaces.Contains i.NewType))
1499
1504
|> Array.iter emitTypeDef
1500
1505
1506
+ // Load manual additions from addedType.json
1501
1507
InputJson.getAddedItems ItemKind.TypeDef flavor
1502
1508
|> Array.iter emitTypeDefFromJson
1503
1509
You can’t perform that action at this time.
0 commit comments