@jpoly1219/context-extractor 0.2.8 → 0.2.9

package/dist/src/types.d.ts

@@ -1,4 +1,10 @@
 import { LspClient, Range } from "../ts-lsp-client-dist/src/main";
+import * as fs from "fs";
+import { SyntaxNode, Tree } from "web-tree-sitter";
+interface Position {
+    line: number;
+    character: number;
+}
 interface relevantTypeObject {
     typeAliasDeclaration: string;
     typeName: string;
@@ -61,8 +67,36 @@ interface typesAndLocationsQueryResult {
     };
 }
 interface LanguageDriver {
-    init: (lspClient: LspClient, sketchPath: string) => Promise<void>;
-    getHoleContext: (lspClient: LspClient, sketchFilePath: string) => Promise<{
+    init: (lspClient: LspClient | null, sketchPath: string) => Promise<void>;
+    injectHole: (sketchPath: string) => void;
+    getHoleContext: (lspClient: LspClient | null, sketchFilePath: string, logStream: fs.WriteStream | null) => Promise<{
+        fullHoverResult: string;
+        functionName: string;
+        functionTypeSpan: string;
+        linePosition: number;
+        characterPosition: number;
+        holeTypeDefLinePos: number;
+        holeTypeDefCharPos: number;
+        range: Range;
+        source: string;
+        trueHoleFunction?: string;
+    }>;
+    getHoleContextWithCompilerAPI: (sketchFilePath: string, logStream: fs.WriteStream | null) => Promise<{
+        fullHoverResult: string;
+        functionName: string;
+        functionTypeSpan: string;
+        linePosition: number;
+        characterPosition: number;
+        holeTypeDefLinePos: number;
+        holeTypeDefCharPos: number;
+        range: Range;
+        source: string;
+        trueHoleFunction?: string;
+    }>;
+    getHoleContextWithTreesitter: (sketchFilePath: string, cursorPosition: {
+        line: number;
+        character: number;
+    }, logStream: fs.WriteStream | null) => Promise<{
         fullHoverResult: string;
         functionName: string;
         functionTypeSpan: string;
@@ -74,8 +108,13 @@ interface LanguageDriver {
         source: string;
         trueHoleFunction?: string;
     }>;
-    extractRelevantTypes: (lspClient: LspClient, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string, foundContents: Map<string, string>) => Promise<Map<string, TypeSpanAndSourceFile>>;
-    extractRelevantHeaders: (lspClient: LspClient, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string) => Promise<Set<TypeSpanAndSourceFile>>;
+    extractRelevantTypes: (lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string, foundContents: Map<string, string>, logStream: fs.WriteStream | null) => Promise<Map<string, TypeSpanAndSourceFile>>;
+    extractRelevantTypesWithCompilerAPI: (fullHoverResult: string, typeName: string, linePosition: number, characterPosition: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string, foundContents: Map<string, string>, logStream: fs.WriteStream | null) => Promise<Map<string, TypeSpanAndSourceFile>>;
+    extractRelevantTypesWithTreesitter: (lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFileAndAst>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    logStream: fs.WriteStream | null) => Promise<Map<string, TypeSpanAndSourceFileAndAst>>;
+    extractRelevantHeaders: (lspClient: LspClient | null, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string, projectRoot: string) => Promise<Set<TypeSpanAndSourceFile>>;
+    extractRelevantHeadersWithTreesitter: (_: LspClient | null, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, holeType: string, holeIdentifier: string, projectRoot: string) => Promise<Set<TypeSpanAndSourceFile>>;
 }
 type Filepath = string;
 type RelevantType = string;
@@ -85,10 +124,7 @@ interface Context {
     relevantTypes: Map<Filepath, RelevantType[]>;
     relevantHeaders: Map<Filepath, RelevantHeader[]>;
 }
-declare enum Language {
-    TypeScript = 0,
-    OCaml = 1
-}
+type Language = "typescript" | "ocaml";
 interface TypeChecker {
     getTypeContextFromDecl: (typeDecl: string) => {
         identifier: string;
@@ -99,6 +135,9 @@ interface TypeSpanAndSourceFile {
     typeSpan: string;
     sourceFile: string;
 }
+interface TypeSpanAndSourceFileAndAst extends TypeSpanAndSourceFile {
+    ast: Tree;
+}
 declare enum Model {
     None = 0,
     GPT4 = "gpt4",
@@ -132,4 +171,35 @@ interface ParameterAnalysis {
     optional: boolean;
     type: TypeAnalysis;
 }
-export { relevantTypeObject, varsObject, typesObject, typeAndLocation, relevantTypeQueryResult, varsQueryResult, typesQueryResult, typesAndLocationsQueryResult, LanguageDriver, Language, TypeChecker, TypeSpanAndSourceFile, Context, Model, LLMConfig, GPT4Config, GPT4PromptComponent, TypeAnalysis, ParameterAnalysis };
+interface VarFuncDecls {
+    kind: "variable" | "function" | "arrowFunction" | "classMethod";
+    name: string;
+    type: string;
+    returnType?: string;
+    position: {
+        line: number;
+        character: number;
+    };
+    declarationText: string;
+    sourceFile: string;
+}
+type IDE = "standalone" | "vscode";
+type VSCodeBuiltinProvider = ExecuteHoverProvider | ExecuteDefinitionProvider | ExecuteTypeDefinitionProvider | ExecuteDocumentSymbolProvider;
+type ExecuteHoverProvider = "vscode.executeHoverProvider";
+type ExecuteDefinitionProvider = "vscode.executeDefinitionProvider";
+type ExecuteTypeDefinitionProvider = "vscode.executeTypeDefinitionProvider";
+type ExecuteDocumentSymbolProvider = "vscode.executeDocumentSymbolProvider";
+interface RangeInFile {
+    filepath: string;
+    range: Range;
+}
+interface RangeInFileWithContents extends RangeInFile {
+    contents: string;
+}
+interface SymbolWithRange extends RangeInFile {
+    name: string;
+    type: SyntaxNode["type"];
+    content: string;
+}
+type FileSymbolMap = Record<string, SymbolWithRange[]>;
+export { Position, relevantTypeObject, varsObject, typesObject, typeAndLocation, relevantTypeQueryResult, varsQueryResult, typesQueryResult, typesAndLocationsQueryResult, LanguageDriver, Language, TypeChecker, TypeSpanAndSourceFile, TypeSpanAndSourceFileAndAst, Context, Model, LLMConfig, GPT4Config, GPT4PromptComponent, TypeAnalysis, ParameterAnalysis, VarFuncDecls, IDE, VSCodeBuiltinProvider, RangeInFile, RangeInFileWithContents, SymbolWithRange, FileSymbolMap };

package/dist/src/types.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = exports.Language = void 0;
-var Language;
-(function (Language) {
-    Language[Language["TypeScript"] = 0] = "TypeScript";
-    Language[Language["OCaml"] = 1] = "OCaml";
-})(Language || (exports.Language = Language = {}));
+exports.Model = void 0;
 var Model;
 (function (Model) {
     Model[Model["None"] = 0] = "None";

package/dist/src/typescript-driver.d.ts

@@ -1,10 +1,31 @@
+import * as ts from 'typescript';
+import * as fs from "fs";
 import { LspClient, Location, Range, SymbolInformation } from "../ts-lsp-client-dist/src/main";
-import { LanguageDriver, TypeSpanAndSourceFile } from "./types";
+import { LanguageDriver, TypeSpanAndSourceFile, TypeAnalysis, IDE, TypeSpanAndSourceFileAndAst } from "./types";
 import { TypeScriptTypeChecker } from "./typescript-type-checker";
+import Parser from 'web-tree-sitter';
 export declare class TypeScriptDriver implements LanguageDriver {
+    ide: IDE;
     typeChecker: TypeScriptTypeChecker;
-    init(lspClient: LspClient, sketchPath: string): Promise<void>;
-    getHoleContext(lspClient: LspClient, sketchFilePath: string): Promise<{
+    vscodeImport: any;
+    tsCompilerProgram: ts.Program;
+    tsCompilerTypeChecker: ts.TypeChecker;
+    constructor(ide: IDE, sources: string[], projectRoot: string);
+    init(lspClient: LspClient | null, sketchPath: string): Promise<void>;
+    injectHole(sketchFilePath: string): void;
+    getHoleContext(lspClient: LspClient | null, sketchFilePath: string, logStream: fs.WriteStream | null): Promise<{
+        fullHoverResult: any;
+        functionName: string;
+        functionTypeSpan: any;
+        linePosition: number;
+        characterPosition: number;
+        holeTypeDefLinePos: number;
+        holeTypeDefCharPos: number;
+        range: any;
+        source: string;
+        trueHoleFunction: string;
+    }>;
+    getHoleContextWithCompilerAPI(sketchFilePath: string, logStream: fs.WriteStream | null): Promise<{
         fullHoverResult: string;
         functionName: string;
         functionTypeSpan: string;
@@ -12,22 +33,69 @@ export declare class TypeScriptDriver implements LanguageDriver {
         characterPosition: number;
         holeTypeDefLinePos: number;
         holeTypeDefCharPos: number;
-        range: Range;
+        range: {
+            start: {
+                line: number;
+                character: number;
+            };
+            end: {
+                line: number;
+                character: number;
+            };
+        };
         source: string;
         trueHoleFunction: string;
     }>;
+    getHoleContextWithTreesitter(sketchFilePath: string, cursorPosition: {
+        line: number;
+        character: number;
+    }, logStream: fs.WriteStream | null): Promise<{
+        fullHoverResult: string;
+        functionName: string;
+        functionTypeSpan: string;
+        linePosition: number;
+        characterPosition: number;
+        holeTypeDefLinePos: number;
+        holeTypeDefCharPos: number;
+        range: Range;
+        source: string;
+        trueHoleFunction?: string;
+    }>;
     extractRelevantTypes1(lspClient: LspClient, fullHoverResult: string, typeName: string, startLine: number, endLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
     currentFile: string, foundTypeDefinitions: Map<string, Location[]>, foundSymbols: Map<string, SymbolInformation[]>): Promise<Map<string, TypeSpanAndSourceFile>>;
-    extractRelevantTypes(lspClient: LspClient, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
-    currentFile: string, foundContents: Map<string, string>): Promise<Map<string, TypeSpanAndSourceFile>>;
-    extractRelevantTypesHelper(lspClient: LspClient, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
+    extractRelevantTypes(lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    logStream: fs.WriteStream | null): Promise<Map<string, TypeSpanAndSourceFile>>;
+    extractRelevantTypesWithTreesitter(lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFileAndAst>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    logStream: fs.WriteStream | null): Promise<Map<string, TypeSpanAndSourceFileAndAst>>;
+    extractRelevantTypesHelper(lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    layer: number): Promise<void>;
+    extractRelevantTypesWithCompilerAPI(fullHoverResult: string, typeName: string, linePosition: number, characterPosition: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    logStream: fs.WriteStream | null): Promise<Map<string, TypeSpanAndSourceFile>>;
+    extractRelevantTypesHelperWithCompilerAPI(fullHoverResult: string, typeName: string, linePosition: number, characterPosition: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, // identifier -> [full hover result, source]
+    currentFile: string, foundContents: Map<string, string>, // uri -> contents
+    layer: number): Promise<void>;
+    extractRelevantTypesHelperWithTreesitter(lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFileAndAst>, // identifier -> [full hover result, source]
     currentFile: string, foundContents: Map<string, string>, // uri -> contents
     layer: number): Promise<void>;
-    extractRelevantHeaders(_: LspClient, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string): Promise<Set<TypeSpanAndSourceFile>>;
-    generateTargetTypes(relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string): Set<string>;
-    generateTargetTypesHelper(relevantTypes: Map<string, TypeSpanAndSourceFile>, currType: string, targetTypes: Set<string>): void;
-    extractRelevantHeadersHelper(typeSpan: string, targetTypes: Set<string>, relevantTypes: Map<string, TypeSpanAndSourceFile>, relevantContext: Set<TypeSpanAndSourceFile>, line: string, source: string, relevantContextMap: Map<string, TypeSpanAndSourceFile>, tag: boolean, trace: string[], foundNormalForms: Map<string, string>): void;
-    isTypeEquivalent(t1: string, t2: string, relevantTypes: Map<string, TypeSpanAndSourceFile>, foundNormalForms: Map<string, string>): boolean;
+    extractRelevantHeaders(_: LspClient | null, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string, projectRoot: string): Promise<Set<TypeSpanAndSourceFile>>;
+    generateTargetTypes(relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string, program: ts.Program, checker: ts.TypeChecker): Set<string>;
+    generateTargetTypesHelper(relevantTypes: Map<string, TypeSpanAndSourceFile>, currType: string, targetTypes: Set<string>, program: ts.Program, checker: ts.TypeChecker): void;
+    extractRelevantHeadersHelper(typeSpan: string, targetTypes: Set<string>, relevantTypes: Map<string, TypeSpanAndSourceFile>, relevantContext: Set<TypeSpanAndSourceFile>, line: string, source: string, relevantContextMap: Map<string, TypeSpanAndSourceFile>, tag: boolean, trace: string[], foundNormalForms: Map<string, string>, foundTypeAnalysisResults: Map<string, TypeAnalysis>, // filename+typeSpan -> typeAnalysisResult
+    program: ts.Program, checker: ts.TypeChecker): void;
+    isTypeEquivalent(t1: string, t2: string, relevantTypes: Map<string, TypeSpanAndSourceFile>, foundNormalForms: Map<string, string>, program: ts.Program, checker: ts.TypeChecker): boolean;
     normalize(typeSpan: string, relevantTypes: Map<string, TypeSpanAndSourceFile>): string;
-    normalize2(typeSpan: string, relevantTypes: Map<string, TypeSpanAndSourceFile>): string;
+    normalize2(typeSpan: string, relevantTypes: Map<string, TypeSpanAndSourceFile>, program: ts.Program, checker: ts.TypeChecker): string;
+    extractRelevantHeadersHelper2(declText: string, typeSpan: string, targetTypes: Set<string>, relevantTypes: Map<string, TypeSpanAndSourceFile>, relevantContext: Set<TypeSpanAndSourceFile>, source: string, relevantContextMap: Map<string, TypeSpanAndSourceFile>, trace: string[], foundNormalForms: Map<string, string>, foundTypeAnalysisResults: Map<string, TypeAnalysis>, // filename+typeSpan -> typeAnalysisResult
+    program: ts.Program, checker: ts.TypeChecker): void;
+    extractRelevantHeadersWithTreesitter(_: LspClient | null, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, holeType: string, holeIdentifier: string, projectRoot: string): Promise<Set<TypeSpanAndSourceFile>>;
+    extractRelevantHeadersWithTreesitterHelper(originalDeclText: string, node: Parser.SyntaxNode, targetTypes: Set<Parser.SyntaxNode>, relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, relevantContext: Set<TypeSpanAndSourceFile>, relevantContextMap: Map<string, TypeSpanAndSourceFile>, foundNormalForms: Map<string, string>, source: string): Promise<void>;
+    generateTargetTypesWithTreesitter(relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, holeType: string, holeIdentifier: string): Promise<Set<Parser.SyntaxNode>>;
+    unwrapToBaseType(node: Parser.SyntaxNode): Parser.SyntaxNode;
+    generateTargetTypesWithTreesitterHelper(relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, currType: string, targetTypes: Set<Parser.SyntaxNode>, node: Parser.SyntaxNode | null): Promise<void>;
+    isTypeEquivalentWithTreesitter(node: Parser.SyntaxNode, typ: Parser.SyntaxNode, relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, foundNormalForms: Map<string, string>): Promise<boolean>;
+    normalizeWithTreesitter(node: Parser.SyntaxNode, relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>): Promise<string>;
 }