@algosail/parser 0.0.3 → 0.0.5

package/index.js

@@ -1,11 +1,16 @@
+import { createRequire } from 'module'
 import { getSailTokenizer } from './lib/sailTokenizer.js'
 import { getJsTokenizer } from './lib/jsTokenizer.js'
 import { buildSymbolTable } from './lib/symbolTable.js'
 import { parseJsDoc } from './lib/jsDoc.js'
 
+const require = createRequire(import.meta.url)
+
 export async function createParser() {
-  const sailTokenizer = await getSailTokenizer()
-  const jsTokenizer = await getJsTokenizer()
+  const sailWasmPath = require.resolve('@algosail/tree-sitter/tree-sitter-sail.wasm')
+  const jsWasmPath = require.resolve('tree-sitter-javascript/tree-sitter-javascript.wasm')
+  const sailTokenizer = await getSailTokenizer(sailWasmPath)
+  const jsTokenizer = await getJsTokenizer(jsWasmPath)
   const cache = new Map()
 
   const parser = {

package/lib/jsTokenizer.js

@@ -1,11 +1,9 @@
 import { Parser, Language } from 'web-tree-sitter'
 
-export async function getJsTokenizer() {
+export async function getJsTokenizer(wasmPath) {
   await Parser.init()
   const tokenizer = new Parser()
-  const language = await Language.load(
-    'node_modules/tree-sitter-javascript/tree-sitter-javascript.wasm',
-  )
+  const language = await Language.load(wasmPath)
   tokenizer.setLanguage(language)
   return { tokenizer, language }
 }

package/lib/sailTokenizer.js

@@ -1,9 +1,9 @@
 import { Parser, Language } from 'web-tree-sitter'
 
-export async function getSailTokenizer() {
+export async function getSailTokenizer(wasmPath) {
   await Parser.init()
   const tokenizer = new Parser()
-  const language = await Language.load('node_modules/@algosail/tree-sitter/tree-sitter-sail.wasm')
+  const language = await Language.load(wasmPath)
   tokenizer.setLanguage(language)
   return { tokenizer, language }
 }

package/lib/word.js

@@ -36,9 +36,12 @@ function parseWord(node) {
 
   return {
     name,
+    sig: field(node, 'sig')?.text,
     doc: comment(field(node, 'doc')),
     signature,
     body,
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
   }
 }
 
@@ -81,61 +84,135 @@ function step(node) {
 
 function quotation(node) {
   const body = children(node).map(step).filter(Boolean)
-  return { type: 'quotation', body }
+  return {
+    type: 'quotation',
+    body,
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function builtinWord(node) {
-  return { type: 'builtin_word', word: node.text }
+  return {
+    type: 'builtin_word',
+    word: node.text,
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function word(node) {
-  return { type: 'word', word: wordRef(node) }
+  return {
+    type: 'word',
+    word: wordRef(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function moduleWord(node) {
-  return { type: 'word', ...(moduleWordRef(node) || {}) }
+  return {
+    type: 'word',
+    ...(moduleWordRef(node) || {}),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function tagConstructor(node) {
-  return { type: 'tag', tag: tagRef(node) }
+  return {
+    type: 'tag',
+    tag: tagRef(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function moduleTagConstructor(node) {
-  return { type: 'tag', ...(moduleTagRef(node) || {}) }
+  return {
+    type: 'tag',
+    ...(moduleTagRef(node) || {}),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function patternTag(node) {
-  return { type: 'pattern_tag', tag: tagPattern(node) }
+  return {
+    type: 'pattern_tag',
+    tag: tagPattern(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function patternModuleTag(node) {
-  return { type: 'pattern_tag', ...(moduleTagPattern(node) || {}) }
+  return {
+    type: 'pattern_tag',
+    ...(moduleTagPattern(node) || {}),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
-function patternDefault(_node) {
-  return { type: 'pattern_default' }
+function patternDefault(node) {
+  return {
+    type: 'pattern_default',
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function fieldLens(node) {
-  return { type: 'field_lens', field: fieldRef(node) }
+  return {
+    type: 'field_lens',
+    field: fieldRef(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function moduleFieldLens(node) {
-  return { type: 'field_lens', ...(moduleFieldRef(node) || {}) }
+  return {
+    type: 'field_lens',
+    ...(moduleFieldRef(node) || {}),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function writeSlot(node) {
-  return { type: 'slot_write', value: slotWrite(node) }
+  return {
+    type: 'slot_write',
+    value: slotWrite(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function readSlot(node) {
-  return { type: 'slot_read', value: slotRead(node) }
+  return {
+    type: 'slot_read',
+    value: slotRead(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function rawFromString(node) {
-  return { type: 'raw', value: rawString(node) }
+  return {
+    type: 'raw',
+    value: rawString(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }
 
 function raw(node) {
-  return { type: 'raw', value: rawValue(node) }
+  return {
+    type: 'raw',
+    value: rawValue(node),
+    startPosition: node.startPosition,
+    endPosition: node.endPosition,
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosail/parser",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Parser for Sail language.",
   "license": "MIT",
   "author": "algosail",