@jpoly1219/context-extractor 0.2.8 → 0.2.10

package/dist/src/constants.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EMOJIPAINT_DIR = exports.BOOKING_DIR = exports.PASSWORDS_DIR = exports.PLAYLIST_DIR = exports.TODO_DIR = exports.TARGET_DIR = exports.QUERY_DIR = exports.DEPS_DIR = exports.ROOT_DIR = exports.CODEQL_PATH = void 0;
 // import * as path from "path";

package/dist/src/core.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { LspClient } from "../ts-lsp-client-dist/src/main.js";
 import * as fs from "fs";
 declare const getAnnotatedFunctionHoleContext: (sketchFileContent: string) => {

package/dist/src/core.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalize = exports.extractRelevantHeaders = exports.extractRelevantTypes = exports.getHoleContext = exports.getAnnotatedFunctionHoleContext = void 0;
 // import { LspClient, MarkupContent, Location, SymbolInformation, Range } from "ts-lsp-client"

package/dist/src/main.d.ts

@@ -1,4 +1,5 @@
-import { Context, Language } from "./types";
+import { Context, IDE, Language, Position } from "./types";
+import { App } from "./app";
 export declare const extract: (sketchPath: string) => Promise<{
     hole: string;
     relevantTypes: string[];
@@ -9,5 +10,10 @@ export declare const extractWithCodeQL: (sketchPath: string) => Promise<{
     relevantTypes: string[];
     relevantHeaders: string[];
 } | undefined>;
-export declare const extractContext: (language: Language, sketchPath: string, repoPath: string) => Promise<Context | null>;
+export declare const extractContext: (language: Language, sketchPath: string, repoPath: string, ide: IDE, cursorPosition: Position) => Promise<{
+    res: Context | null;
+    elapsed: number;
+}>;
+export declare const spawnApp: (language: Language, sketchPath: string, repoPath: string, ide: IDE, cursorPosition: Position) => App;
+export declare const extractContextWithReuse: (app: App, version: number) => Promise<Context | null>;
 export declare const completeWithLLM: (ctx: Context, language: Language, sketchPath: string, configPath: string) => Promise<string>;

package/dist/src/main.js

@@ -15,25 +15,38 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.completeWithLLM = exports.extractContext = exports.extractWithCodeQL = exports.extract = void 0;
+exports.completeWithLLM = exports.extractContextWithReuse = exports.spawnApp = exports.extractContext = exports.extractWithCodeQL = exports.extract = void 0;
 const main_js_1 = require("../ts-lsp-client-dist/src/main.js");
 // import { JSONRPCEndpoint, LspClient, ClientCapabilities } from "ts-lsp-client"
 // import { JSONRPCEndpoint, LspClient, ClientCapabilities } from "dist/ts-lsp-client-dist/src/main"
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+// import * as pprof from "pprof"
 const core_1 = require("./core");
 const codeql_1 = require("./codeql");
 const constants_1 = require("./constants");
 const app_1 = require("./app");
+const utils_js_1 = require("./utils.js");
+const url_1 = require("url");
 // sketchPath: /home/<username>/path/to/sketch/dir/sketch.ts
 const extract = async (sketchPath) => {
     const logFile = fs.createWriteStream("log.txt");
@@ -45,7 +58,7 @@ const extract = async (sketchPath) => {
     const r = (0, child_process_1.spawn)('typescript-language-server', ['--stdio']);
     const e = new main_js_1.JSONRPCEndpoint(r.stdin, r.stdout);
     const c = new main_js_1.LspClient(e);
-    console.log(JSON.stringify(c));
+    // console.log(JSON.stringify(c));
     const capabilities = {
         'textDocument': {
             'codeAction': { 'dynamicRegistration': true },
@@ -228,14 +241,26 @@ const extractWithCodeQL = async (sketchPath) => {
     }
 };
 exports.extractWithCodeQL = extractWithCodeQL;
-const extractContext = async (language, sketchPath, repoPath) => {
+const extractContext = async (language, sketchPath, repoPath, ide, cursorPosition) => {
     // console.time("extractContext")
-    const app = new app_1.App(language, sketchPath, repoPath);
-    await app.run();
+    // const profile = await pprof.time.start(10000); // Collect for 10s
+    console.log("=*=*=*=");
+    if ((0, utils_js_1.isUri)(sketchPath)) {
+        sketchPath = (0, url_1.fileURLToPath)(sketchPath);
+    }
+    const start = performance.now();
+    const app = new app_1.App(language, sketchPath, repoPath, ide, cursorPosition);
+    await app.run2(1);
     const res = app.getSavedResult();
     app.close();
+    // const buf = await pprof.encode(profile());
+    // fs.writeFile('wall.pb.gz', buf, (err) => {
+    //   if (err) throw err;
+    // });
     // console.timeEnd("extractContext")
-    return res;
+    const end = performance.now();
+    // console.log("elapsed:", end - start)
+    return { res: res, elapsed: end - start };
     // if (!getCompletion) {
     //   await app.close()
     //   return { context: res, completion: "" };
@@ -250,6 +275,19 @@ const extractContext = async (language, sketchPath, repoPath) => {
     // }
 };
 exports.extractContext = extractContext;
+const spawnApp = (language, sketchPath, repoPath, ide, cursorPosition) => {
+    const app = new app_1.App(language, sketchPath, repoPath, ide, cursorPosition);
+    return app;
+};
+exports.spawnApp = spawnApp;
+const extractContextWithReuse = async (app, version) => {
+    // await app.init();
+    await app.run(version);
+    const res = app.getSavedResult();
+    // app.close();
+    return res;
+};
+exports.extractContextWithReuse = extractContextWithReuse;
 const completeWithLLM = async (ctx, language, sketchPath, configPath) => {
     const engine = new app_1.CompletionEngine(language, sketchPath, configPath);
     const completion = await engine.completeWithLLM(ctx);

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

@@ -1,10 +1,12 @@
+import * as fs from "fs";
 import { LspClient, Range } from "../ts-lsp-client-dist/src/main";
-import { LanguageDriver, TypeSpanAndSourceFile } from "./types";
+import { LanguageDriver, TypeSpanAndSourceFile, TypeSpanAndSourceFileAndAst } from "./types";
 import { OcamlTypeChecker } from "./ocaml-type-checker";
 export declare class OcamlDriver implements LanguageDriver {
     typeChecker: OcamlTypeChecker;
-    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): Promise<{
         fullHoverResult: string;
         functionName: string;
         functionTypeSpan: any;
@@ -15,8 +17,55 @@ export declare class OcamlDriver implements LanguageDriver {
         range: Range;
         source: string;
     }>;
-    extractRelevantTypes(lspClient: LspClient, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string): Promise<Map<string, TypeSpanAndSourceFile>>;
-    extractRelevantHeaders(lspClient: LspClient, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFile>, holeType: string): Promise<Set<TypeSpanAndSourceFile>>;
+    getHoleContextWithCompilerAPI(sketchFilePath: string, logStream: fs.WriteStream | null): Promise<{
+        fullHoverResult: string;
+        functionName: string;
+        functionTypeSpan: string;
+        linePosition: number;
+        characterPosition: number;
+        holeTypeDefLinePos: number;
+        holeTypeDefCharPos: number;
+        range: {
+            start: {
+                line: number;
+                character: number;
+            };
+            end: {
+                line: number;
+                character: number;
+            };
+        };
+        source: 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: {
+            start: {
+                line: number;
+                character: number;
+            };
+            end: {
+                line: number;
+                character: number;
+            };
+        };
+        source: string;
+    }>;
+    extractRelevantTypes(lspClient: LspClient | null, fullHoverResult: string, typeName: string, startLine: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string): Promise<Map<string, TypeSpanAndSourceFile>>;
+    extractRelevantTypesWithCompilerAPI(fullHoverResult: string, typeName: string, linePosition: number, characterPosition: number, foundSoFar: Map<string, TypeSpanAndSourceFile>, currentFile: string): 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): Promise<Set<TypeSpanAndSourceFile>>;
     extractHeaderTypeSpans(lspClient: LspClient, preludeFilePath: string): Promise<{
         identifier: string;
         typeSpan: string;
@@ -27,4 +76,5 @@ export declare class OcamlDriver implements LanguageDriver {
     extractRelevantHeadersHelper(typeSpan: string, targetTypes: Set<string>, relevantTypes: Map<string, TypeSpanAndSourceFile>, relevantContext: Set<TypeSpanAndSourceFile>, snippet: string, source: string): void;
     isTypeEquivalent(t1: string, t2: string, relevantTypes: Map<string, TypeSpanAndSourceFile>): boolean;
     normalize(typeSpan: string, relevantTypes: Map<string, TypeSpanAndSourceFile>): string | undefined;
+    extractRelevantHeadersWithTreesitter(lspClient: LspClient | null, sources: string[], relevantTypes: Map<string, TypeSpanAndSourceFileAndAst>, holeType: string, holeIdentifier: string, projectRoot: string): Promise<Set<TypeSpanAndSourceFile>>;
 }