@jpoly1219/context-extractor 0.2.9 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,7 +14,6 @@ exports.extractTopLevelDecls = extractTopLevelDecls;
14
14
  exports.extractTopLevelDeclsWithFormatting = extractTopLevelDeclsWithFormatting;
15
15
  exports.extractFunctionTypeFromDecl = extractFunctionTypeFromDecl;
16
16
  const fs_1 = __importDefault(require("fs"));
17
- const path_1 = __importDefault(require("path"));
18
17
  const web_tree_sitter_1 = __importDefault(require("web-tree-sitter"));
19
18
  const utils_1 = require("./utils");
20
19
  const ast_1 = require("./ast");
@@ -92,7 +91,13 @@ async function getQueryForFile(filepath, queryPath) {
92
91
  return query;
93
92
  }
94
93
  async function loadLanguageForFileExt(fileExtension) {
95
- const wasmPath = path_1.default.join(__dirname, "tree-sitter-files", "wasms", `tree-sitter-${exports.supportedLanguages[fileExtension]}.wasm`);
94
+ const wasmPath = require.resolve(`./tree-sitter-files/wasms/tree-sitter-${exports.supportedLanguages[fileExtension]}.wasm`);
95
+ // const wasmPath = path.join(
96
+ // __dirname,
97
+ // "tree-sitter-files",
98
+ // "wasms",
99
+ // `tree-sitter-${supportedLanguages[fileExtension]}.wasm`
100
+ // );
96
101
  return await web_tree_sitter_1.default.Language.load(wasmPath);
97
102
  }
98
103
  const GET_SYMBOLS_FOR_NODE_TYPES = [
@@ -218,7 +223,16 @@ async function extractTopLevelDecls(currentFile) {
218
223
  throw new Error(`failed to get ast for file ${currentFile}`);
219
224
  }
220
225
  const language = (0, exports.getFullLanguageName)(currentFile);
221
- const query = await getQueryForFile(currentFile, path_1.default.join(__dirname, "tree-sitter-files", "queries", "relevant-headers-queries", `${language}-get-toplevel-headers.scm`));
226
+ const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-get-toplevel-headers.scm`);
227
+ const query = await getQueryForFile(currentFile, queryPath
228
+ // path.join(
229
+ // __dirname,
230
+ // "tree-sitter-files",
231
+ // "queries",
232
+ // "relevant-headers-queries",
233
+ // `${language}-get-toplevel-headers.scm`
234
+ // )
235
+ );
222
236
  if (!query) {
223
237
  throw new Error(`failed to get query for file ${currentFile} and language ${language}`);
224
238
  }
@@ -231,7 +245,16 @@ async function extractTopLevelDeclsWithFormatting(currentFile) {
231
245
  throw new Error(`failed to get ast for file ${currentFile}`);
232
246
  }
233
247
  const language = (0, exports.getFullLanguageName)(currentFile);
234
- const query = await getQueryForFile(currentFile, path_1.default.join(__dirname, "tree-sitter-files", "queries", "relevant-headers-queries", `${language}-get-toplevel-headers.scm`));
248
+ const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-get-toplevel-headers.scm`);
249
+ const query = await getQueryForFile(currentFile, queryPath
250
+ // path.join(
251
+ // __dirname,
252
+ // "tree-sitter-files",
253
+ // "queries",
254
+ // "relevant-headers-queries",
255
+ // `${language}-get-toplevel-headers.scm`
256
+ // )
257
+ );
235
258
  if (!query) {
236
259
  throw new Error(`failed to get query for file ${currentFile} and language ${language}`);
237
260
  }
@@ -390,7 +390,16 @@ class TypeScriptDriver {
390
390
  throw new Error("failed to get ast");
391
391
  }
392
392
  const language = (0, tree_sitter_1.getFullLanguageName)(sketchFilePath);
393
- const query = await (0, tree_sitter_1.getQueryForFile)(sketchFilePath, path.join(__dirname, "tree-sitter-files", "queries", "hole-queries", `${language}.scm`));
393
+ const queryPath = require.resolve(`./tree-sitter-files/queries/hole-queries/${language}.scm`);
394
+ const query = await (0, tree_sitter_1.getQueryForFile)(sketchFilePath, queryPath
395
+ // path.join(
396
+ // __dirname,
397
+ // "tree-sitter-files",
398
+ // "queries",
399
+ // "hole-queries",
400
+ // `${language}.scm`
401
+ // ),
402
+ );
394
403
  if (!query) {
395
404
  throw new Error(`failed to get query for file ${sketchFilePath} and language ${language}`);
396
405
  }
@@ -813,7 +822,16 @@ class TypeScriptDriver {
813
822
  }
814
823
  foundSoFar.set(typeName, { typeSpan: fullHoverResult, sourceFile: currentFile.slice(7), ast: ast });
815
824
  const language = (0, tree_sitter_1.getFullLanguageName)(currentFile);
816
- const query = await (0, tree_sitter_1.getQueryForFile)(currentFile, path.join(__dirname, "tree-sitter-files", "queries", "relevant-types-queries", `${language}-extract-identifiers.scm`));
825
+ const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-types-queries/${language}-extract-identifiers.scm`);
826
+ const query = await (0, tree_sitter_1.getQueryForFile)(currentFile, queryPath
827
+ // path.join(
828
+ // __dirname,
829
+ // "tree-sitter-files",
830
+ // "queries",
831
+ // "relevant-types-queries",
832
+ // `${language}-extract-identifiers.scm`,
833
+ // )
834
+ );
817
835
  if (!query) {
818
836
  throw new Error(`failed to get query for file ${currentFile} and language ${language}`);
819
837
  }
@@ -881,7 +899,16 @@ class TypeScriptDriver {
881
899
  }
882
900
  foundSoFar.set(typeName, { typeSpan: fullHoverResult, sourceFile: currentFile.slice(7), ast: ast });
883
901
  const language = (0, tree_sitter_1.getFullLanguageName)(currentFile);
884
- const query = await (0, tree_sitter_1.getQueryForFile)(currentFile, path.join(__dirname, "tree-sitter-files", "queries", "relevant-headers-queries", `${language}-extract-identifiers.scm`));
902
+ const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-extract-identifiers.scm`);
903
+ const query = await (0, tree_sitter_1.getQueryForFile)(currentFile, queryPath
904
+ // path.join(
905
+ // __dirname,
906
+ // "tree-sitter-files",
907
+ // "queries",
908
+ // "relevant-headers-queries",
909
+ // `${language}-extract-identifiers.scm`,
910
+ // )
911
+ );
885
912
  if (!query) {
886
913
  throw new Error(`failed to get query for file ${currentFile} and language ${language}`);
887
914
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jpoly1219/context-extractor",
3
- "version": "0.2.9",
3
+ "version": "0.2.10",
4
4
  "description": "Extract relevant context from an incomplete program sketch.",
5
5
  "repository": {
6
6
  "type": "git",