@jpoly1219/context-extractor 0.2.6 → 0.2.7

package/dist/src/app.js

@@ -125,7 +125,7 @@ class App {
             else if (this.language === types_1.Language.OCaml) {
                 relevantTypes.delete("_");
             }
-            console.log(path.join(path.dirname(this.sketchPath), `sketch${path.extname(this.sketchPath)}`));
+            // console.log(relevantTypes)
             let repo = [];
             if (this.language === types_1.Language.TypeScript) {
                 repo = (0, utils_1.getAllTSFiles)(this.repoPath);
@@ -134,6 +134,7 @@ class App {
                 repo = (0, utils_1.getAllOCamlFiles)(this.repoPath);
             }
             const relevantHeaders = await this.languageDriver.extractRelevantHeaders(this.lspClient, repo, relevantTypes, holeContext.functionTypeSpan);
+            // console.log(relevantHeaders)
             // Postprocess the map.
             if (this.language === types_1.Language.TypeScript) {
                 relevantTypes.delete("");

package/dist/src/runner.js

@@ -9,7 +9,16 @@ const types_1 = require("./types");
 // extract("/home/jacob/projects/context-extractor/targets/emojipaint/sketch.ts").then(r => console.log("emojipaint\n", r));
 (async () => {
     try {
-        const x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/todo/sketch.ts", "/home/jacob/projects/context-extractor/targets/todo/");
+        let x;
+        x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/todo/sketch.ts", "/home/jacob/projects/context-extractor/targets/todo/");
+        console.dir(x, { depth: null });
+        x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/playlist/sketch.ts", "/home/jacob/projects/context-extractor/targets/playlist/");
+        console.dir(x, { depth: null });
+        x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/passwords/sketch.ts", "/home/jacob/projects/context-extractor/targets/passwords/");
+        console.dir(x, { depth: null });
+        x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/booking/sketch.ts", "/home/jacob/projects/context-extractor/targets/booking/");
+        console.dir(x, { depth: null });
+        x = await (0, main_1.extractContext)(types_1.Language.TypeScript, "/home/jacob/projects/context-extractor/targets/emojipaint/sketch.ts", "/home/jacob/projects/context-extractor/targets/emojipaint/");
         console.dir(x, { depth: null });
         // const y = await completeWithLLM(
         //   x!,

package/dist/src/typescript-driver.js

@@ -390,9 +390,15 @@ class TypeScriptDriver {
     normalize(typeSpan, relevantTypes) {
         // NOTE: BUGFIX
         // console.log(`normalize: ${typeSpan}`)
+        // console.log(`normalize: ${typeSpan}`)
+        // console.log(`normalize: ${typeSpan == undefined}`)
         if (typeSpan.slice(typeSpan.length - 2) == " =") {
-            typeSpan = typeSpan.slice(typeSpan.length - 2);
+            typeSpan = typeSpan.slice(0, typeSpan.length - 2);
+        }
+        if (typeSpan.slice(typeSpan.length - 1) == ";") {
+            typeSpan = typeSpan.slice(0, typeSpan.length - 1);
         }
+        // console.log(typeSpan)
         let normalForm = "";
         // pattern matching for typeSpan
         if (this.typeChecker.isPrimitive(typeSpan)) {
@@ -462,9 +468,14 @@ class TypeScriptDriver {
     normalize2(typeSpan, relevantTypes) {
         // NOTE: BUGFIX
         // console.log(`normalize: ${typeSpan}`)
+        // console.log(`normalize: ${typeSpan == undefined}`)
         if (typeSpan.slice(typeSpan.length - 2) == " =") {
-            typeSpan = typeSpan.slice(typeSpan.length - 2);
+            typeSpan = typeSpan.slice(0, typeSpan.length - 2);
+        }
+        if (typeSpan.slice(typeSpan.length - 1) == ";") {
+            typeSpan = typeSpan.slice(0, typeSpan.length - 1);
         }
+        // console.log(typeSpan)
         let normalForm = "";
         const analysisResult = this.typeChecker.analyzeTypeString(typeSpan);
         // pattern matching for typeSpan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpoly1219/context-extractor",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Extract relevant context from an incomplete program sketch.",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
     "dist/"
   ],
   "scripts": {
-    "build": "npx tsc && npm run copy-deps",
+    "build": "rm -rf dist/ && npx tsc && npm run copy-deps",
     "copy-deps": "npm run copy-lsp-client && npm run copy-ocaml",
     "copy-lsp-client": "shx cp -r ts-lsp-client-dist dist/",
     "copy-ocaml": "shx mkdir -p dist/src/ocaml-utils/ && shx cp -r src/ocaml-utils/_build dist/src/ocaml-utils/_build/",