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 @@ -152,6 +152,8 @@ module InputIdlJson =
152
152
let hasType itemName =
153
153
allTypedefsMap.ContainsKey itemName
154
154
155
+ // Converts new JSON types to existing matching XML types
156
+ // to reduce code duplication before removing XML support
155
157
module Compat =
156
158
let xNamespace = XNamespace.Get " http://schemas.microsoft.com/ie/webidl-xml"
157
159
@@ -1508,15 +1510,19 @@ module Emit =
1508
1510
let emitTypeDefFromJson ( typeDef : InputJsonType.Root ) =
1509
1511
Pt.Printl " type %s = %s ;" typeDef.Name.Value typeDef.Type.Value
1510
1512
1513
+ // Load typedefs from XML input
1511
1514
let mutable map = browser.Typedefs |> Array.map( fun i -> ( i.NewType, i)) |> Map.ofArray
1515
+ // Load and merge typedefs from new JSON input
1512
1516
InputIdlJson.inputIdl.Typedefs
1513
1517
|> Array.iter ( InputIdlJson.Compat.convertTypedef >> ( fun i -> map <- map.Add( i.NewType, i)))
1514
-
1518
+
1519
+ // Filter by removedType.json + knownWorkerInterfaces.json
1515
1520
map |> Map.toArray |> Array.map snd
1516
1521
|> Array.filter ( fun typedef -> getRemovedItemByName typedef.NewType ItemKind.TypeDef " " |> Option.isNone)
1517
1522
|> Array.filter ( fun i -> ( flavor <> Flavor.Worker || knownWorkerInterfaces.Contains i.NewType))
1518
1523
|> Array.iter emitTypeDef
1519
1524
1525
+ // Load manual additions from addedType.json
1520
1526
InputJson.getAddedItems ItemKind.TypeDef flavor
1521
1527
|> Array.iter emitTypeDefFromJson
1522
1528
You can’t perform that action at this time.
0 commit comments