Tools: fix tagged variant module and export more functions

tools/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+> **Tags:**
+>
+> - :boom: [Breaking Change]
+> - :eyeglasses: [Spec Compliance]
+> - :rocket: [New Feature]
+> - :bug: [Bug Fix]
+> - :memo: [Documentation]
+> - :house: [Internal]
+> - :nail_care: [Polish]
+
+## master
+
+#### :rocket: New Feature
+
+- Expose more `decode` functions. https://github.com/rescript-lang/rescript-vscode/pull/866
+
+#### :bug: Bug Fix
+
+- Fix tagged variant for `Module` and add attr to interface files. https://github.com/rescript-lang/rescript-vscode/pull/866

tools/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rescript/tools",
 	"description": "ReScript Tools",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"author": "ReScript Team",
 	"license": "MIT",
 	"bin": {
@@ -36,6 +36,6 @@
 		"build": "rescript build"
 	},
 	"dependencies": {
-		"rescript": "^11.0.0-rc.4"
+		"rescript": "^11.0.0-rc.7"
 	}
 }

tools/rescript.json

@@ -1,6 +1,6 @@
 {
   "name": "@rescript/tools",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "sources": [
     {
       "dir": "src"

tools/src/Tools_Docgen.res

@@ -38,21 +38,21 @@ type rec item =
       /** Additional documentation for constructors and record fields, if available. */
       detail?: detail,
     })
-  | @as("module") Module(docsForModule)
+  | @as("module")
+  Module({
+      id: string,
+      docstrings: array<string>,
+      deprecated?: string,
+      name: string,
+      items: array<item>,
+    })
   | @as("moduleAlias")
   ModuleAlias({
       id: string,
       docstrings: array<string>,
       name: string,
       items: array<item>,
     })
-and docsForModule = {
-  id: string,
-  docstrings: array<string>,
-  deprecated?: string,
-  name: string,
-  items: array<item>,
-}
 
 let decodeDocstrings = item => {
   open Js.Json

tools/src/Tools_Docgen.resi

@@ -11,31 +11,52 @@ type constructor = {
   signature: string,
   deprecated?: string,
 }
-type detail = Record({items: array<field>}) | Variant({items: array<constructor>})
+@tag("kind")
+type detail =
+  | @as("record") Record({items: array<field>})
+  | @as("variant") Variant({items: array<constructor>})
+
+@tag("kind")
 type rec item =
-  | Value({
+  | @as("value")
+  Value({
       id: string,
       docstrings: array<string>,
       signature: string,
       name: string,
       deprecated?: string,
     })
-  | Type({
+  | @as("type")
+  Type({
       id: string,
       docstrings: array<string>,
       signature: string,
       name: string,
       deprecated?: string,
+      /** Additional documentation for constructors and record fields, if available. */
       detail?: detail,
     })
-  | Module(docsForModule)
-  | ModuleAlias({id: string, docstrings: array<string>, name: string, items: array<item>})
-and docsForModule = {
-  id: string,
-  docstrings: array<string>,
-  deprecated?: string,
-  name: string,
-  items: array<item>,
-}
+  | @as("module")
+  Module({
+      id: string,
+      docstrings: array<string>,
+      deprecated?: string,
+      name: string,
+      items: array<item>,
+    })
+  | @as("moduleAlias")
+  ModuleAlias({
+      id: string,
+      docstrings: array<string>,
+      name: string,
+      items: array<item>,
+    })
+
 type doc = {name: string, deprecated: option<string>, docstrings: array<string>, items: array<item>}
+
+let decodeValue: Js.Dict.t<Js.Json.t> => item
+let decodeType: Js.Dict.t<Js.Json.t> => item
+let decodeModule: Js.Dict.t<Js.Json.t> => item
+let decodeModuleAlias: Js.Dict.t<Js.Json.t> => item
+let decodeItem: Js.Json.t => item
 let decodeFromJson: Js.Json.t => doc