@algosail/parser 0.0.5 → 0.0.7

package/lib/load.js

@@ -72,7 +72,7 @@ export async function resolveModulePath(execPath, packageImport) {
 
   const sailPath = resolveExportsCondition(packageJson.exports, path)
   if (sailPath) {
-    return readFile(join(packageDir, sailPath), 'utf8')
+    return { type: 'js', path: join(packageDir, sailPath) }
   }
 
   const importId = path === '.' ? name : `${name}/${path.slice(2)}`

package/lib/symbolTable.js

@@ -7,11 +7,12 @@ import { getWordNodes } from './word.js'
 import { resolveModulePath, resolveFilePath } from './load.js'
 
 export async function buildSymbolTable(uri, text, parser) {
-  const rootNode = parser.parseSail.tokenizer.parse(text)
-  const imports = getImportNodes(rootNode, parser.parseSail.language)
-  const { groups, tags } = getTagNodes(rootNode, parser.parseSail.language)
-  const { maps } = getMapNodes(rootNode, parser.parseSail.language)
-  const { words } = getWordNodes(rootNode, parser.parseSail.language)
+  const { tokenizer, language } = parser.sailTokenizer
+  const rootNode = tokenizer.parse(text)
+  const imports = getImportNodes(rootNode, language)
+  const { groups, tags } = getTagNodes(rootNode, language)
+  const { maps } = getMapNodes(rootNode, language)
+  const { words } = getWordNodes(rootNode, language)
   const errors = getErrors(rootNode)
 
   const modules = await getModules(imports, uri, parser)
@@ -55,9 +56,12 @@ async function getModules(imports, uri, parser) {
 
   for (const imp of imports) {
     if (imp.type === 'package') {
-      const moduleUri = await resolveModulePath(imp.path, uri)
+      const { type, path: moduleUri } = await resolveModulePath(uri, imp.path)
       const content = await readFile(moduleUri, 'utf8')
-      const res = await parser.parseSail(moduleUri, content)
+      const res =
+        type === 'js'
+          ? await parser.parseJs(moduleUri, content)
+          : await parser.parseSail(moduleUri, content)
       modules[imp.module] = {
         ...res,
         uri: moduleUri,
@@ -67,7 +71,7 @@ async function getModules(imports, uri, parser) {
     }
 
     if (imp.type === 'file') {
-      const { type, path: fileUri } = await resolveFilePath(imp.path, execPath)
+      const { type, path: fileUri } = await resolveFilePath(uri, imp.path)
       const content = await readFile(fileUri, 'utf8')
       if (type === 'sail') {
         const res = await parser.parseSail(fileUri, content)

package/lib/tokens.js

@@ -15,7 +15,7 @@ export const fieldDef = (node) => node?.text?.slice(1) ?? null
 export const fieldRef = (node) => {
   if (!node) return null
   const [map, field] = node.text.split('.')
-  return { map: mapRef(map), field }
+  return { map: map.slice(1), field }
 }
 
 export const wordDef = (node) => node?.text?.slice(1) ?? null

package/package.json

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