fix: expose typeChecker instead of program

typescript-eslint · Mar 22, 2023 · 20ff467 · 20ff467
1 parent 459942b
commit 20ff467
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/packages/website-eslint/package.json b/packages/website-eslint/package.json
@@ -9,7 +9,7 @@
   "type": "commonjs",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./types/index.d.ts",
       "default": "./dist/index.js"
     }
   },

diff --git a/packages/website/src/components/linter/createParser.ts b/packages/website/src/components/linter/createParser.ts
@@ -78,7 +78,7 @@ export function createParser(
         storedAST: converted.estree,
         storedTsAST: tsAst,
         storedScope: scopeManager,
-        program: program,
+        typeChecker: checker,
       });
 
       return {

diff --git a/packages/website/src/components/linter/types.ts b/packages/website/src/components/linter/types.ts
@@ -12,7 +12,7 @@ export interface UpdateModel {
   storedAST?: TSESTree.Program;
   storedTsAST?: ts.Node;
   storedScope?: ScopeManager;
-  program?: ts.Program;
+  typeChecker?: ts.TypeChecker;
 }
 
 export interface Disposable {

diff --git a/packages/website/src/components/playground/PlaygroundRoot.tsx b/packages/website/src/components/playground/PlaygroundRoot.tsx
@@ -169,7 +169,7 @@ function PlaygroundRoot(): JSX.Element {
                 <ErrorsViewer value={errors} />
               ) : config.showAST === 'types' && astModel.storedTsAST ? (
                 <TypesDetails
-                  program={astModel.program}
+                  typeChecker={astModel.typeChecker}
                   value={astModel.storedTsAST}
                   onHoverNode={setSelectedRange}
                   cursorPosition={cursorPosition}

diff --git a/packages/website/src/components/typeDetails/TypeInfo.tsx b/packages/website/src/components/typeDetails/TypeInfo.tsx
@@ -8,7 +8,7 @@ import { isRecord, isTSNode } from '../ast/utils';
 
 export interface TypeInfoProps {
   readonly value: ts.Node;
-  readonly program?: ts.Program;
+  readonly typeChecker?: ts.TypeChecker;
   readonly onHoverNode?: OnHoverNodeFn;
   readonly onSelect: (value: ts.Node) => void;
 }
@@ -63,16 +63,15 @@ function TypeGroup(props: TypeGroupProps): JSX.Element {
 
 export function TypeInfo({
   value,
-  program,
+  typeChecker,
   onHoverNode,
   onSelect,
 }: TypeInfoProps): JSX.Element {
   const computed = useMemo(() => {
-    if (!program || !value) {
+    if (!typeChecker || !value) {
       return undefined;
     }
     const info: InfoModel = {};
-    const typeChecker = program.getTypeChecker();
     try {
       const type = typeChecker.getTypeAtLocation(value);
       info.type = type;
@@ -99,7 +98,7 @@ export function TypeInfo({
       info.contextualType = undefined;
     }
     return info;
-  }, [value, program]);
+  }, [value, typeChecker]);
 
   const onSelectNode = useCallback(
     (selection: unknown) => {
@@ -111,8 +110,8 @@ export function TypeInfo({
     [onSelect, onHoverNode, value],
   );
 
-  if (!program || !computed) {
-    return <div>Program not available</div>;
+  if (!typeChecker || !computed) {
+    return <div>TypeChecker not available</div>;
   }
 
   return (

diff --git a/packages/website/src/components/typeDetails/TypesDetails.tsx b/packages/website/src/components/typeDetails/TypesDetails.tsx
@@ -11,15 +11,15 @@ import { TypeInfo } from './TypeInfo';
 
 export interface TypesDetailsProps {
   readonly value: ts.Node;
-  readonly program?: ts.Program;
+  readonly typeChecker?: ts.TypeChecker;
   readonly cursorPosition?: number;
   readonly onHoverNode?: OnHoverNodeFn;
 }
 
 export function TypesDetails({
   cursorPosition,
   value,
-  program,
+  typeChecker,
   onHoverNode,
 }: TypesDetailsProps): JSX.Element {
   const [selectedNode, setSelectedNode] = useState<ts.Node>(value);
@@ -56,7 +56,7 @@ export function TypesDetails({
             <TypeInfo
               onHoverNode={onHoverNode}
               onSelect={setSelectedNode}
-              program={program}
+              typeChecker={typeChecker}
               value={selectedNode}
             />
           </div>