@tabnas/proto 0.6.3 → 0.6.4

package/dist/proto.d.ts

@@ -5,16 +5,13 @@ export interface ProtoOptions {
     version: null | ProtoVersion;
     reconcile: boolean;
 }
-type AnyTabnas = Tabnas & {
-    abnf?: Function;
-};
 declare const Proto: {
-    (tn: AnyTabnas, options?: Partial<ProtoOptions>): void;
+    (tn: Tabnas, options?: Partial<ProtoOptions>): void;
     defaults: ProtoOptions;
 };
 declare function toDescriptor(cst: any, options?: Partial<ProtoOptions>): FileDescriptorProto;
 declare function parse(src: string, options?: Partial<ProtoOptions>): FileDescriptorProto;
-declare const VERSION = "0.6.3";
+declare const VERSION = "0.6.4";
 export { Proto, parse, toDescriptor, VERSION };
 export type { ProtoVersion };
 export * from './descriptor';

package/dist/proto.js

@@ -14,6 +14,9 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = exports.Proto = void 0;
 exports.parse = parse;
@@ -23,39 +26,32 @@ exports.toDescriptor = toDescriptor;
 // JSON. The version is auto-detected from the file's `syntax`/`edition`
 // declaration and/or supplied via the `version` option.
 const parser_1 = require("@tabnas/parser");
-const abnf_1 = require("@tabnas/abnf");
-const grammar_1 = require("./grammar");
+// The grammar, compiled at build time from proto-grammar/*.abnf by `npm
+// run gen-grammar` (gen-grammar.js). Generated: never edit it.
+const proto_grammar_json_1 = __importDefault(require("./proto-grammar.json"));
 const build_descriptor_1 = require("./build-descriptor");
 const aggregate_1 = require("./aggregate");
 const detect_version_1 = require("./detect-version");
