@kerebron/tree-sitter 0.6.5 → 0.6.6

package/esm/extended/parser.d.ts

@@ -1,5 +1,6 @@
-import './node_extended.js';
+import { type AssetLoad } from '@kerebron/editor';
 import { ParseCallback, ParseOptions, Parser, Tree } from 'web-tree-sitter';
+import './node_extended.js';
 declare class ExtendedParser extends Parser {
     disableSoftNodes: boolean;
     /**
@@ -32,8 +33,8 @@ declare class ExtendedParser extends Parser {
  */
 interface Options {
     disableSoftNodes?: boolean;
-    moduleOptions?: Object;
+    assetLoad: AssetLoad;
 }
-export declare function createParser(wasmUint8Array: Uint8Array, { disableSoftNodes, moduleOptions }?: Options): Promise<ExtendedParser>;
+export declare function createParser(wasmUint8Array: Uint8Array, { disableSoftNodes, assetLoad }: Options): Promise<ExtendedParser>;
 export {};
 //# sourceMappingURL=parser.d.ts.map

package/esm/extended/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/extended/parser.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,MAAM,EACN,IAAI,EACL,MAAM,iBAAiB,CAAC;AAGzB,cAAM,cAAe,SAAQ,MAAM;IACjC,gBAAgB,UAAS;IAEzB;;;;;;;;;;;;;;;OAeG;IACM,KAAK,CACZ,IAAI,EAAE,MAAM,GAAG,aAAa,EAC5B,OAAO,EAAE,IAAI,GAAG,IAAI,EACpB,OAAO,EAAE,YAAY;CAuBxB;AAID;;;;;;;;;GASG;AACH,UAAU,OAAO;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,YAAY,CAChC,cAAc,EAAE,UAAU,EAC1B,EAAE,gBAAwB,EAAE,aAAa,EAAE,GAAE,OAAY,2BAa1D"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/extended/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,MAAM,EACN,IAAI,EACL,MAAM,iBAAiB,CAAC;AAEzB,OAAO,oBAAoB,CAAC;AAG5B,cAAM,cAAe,SAAQ,MAAM;IACjC,gBAAgB,UAAS;IAEzB;;;;;;;;;;;;;;;OAeG;IACM,KAAK,CACZ,IAAI,EAAE,MAAM,GAAG,aAAa,EAC5B,OAAO,EAAE,IAAI,GAAG,IAAI,EACpB,OAAO,EAAE,YAAY;CAuBxB;AAID;;;;;;;;;GASG;AACH,UAAU,OAAO;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,wBAAsB,YAAY,CAChC,cAAc,EAAE,UAAU,EAC1B,EAAE,gBAAwB,EAAE,SAAS,EAAE,EAAE,OAAO,2BAcjD"}

package/esm/extended/parser.js

@@ -1,11 +1,5 @@
-// import { Tree } from "../web-tree-sitter/src/tree.ts"
-// import { ParseOptions, Parser } from "../web-tree-sitter/src/parser.ts"
-// import { Language } from "../web-tree-sitter/src/language.ts"
-// import { ParseCallback } from "../web-tree-sitter/src/index.ts";
-// import { setModule } from '../web-tree-sitter/src/constants.ts';
-// import { MainModule } from '../web-tree-sitter/lib/web-tree-sitter.d.ts';
-import './node_extended.js';
 import { Language, Parser, } from 'web-tree-sitter';
