fix(types): use Tuple<> format for tuples, preserve generics in references

Author: sujalgoel

package-lock.json

@@ -10,7 +10,7 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@node-core/doc-kit": "^1.0.1",
+    "@node-core/doc-kit": "^1.2.0",
     "semver": "^7.7.4",
     "typedoc": "^0.28.17",
     "typedoc-plugin-markdown": "^4.10.0",

package.json

@@ -612,7 +612,7 @@ After this method has succeeded the cache can only be restored when build depend
 #### `getChunkEntryModulesWithChunkGroupIterable(chunk)`
 
 * `chunk` {Chunk}
-* Returns: {Iterable<[Module, Entrypoint]>}
+* Returns: {Iterable<Tuple<Module, Entrypoint>>}
 
 #### `getChunkFullHashModulesIterable(chunk)`
 
@@ -4061,7 +4061,7 @@ and properties.
 
 `R`
 * `dependency` {D}
-* `args` {[ARGS, unknown]}
+* `args` {Tuple<ARGS, unknown>}
 * Returns: {R}
 
 #### `finishUpdateParent()`
@@ -5147,7 +5147,7 @@ Apply the plugin
 
 #### `doResolve(hook, request, message, resolveContext, callback)`
 
-* `hook` {AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest>}
+* `hook` {AsyncSeriesBailHook<Tuple<ResolveRequest, ResolveContext>, ResolveRequest>}
 * `request` {ResolveRequest}
 * `message` {string}
 * `resolveContext` {ResolveContext}
@@ -5156,13 +5156,13 @@ Apply the plugin
 
 #### `ensureHook(name)`
 
-* `name` {string|AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest, UnsetAdditionalOptions>}
-* Returns: {AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest>}
+* `name` {string|AsyncSeriesBailHook<Tuple<ResolveRequest, ResolveContext>, ResolveRequest, UnsetAdditionalOptions>}
+* Returns: {AsyncSeriesBailHook<Tuple<ResolveRequest, ResolveContext>, ResolveRequest>}
 
 #### `getHook(name)`
 
-* `name` {string|AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest, UnsetAdditionalOptions>}
-* Returns: {AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest>}
+* `name` {string|AsyncSeriesBailHook<Tuple<ResolveRequest, ResolveContext>, ResolveRequest, UnsetAdditionalOptions>}
+* Returns: {AsyncSeriesBailHook<Tuple<ResolveRequest, ResolveContext>, ResolveRequest>}
 
 #### `isDirectory(path)`
 
@@ -5686,7 +5686,7 @@ Apply the plugin
 #### Static method: `getModulesArrayBounds(modules)`
 
 * `modules` {WithId[]}
-* Returns: {false|[number, number]}
+* Returns: {false|Tuple<number, number>}
 
 #### Static method: `indent(s)`
 
@@ -7225,8 +7225,8 @@ Plugin instance.
 
 > `const` **validateSchema**: {object}
 
-* `schema` {Parameters<validateFunction>[0]}
-* `options` {Parameters<validateFunction>[1]}
+* `schema` {Parameters<validateFunction>}
+* `options` {Parameters<validateFunction>}
 * `validationConfiguration` {ValidationErrorConfiguration}
 * Returns: {void}
 

pages/v5.x/globals.md

@@ -11,7 +11,7 @@
 #### `new ConstDependency(expression, range[, runtimeRequirements])`
 
 * `expression` {string}
-* `range` {number|[number, number]}
+* `range` {number|Tuple<number, number>}
 * `runtimeRequirements` {string[]}
 * Returns: {ConstDependency}
 
@@ -23,7 +23,7 @@
 * `loc` {DependencyLocation}
 * `module` {any}
 * `optional` {boolean}
-* `range` {number|[number, number]}
+* `range` {number|Tuple<number, number>}
 * `runtimeRequirements` {Set<string>}
 * `type` {string}
 * `weak` {boolean}
@@ -161,7 +161,7 @@ Update the hash
 * `module` {any}
 * `optional` {boolean}
 * `phase` {ImportPhaseType}
-* `range` {[number, number]}
+* `range` {Tuple<number, number>}
 * `request` {string}
 * `sourceOrder` {number}
 * `type` {string}
@@ -217,7 +217,7 @@ Returns the exported names
 
 * `update` {boolean}
 * `__namedParameters` {DependencyTemplateContext}
-* Returns: {[string, string]}
+* Returns: {Tuple<string, string>}
 
 #### `getImportVar(moduleGraph)`
 
@@ -326,7 +326,7 @@ Update the hash
 * `loc` {DependencyLocation}
 * `module` {any}
 * `optional` {boolean}
-* `range` {[number, number]}
+* `range` {Tuple<number, number>}
 * `request` {string}
 * `sourceOrder` {number}
 * `type` {string}

pages/v5.x/webpack/namespaces/dependencies.md

@@ -291,7 +291,7 @@ Block pre walking iterates the scope for block variable declarations
 
 #### `getComments(range)`
 
-* `range` {[number, number]}
+* `range` {Tuple<number, number>}
 * Returns: {CommentJavascriptParser[]}
 
 #### `getFreeInfoFromVariable(varName)`
@@ -413,7 +413,7 @@ Module pre walking iterates the scope for import entries
 
 #### `parseCommentOptions(range)`
 
-* `range` {[number, number]}
+* `range` {Tuple<number, number>}
 * Returns: {object}
 
 #### `parseString(expression)`

pages/v5.x/webpack/namespaces/javascript.md

@@ -560,7 +560,7 @@
 
 #### `getArgsAsBuffers()`
 
-* Returns: {[Buffer<ArrayBufferLike>, string, Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>, boolean]}
+* Returns: {Tuple<Buffer<ArrayBufferLike>, string, Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>, boolean>}
 
 #### `map([options])`
 

pages/v5.x/webpack/namespaces/sources.md

@@ -56,7 +56,7 @@
 
 #### `entries()`
 
-* Returns: {SetIterator<[T, T]>}
+* Returns: {SetIterator<Tuple<T, T>>}
 
 #### `forEach(callbackFn, thisArg)`
 

pages/v5.x/webpack/namespaces/util/index.md

@@ -23,17 +23,17 @@ const resolve = type => {
       return resolve(type.elementType) + '[]';
 
     case 'tuple':
-      return `[${(type.elements ?? []).map(resolve).join(', ')}]`;
+      return `Tuple<${(type.elements ?? []).map(resolve).join(', ')}>`;
 
     case 'union':
     case 'intersection':
       return union(type.types);
 
     case 'optional':
-      return resolve(type.elementType) + '?';
+      return resolve(type.elementType);
 
     case 'indexedAccess':
-      return `${resolve(type.objectType)}[${resolve(type.indexType)}]`;
+      return resolve(type.elementType ?? type.objectType);
 
     case 'query':
       return resolve(type.queryType);
@@ -42,7 +42,7 @@ const resolve = type => {
       return resolve(type.target);
 
     case 'conditional':
-      return `${resolve(type.checkType)} extends ${resolve(type.extendsType)} ? ${resolve(type.trueType)} : ${resolve(type.falseType)}`;
+      return `${resolve(type.trueType)}|${resolve(type.falseType)}`;
 
     case 'named-tuple-member':
       return resolve(type.element);

plugins/theme/partials/types.mjs

@@ -1,4 +1,4 @@
-import createNodeSlugger from '@node-core/doc-kit/src/utils/parser/slugger.mjs';
+import createNodeSlugger from '@node-core/doc-kit/src/generators/metadata/utils/slugger.mjs';
 import { ModuleRouter } from 'typedoc-plugin-markdown';
 
 const sluggers = new Map([]);