+// The engine's GrammarSpec type describes a match token as a RegExp; the
+// serialized form carries it as an `@~/…/` string, which `tn.grammar()`
+// resolves on install. Hence the cast.
+const COMPILED = proto_grammar_json_1.default;
 // The Tabnas plugin: installs the union proto grammar so the engine can
 // parse `.proto` source into a `{rule, src, kids}` CST. Use the exported
 // `parse()` / `toDescriptor()` to turn that CST into a FileDescriptorProto.
 const Proto = ((tn, _options) => {
-    // Proto drives parsing through @tabnas/abnf; ensure it is installed.
-    if ('function' !== typeof tn.abnf)
-        tn.use(abnf_1.abnf);
-    // The grammar admits every keyword as an identifier, which a compiler
-    // without `tokenClasses` expands into millions of alternates
-    // (tabnas/bnf#71) and never finishes installing. Probe the installed
-    // compiler with a three-token grammar first, so an old @tabnas/bnf
-    // fails here, at once and by name, rather than hanging.
-    const probe = tn.abnf.toSpec('s = a a\na = "x" / "y"\n', { tag: 'proto', start: 's', tokenClasses: true });
-    if (!probe?.options?.tokenSet?.a) {
-        throw new Error('@tabnas/proto: the installed @tabnas/bnf does not ' +
-            'support tokenClasses; upgrade @tabnas/bnf (tabnas/bnf#74)');
-    }
-    // `wordKeywords` makes a keyword match as a whole word; `tokenClasses`
-    // compiles `ident` (an identifier or any keyword) to one engine token
-    // set, so a lookahead position peeks it as one token rather than one
-    // alternate per keyword. Both are required: see AGENTS.md.
-    ;
-    tn.abnf(grammar_1.grammarText, {
-        tag: 'proto',
-        start: 'proto',
-        wordKeywords: true,
-        tokenClasses: true,
-    });
+    // The union grammar, compiled. gen-grammar.js ran @tabnas/abnf over the
+    // union text (src/grammar.ts) at build time, with the options this
+    // plugin used to pass at every install: `wordKeywords` makes a keyword
+    // match as a whole word, and `tokenClasses` compiles `ident` (an
+    // identifier or any keyword) to one engine token set, so a lookahead
+    // position peeks it as one token rather than one alternate per keyword;
+    // both are required (see AGENTS.md). The compiler wrote the CST
+    // builders as the engine's own `@node$` / `@capture$` / `@bubble$`
+    // builtins, so the file is pure data and installing it loads no
+    // compiler. The engine installs a copy: the imported object is shared,
+    // and nothing writes to it.
+    tn.grammar(COMPILED);
     // An aggregate value (`option (f) = { a: 1 };`) is recorded as the text
     // between its braces, which the CST's `src` does not keep: the lexer
     // drops whitespace and comments. This action reads it from the source
@@ -85,7 +81,7 @@ function parse(src, options) {
 // VERSION is this package's version. It MUST equal package.json "version":
 // the release orchestrator rewrites both, and test/version.test.ts fails the
 // build if they drift. Mirrors `const VERSION` in go/proto.go.
-const VERSION = '0.6.3';
+const VERSION = '0.6.4';
 exports.VERSION = VERSION;
 __exportStar(require("./descriptor"), exports);
 //# sourceMappingURL=proto.js.map

package/dist/proto.js.map

@@ -1 +1 @@
-{"version":3,"file":"proto.js","sourceRoot":"","sources":["../src/proto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proto.js","sourceRoot":"","sources":["../src/proto.ts"],"names":[],"mappings":";AAAA,2EAA2E;;;;;;;;;;;;;;;;;;;;QAwF3D,KAAK;QAAE,YAAY;AAtFnC,wEAAwE;AACxE,0EAA0E;AAC1E,wEAAwE;AACxE,wDAAwD;AAExD,2CAAuC;AAGvC,wEAAwE;AACxE,+DAA+D;AAC/D,8EAAkD;AAClD,yDAA8C;AAC9C,2CAA6C;AAC7C,qDAEyB;AAYzB,yEAAyE;AACzE,wEAAwE;AACxE,uCAAuC;AACvC,MAAM,QAAQ,GAAG,4BAAyC,CAAA;AAE1D,wEAAwE;AACxE,yEAAyE;AACzE,4EAA4E;AAC5E,MAAM,KAAK,GAAG,CAAC,CAAC,EAAU,EAAE,QAAgC,EAAE,EAAE;IAC9D,wEAAwE;IACxE,mEAAmE;IACnE,uEAAuE;IACvE,iEAAiE;IACjE,qEAAqE;IACrE,wEAAwE;IACxE,gEAAgE;IAChE,mEAAmE;IACnE,gEAAgE;IAChE,uEAAuE;IACvE,4BAA4B;IAC5B,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACpB,wEAAwE;IACxE,qEAAqE;IACrE,sEAAsE;IACtE,0DAA0D;IAC1D,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,2BAAe,CAAC,CAAC,CAAA;AAC1D,CAAC,CAGA,CAAA;QA8BQ,KAAK;AA5Bd,KAAK,CAAC,QAAQ,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;AAEnD,oEAAoE;AACpE,gEAAgE;AAChE,SAAS,YAAY,CAAC,GAAQ,EAAE,OAA+B;IAC7D,MAAM,IAAI,GAAiB,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAA;IACpE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;IAC7E,MAAM,QAAQ,GACZ,KAAK,IAAI,iBAAiB,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gCAAe,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC3E,MAAM,OAAO,GAAG,IAAA,+BAAc,EAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACtE,OAAO,IAAA,4BAAS,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AAChC,CAAC;AAED,0EAA0E;AAC1E,2EAA2E;AAC3E,0DAA0D;AAC1D,sCAAsC;AACtC,SAAS,KAAK,CAAC,GAAW,EAAE,OAA+B;IACzD,MAAM,EAAE,GAAG,IAAI,eAAM,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACpD,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAClB,OAAO,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC;AAED,2EAA2E;AAC3E,6EAA6E;AAC7E,+DAA+D;AAC/D,MAAM,OAAO,GAAG,OAAO,CAAA;QAEc,OAAO;AAE5C,+CAA4B"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"7.0.2","root":["../src/aggregate.ts","../src/build-descriptor.ts","../src/descriptor.ts","../src/detect-version.ts","../src/grammar.ts","../src/proto.ts"],"packageJsons":["../node_modules/@tabnas/abnf/package.json","../node_modules/@tabnas/bnf/package.json","../node_modules/@tabnas/parser/package.json","../package.json"],"missingPackageJsons":["../node_modules/@tabnas/abnf/dist/package.json","../node_modules/@tabnas/bnf/dist/package.json","../node_modules/@tabnas/parser/dist/package.json"]}
+{"version":"7.0.2","root":["../src/aggregate.ts","../src/build-descriptor.ts","../src/descriptor.ts","../src/detect-version.ts","../src/grammar.ts","../src/proto.ts"],"packageJsons":["../node_modules/@tabnas/parser/package.json","../package.json"],"missingPackageJsons":["../node_modules/@tabnas/parser/dist/package.json"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tabnas/proto",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Parse Protocol Buffers .proto IDL (proto2, proto3, edition 2023/2024) into FileDescriptorProto-shaped JSON, using the Tabnas parser and an ABNF grammar.",
   "main": "dist/proto.js",
   "type": "commonjs",
@@ -32,6 +32,7 @@
     "pretest-watch": "npm run build",
     "test-watch": "node --test --watch dist-test/proto.test.js",
     "embed": "node embed-grammar.js",
+    "gen-grammar": "node gen-grammar.js",
     "example": "node examples/wire-poc/demo.js",
     "preexample-test": "npm run build",
     "example-test": "node --test examples/wire-poc/codec.test.js",
@@ -54,7 +55,6 @@
     "LICENSE"
   ],
   "peerDependencies": {
-    "@tabnas/abnf": ">=0.4.16",
     "@tabnas/parser": ">=0.12.8"
   },
   "devDependencies": {