+import './node_extended.js';
 // this only exists to help with type hints
 class ExtendedParser extends Parser {
     disableSoftNodes = false;
@@ -46,11 +40,13 @@ class ExtendedParser extends Parser {
 }
 const langCache = new Map();
 let hasBeenLoaded = false;
-export async function createParser(wasmUint8Array, { disableSoftNodes = false, moduleOptions } = {}) {
-    await Parser.init();
+export async function createParser(wasmUint8Array, { disableSoftNodes = false, assetLoad }) {
     if (!hasBeenLoaded) {
         hasBeenLoaded = true;
-        await Parser.init(moduleOptions);
+        const module = {
+            wasmBinary: await assetLoad('tree-sitter/web-tree-sitter.wasm'),
+        };
+        await Parser.init(module);
     }
     const parser = new ExtendedParser();
     const language = await Language.load(wasmUint8Array);

package/esm/extended/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/extended/parser.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,0EAA0E;AAC1E,gEAAgE;AAChE,mEAAmE;AACnE,mEAAmE;AACnE,4EAA4E;AAC5E,OAAO,oBAAoB,CAAC;AAC5B,OAAO,EACL,QAAQ,EAGR,MAAM,GAEP,MAAM,iBAAiB,CAAC;AAEzB,2CAA2C;AAC3C,MAAM,cAAe,SAAQ,MAAM;IACjC,gBAAgB,GAAG,KAAK,CAAC;IAEzB;;;;;;;;;;;;;;;OAeG;IACM,KAAK,CACZ,IAA4B,EAC5B,OAAoB,EACpB,OAAqB;QAErB,IAAI,OAAO,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CACV,yjBAAyjB,CAC1jB,CAAC;YACF,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC;QACD,wBAAwB;QACxB,0EAA0E;QAC1E,IAAI;QAEJ,IAAI,IAAI,GAAgB,IAAI,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YAC7B,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YAC1D,OAAO;YACP,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,IAAI,aAAa,GAAG,KAAK,CAAC;AAgB1B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,cAA0B,EAC1B,EAAE,gBAAgB,GAAG,KAAK,EAAE,aAAa,KAAc,EAAE;IAEzD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAEpB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,aAAa,GAAG,IAAI,CAAC;QACrB,MAAM,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/extended/parser.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAGR,MAAM,GAEP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,oBAAoB,CAAC;AAE5B,2CAA2C;AAC3C,MAAM,cAAe,SAAQ,MAAM;IACjC,gBAAgB,GAAG,KAAK,CAAC;IAEzB;;;;;;;;;;;;;;;OAeG;IACM,KAAK,CACZ,IAA4B,EAC5B,OAAoB,EACpB,OAAqB;QAErB,IAAI,OAAO,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CACV,yjBAAyjB,CAC1jB,CAAC;YACF,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC;QACD,wBAAwB;QACxB,0EAA0E;QAC1E,IAAI;QAEJ,IAAI,IAAI,GAAgB,IAAI,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YAC7B,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YAC1D,OAAO;YACP,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,IAAI,aAAa,GAAG,KAAK,CAAC;AAgB1B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,cAA0B,EAC1B,EAAE,gBAAgB,GAAG,KAAK,EAAE,SAAS,EAAW;IAEhD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,aAAa,GAAG,IAAI,CAAC;QACrB,MAAM,MAAM,GAAG;YACb,UAAU,EAAE,MAAM,SAAS,CAAC,kCAAkC,CAAC;SAChE,CAAC;QACF,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/esm/mod.d.ts

@@ -1,2 +1,3 @@
 export { createParser } from './extended/parser.js';
+export { Language, Node, Parser, Tree } from 'web-tree-sitter';
 //# sourceMappingURL=mod.d.ts.map

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC"}

package/esm/mod.js

@@ -1,2 +1,3 @@
 export { createParser } from './extended/parser.js';
+export { Language, Node, Parser, Tree } from 'web-tree-sitter';
 //# sourceMappingURL=mod.js.map

package/esm/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/tree-sitter",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "license": "MIT",
   "module": "./esm/mod.js",
   "exports": {
@@ -14,6 +14,7 @@
     "src"
   ],
   "dependencies": {
+    "@kerebron/editor": "0.6.6",
     "web-tree-sitter": "0.26.6"
   },
   "devDependencies": {

package/src/extended/parser.ts

@@ -1,10 +1,4 @@
-// import { Tree } from "../web-tree-sitter/src/tree.ts"
-// import { ParseOptions, Parser } from "../web-tree-sitter/src/parser.ts"
-// import { Language } from "../web-tree-sitter/src/language.ts"
-// import { ParseCallback } from "../web-tree-sitter/src/index.ts";
-// import { setModule } from '../web-tree-sitter/src/constants.ts';
-// import { MainModule } from '../web-tree-sitter/lib/web-tree-sitter.d.ts';
-import './node_extended.js';
+import { type AssetLoad } from '@kerebron/editor';
 import {
   Language,
   ParseCallback,
@@ -13,6 +7,8 @@ import {
   Tree,
 } from 'web-tree-sitter';
 
+import './node_extended.js';
+
 // this only exists to help with type hints
 class ExtendedParser extends Parser {
   disableSoftNodes = false;
@@ -75,18 +71,19 @@ let hasBeenLoaded = false;
  */
 interface Options {
   disableSoftNodes?: boolean;
-  moduleOptions?: Object;
+  assetLoad: AssetLoad;
 }
 
 export async function createParser(
   wasmUint8Array: Uint8Array,
-  { disableSoftNodes = false, moduleOptions }: Options = {},
+  { disableSoftNodes = false, assetLoad }: Options,
 ) {
-  await Parser.init();
-
   if (!hasBeenLoaded) {
     hasBeenLoaded = true;
-    await Parser.init(moduleOptions);
+    const module = {
+      wasmBinary: await assetLoad('tree-sitter/web-tree-sitter.wasm'),
+    };
+    await Parser.init(module);
   }
   const parser = new ExtendedParser();
   const language = await Language.load(wasmUint8Array);

package/src/mod.ts

@@ -1 +1,2 @@
 export { createParser } from './extended/parser.js';
+export { Language, Node, Parser, Tree } from 'web-tree-sitter';