feat: add + prefix to kind specifiers in declaration ids

src/extract-class.ts

@@ -66,7 +66,7 @@ export const extractClass = async (
 	exportName: string,
 	declaration: ClassDeclaration,
 ): Promise<ExtractedClass> => {
-	const classId = id(containerName, "class", exportName);
+	const classId = id(containerName, "+class", exportName);
 	return {
 		kind: "class",
 		id: classId,
@@ -162,7 +162,7 @@ const extractClassProperties = async (
 		const name = declaration.getName();
 		properties.push({
 			kind: "class-property" as const,
-			id: id(classId, "property", name),
+			id: id(classId, "+property", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),
@@ -213,7 +213,7 @@ const extractClassMethods = async (
 		seenMethods.add(name);
 		methods.push({
 			kind: "class-method" as const,
-			id: id(classId, "method", name),
+			id: id(classId, "+method", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),

src/extract-declarations.ts

@@ -182,7 +182,7 @@ const extractDeclaration = async ({
 		}
 		seenNamespaces.add(exportName);
 		const innerDeclarations = await extractDeclarations({
-			containerName: id(containerName, "namespace", exportName),
+			containerName: id(containerName, "+namespace", exportName),
 			container: declaration,
 			maxDepth: maxDepth - 1,
 		});
@@ -193,7 +193,7 @@ const extractDeclaration = async ({
 		// `import * as ns from module; export { ns };` or
 		// `export * as ns from module`.
 		const innerDeclarations = await extractDeclarations({
-			containerName: id(containerName, "namespace", exportName),
+			containerName: id(containerName, "+namespace", exportName),
 			container: declaration,
 			maxDepth: maxDepth - 1,
 		});

src/extract-enum.ts

@@ -32,7 +32,7 @@ export const extractEnum = async (
 	exportName: string,
 	declaration: EnumDeclaration,
 ): Promise<ExtractedEnum> => {
-	const enumId = id(containerName, "enum", exportName);
+	const enumId = id(containerName, "+enum", exportName);
 	return {
 		kind: "enum",
 		id: enumId,
@@ -62,7 +62,7 @@ const extractEnumMembers = async (
 		const name = declaration.getName();
 		members.push({
 			kind: "enum-member" as const,
-			id: id(enumId, "member", name),
+			id: id(enumId, "+member", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),

src/extract-expression.ts

@@ -12,7 +12,7 @@ export const extractExpression = async (
 	declaration: Expression,
 ): Promise<ExtractedVariable> => ({
 	kind: "variable",
-	id: id(containerName, "variable", exportName),
+	id: id(containerName, "+variable", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

src/extract-file-module.ts

@@ -12,7 +12,7 @@ export const extractFileModule = async (
 	declarations: ExtractedDeclaration[],
 ): Promise<ExtractedNamespace> => ({
 	kind: "namespace",
-	id: id(containerName, "namespace", exportName),
+	id: id(containerName, "+namespace", exportName),
 	name: exportName,
 	docs: fileModuleDocs(declaration),
 	file: sourceFilePath(declaration),

src/extract-function-expression.ts

@@ -12,7 +12,7 @@ export const extractFunctionExpression = async (
 	declaration: VariableDeclaration,
 ): Promise<ExtractedFunction> => ({
 	kind: "function",
-	id: id(containerName, "function", exportName),
+	id: id(containerName, "+function", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

src/extract-function.ts

@@ -21,7 +21,7 @@ export const extractFunction = async (
 	declaration: FunctionDeclaration | ArrowFunction,
 ): Promise<ExtractedFunction> => ({
 	kind: "function",
-	id: id(containerName, "function", exportName),
+	id: id(containerName, "+function", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

src/extract-interface.ts

@@ -109,7 +109,7 @@ export const extractInterface = async (
 	exportName: string,
 	declaration: InterfaceDeclaration,
 ): Promise<ExtractedInterface> => {
-	const interfaceId = id(containerName, "interface", exportName);
+	const interfaceId = id(containerName, "+interface", exportName);
 	return {
 		kind: "interface",
 		id: interfaceId,
@@ -145,7 +145,7 @@ const extractInterfaceProperties = async (
 		const name = declaration.getName();
 		properties.push({
 			kind: "interface-property" as const,
-			id: id(interfaceId, "property", name),
+			id: id(interfaceId, "+property", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),
@@ -179,7 +179,7 @@ const extractInterfaceMethods = async (
 		seenMethods.add(name);
 		methods.push({
 			kind: "interface-method" as const,
-			id: id(interfaceId, "method", name),
+			id: id(interfaceId, "+method", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),
@@ -297,7 +297,7 @@ const extractInterfaceGetAccessors = async (
 		const name = declaration.getName();
 		getAccessors.push({
 			kind: "interface-get-accessor" as const,
-			id: id(interfaceId, "get-accessor", name),
+			id: id(interfaceId, "+get-accessor", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),
@@ -327,7 +327,7 @@ const extractInterfaceSetAccessors = async (
 		const name = declaration.getName();
 		setAccessors.push({
 			kind: "interface-set-accessor" as const,
-			id: id(interfaceId, "set-accessor", name),
+			id: id(interfaceId, "+set-accessor", name),
 			name,
 			docs: docs(declaration),
 			file: sourceFilePath(declaration),

src/extract-namespace.ts

@@ -23,7 +23,7 @@ export const extractNamespace = async (
 	declarations: ExtractedDeclaration[],
 ): Promise<ExtractedNamespace> => ({
 	kind: "namespace",
-	id: id(containerName, "namespace", exportName),
+	id: id(containerName, "+namespace", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

src/extract-type-alias.ts

@@ -20,7 +20,7 @@ export const extractTypeAlias = async (
 	declaration: TypeAliasDeclaration,
 ): Promise<ExtractedTypeAlias> => ({
 	kind: "type",
-	id: id(containerName, "type", exportName),
+	id: id(containerName, "+type", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

src/extract-variable-assignment-expression.ts

@@ -17,7 +17,7 @@ export const extractVariableAssignmentExpression = async (
 		.getDeclarations()[0] as VariableDeclaration;
 	return {
 		kind: "variable",
-		id: id(containerName, "variable", exportName),
+		id: id(containerName, "+variable", exportName),
 		name: exportName,
 		docs: docs(variableDeclaration),
 		file: sourceFilePath(variableDeclaration),

src/extract-variable.ts

@@ -21,7 +21,7 @@ export const extractVariable = async (
 	declaration: VariableDeclaration,
 ): Promise<ExtractedVariable> => ({
 	kind: "variable",
-	id: id(containerName, "variable", exportName),
+	id: id(containerName, "+variable", exportName),
 	name: exportName,
 	docs: docs(declaration),
 	file: sourceFilePath(declaration),

test/declarations/__snapshots__/ambient-modules.test.ts.snap

@@ -9,7 +9,7 @@ exports[`ambient modules 1`] = `
           "/** Variable var1 */",
         ],
         "file": "/index.d.ts",
-        "id": "namespace."bar".variable.var1",
+        "id": "+namespace."bar".+variable.var1",
         "kind": "variable",
         "line": 7,
         "name": "var1",
@@ -20,7 +20,7 @@ exports[`ambient modules 1`] = `
           "/** Variable var2 */",
         ],
         "file": "/index.d.ts",
-        "id": "namespace."bar".variable.var2",
+        "id": "+namespace."bar".+variable.var2",
         "kind": "variable",
         "line": 10,
         "name": "var2",
@@ -31,7 +31,7 @@ exports[`ambient modules 1`] = `
       "/** Module 'bar' */",
     ],
     "file": "/index.d.ts",
-    "id": "namespace."bar"",
+    "id": "+namespace."bar"",
     "kind": "namespace",
     "line": 5,
     "name": ""bar"",
@@ -42,7 +42,7 @@ exports[`ambient modules 1`] = `
       {
         "docs": [],
         "file": "/index.d.ts",
-        "id": "namespace."foo bar".function.default",
+        "id": "+namespace."foo bar".+function.default",
         "kind": "function",
         "line": 15,
         "name": "default",
@@ -53,7 +53,7 @@ exports[`ambient modules 1`] = `
       "/** Module 'foo bar' */",
     ],
     "file": "/index.d.ts",
-    "id": "namespace."foo bar"",
+    "id": "+namespace."foo bar"",
     "kind": "namespace",
     "line": 14,
     "name": ""foo bar"",
@@ -65,7 +65,7 @@ exports[`ambient modules 1`] = `
       "/** Module 'foo' */",
     ],
     "file": "/index.d.ts",
-    "id": "namespace."foo"",
+    "id": "+namespace."foo"",
     "kind": "namespace",
     "line": 2,
     "name": ""foo"",

test/declarations/__snapshots__/ambient-namespaces.test.ts.snap

@@ -7,7 +7,7 @@ exports[`ambient namespaces 1`] = `
       "/** Global function foobar */",
     ],
     "file": "/index.d.ts",
-    "id": "function.foobar",
+    "id": "+function.foobar",
     "kind": "function",
     "line": 20,
     "name": "foobar",
@@ -23,7 +23,7 @@ exports[`ambient namespaces 1`] = `
         ],
         "file": "/index.d.ts",
         "getAccessors": [],
-        "id": "namespace.Foo.interface.Bar",
+        "id": "+namespace.Foo.+interface.Bar",
         "indexSignatures": [],
         "kind": "interface",
         "line": 4,
@@ -35,7 +35,7 @@ exports[`ambient namespaces 1`] = `
               "/** Property qux */",
             ],
             "file": "/index.d.ts",
-            "id": "namespace.Foo.interface.Bar.property.qux",
+            "id": "+namespace.Foo.+interface.Bar.+property.qux",
             "kind": "interface-property",
             "line": 6,
             "name": "qux",
@@ -50,7 +50,7 @@ exports[`ambient namespaces 1`] = `
           "/** Variable baz */",
         ],
         "file": "/index.d.ts",
-        "id": "namespace.Foo.variable.baz",
+        "id": "+namespace.Foo.+variable.baz",
         "kind": "variable",
         "line": 10,
         "name": "baz",
@@ -61,7 +61,7 @@ exports[`ambient namespaces 1`] = `
       "/** Ambient namespace Foo */",
     ],
     "file": "/index.d.ts",
-    "id": "namespace.Foo",
+    "id": "+namespace.Foo",
     "kind": "namespace",
     "line": 2,
     "name": "Foo",
@@ -72,7 +72,7 @@ exports[`ambient namespaces 1`] = `
       "/** Global read-only variable bar */",
     ],
     "file": "/index.d.ts",
-    "id": "variable.bar",
+    "id": "+variable.bar",
     "kind": "variable",
     "line": 17,
     "name": "bar",
@@ -83,7 +83,7 @@ exports[`ambient namespaces 1`] = `
       "/** Global variable foo */",
     ],
     "file": "/index.d.ts",
-    "id": "variable.foo",
+    "id": "+variable.foo",
     "kind": "variable",
     "line": 14,
     "name": "foo",

test/declarations/__snapshots__/class-with-ambient-constructor.test.ts.snap

@@ -7,7 +7,7 @@ exports[`class with ambient constructor 1`] = `
       {
         "docs": [],
         "file": "/index.d.ts",
-        "id": "class.Class1.constructor",
+        "id": "+class.Class1.constructor",
         "kind": "class-constructor",
         "line": 2,
         "name": "constructor",
@@ -16,7 +16,7 @@ exports[`class with ambient constructor 1`] = `
     ],
     "docs": [],
     "file": "/index.d.ts",
-    "id": "class.Class1",
+    "id": "+class.Class1",
     "kind": "class",
     "line": 1,
     "methods": [],

test/declarations/__snapshots__/class-with-overloaded-methods.test.ts.snap

@@ -6,7 +6,7 @@ exports[`class with overloaded methods 1`] = `
     "constructors": [],
     "docs": [],
     "file": "/index.d.ts",
-    "id": "class.Class1",
+    "id": "+class.Class1",
     "kind": "class",
     "line": 1,
     "methods": [
@@ -16,7 +16,7 @@ exports[`class with overloaded methods 1`] = `
           "/** (B) foo */",
         ],
         "file": "/index.d.ts",
-        "id": "class.Class1.method.foo",
+        "id": "+class.Class1.+method.foo",
         "kind": "class-method",
         "line": 3,
         "name": "foo",

test/declarations/__snapshots__/export-all-as-namespace.test.ts.snap

@@ -9,7 +9,7 @@ exports[`export all as namespace 1`] = `
           "/** Variable foo1 */",
         ],
         "file": "/foo.d.ts",
-        "id": "namespace.foo.variable.foo1",
+        "id": "+namespace.foo.+variable.foo1",
         "kind": "variable",
         "line": 6,
         "name": "foo1",
@@ -22,7 +22,7 @@ exports[`export all as namespace 1`] = `
  */",
     ],
     "file": "/foo.d.ts",
-    "id": "namespace.foo",
+    "id": "+namespace.foo",
     "kind": "namespace",
     "line": 6,
     "name": "foo",

test/declarations/__snapshots__/export-as-namespace.test.ts.snap

@@ -7,7 +7,7 @@ exports[`export as namespace 1`] = `
       "/** func1 */",
     ],
     "file": "/index.d.ts",
-    "id": "function.func1",
+    "id": "+function.func1",
     "kind": "function",
     "line": 2,
     "name": "func1",

test/declarations/__snapshots__/export-default-arrow-function.test.ts.snap

@@ -7,7 +7,7 @@ exports[`export default arrow function 1`] = `
       "/** func1 */",
     ],
     "file": "/index.ts",
-    "id": "function.default",
+    "id": "+function.default",
     "kind": "function",
     "line": 2,
     "name": "default",

test/declarations/__snapshots__/export-default-class.test.ts.snap

@@ -8,7 +8,7 @@ exports[`export default class 1`] = `
       "/** Class1 */",
     ],
     "file": "/index.ts",
-    "id": "class.default",
+    "id": "+class.default",
     "kind": "class",
     "line": 2,
     "methods": [],

test/declarations/__snapshots__/export-default-const.test.ts.snap

@@ -7,7 +7,7 @@ exports[`export default const 1`] = `
       "/** var1 */",
     ],
     "file": "/index.ts",
-    "id": "variable.default",
+    "id": "+variable.default",
     "kind": "variable",
     "line": 2,
     "name": "default",

test/declarations/__snapshots__/export-default-expression.test.ts.snap

@@ -7,7 +7,7 @@ exports[`export default expression 1`] = `
       "/** expr1 */",
     ],
     "file": "/index.ts",
-    "id": "variable.default",
+    "id": "+variable.default",
     "kind": "variable",
     "line": 2,
     "name": "default",