grammar-well 1.1.11 → 1.2.0

package/README.md

@@ -428,7 +428,7 @@ grammar: {{
         | section T_WS section_list : {{ [$0].concat($2) }}
 
     section ->
-        K_CONFIG _ L_COLON _ L_TEMPLATEL _ kv_list _ L_TEMPLATER : {{ { config: Object.assign(...$4) } }}
+        K_CONFIG _ L_COLON _ L_TEMPLATEL _ kv_list:list _ L_TEMPLATER : {{ { config: Object.assign(...$list) } }}
         | K_IMPORT _ L_STAR _ K_FROM __ T_WORD:import _ L_SCOLON : {{ { import: $import } }}
         | K_IMPORT _ L_STAR _ K_FROM __ T_STRING:import _ L_SCOLON : {{ { import: $import, path: true } }}
         | K_LEXER _ L_COLON _ L_TEMPLATEL _ lexer:lexer _ L_TEMPLATER : {{ { lexer: Object.assign(...$lexer) } }}

package/bootstrap.ts

@@ -10,7 +10,7 @@ const BaseDir = './src/grammars';
             console.log(fullpath(file))
             if (/\.gwell$/.test(file)) {
                 const json = await Compile(read(file), { template: 'json' });
-                const js = await Compile(read(file), { exportName: 'grammar', template: 'esmodule' });
+                const js = await Compile(read(file), { exportName: 'grammar', template: 'esmodule', overrides: {} });
                 write(file.replace(/.gwell$/, '.json'), json);
                 write(file.replace(/.gwell$/, '.js'), js);
             }

package/build/compiler/compiler.d.ts

@@ -2,7 +2,7 @@ import { CompileOptions, GrammarBuilderContext, TemplateFormat, LanguageDirectiv
 import { ESMOutput, JavascriptOutput } from "./outputs/javascript";
 import { TypescriptFormat } from "./outputs/typescript";
 import { JSONFormatter } from "./outputs/json";
-import { Generator } from "./generator";
+import { Generator } from "./generator/generator";
 declare const TemplateFormats: {
     _default: typeof JavascriptOutput;
     object: (grammar: any, exportName: any) => {

package/build/compiler/compiler.js

@@ -10,7 +10,7 @@ const json_1 = require("./outputs/json");
 const number = require("../grammars/number.json");
 const string = require("../grammars/string.json");
 const whitespace = require("../grammars/whitespace.json");
-const generator_1 = require("./generator");
+const generator_1 = require("./generator/generator");
 const BuiltInRegistry = {
     number,
     string,
@@ -31,6 +31,7 @@ const TemplateFormats = {
 async function Compile(rules, config = {}) {
     const builder = new GrammarBuilder(config);
     await builder.import(rules);
+    Object.assign(builder.generator.state.config, config.overrides);
     return builder.export(config.template);
 }
 exports.Compile = Compile;

package/build/compiler/compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}

package/build/compiler/generator/artifacts/lr.d.ts

@@ -0,0 +1,51 @@
+import { Generator } from "../generator";
+import { Dictionary, GeneratorGrammarRule, GeneratorGrammarSymbol } from "../../../typings";
+import { Collection, GeneratorSymbolCollection } from "../../../utility/general";
+export declare class LRParseTableBuilder {
+    generator: Generator;
+    rules: Collection<GeneratorGrammarRule>;
+    table: Dictionary<StateBuilder>;
+    symbols: GeneratorSymbolCollection;
+    constructor(generator: Generator);
+    addState(seed: StateItem[]): StateBuilder;
+    encodeRule(rule: GeneratorGrammarRule, dot: number): string;
+    encodeStateItems(seed: StateItem[]): string;
+    serialize(depth?: number): string;
+    serializeState(state: State, depth?: number): string;
+    serializeNext(next: Next, depth: number): string;
+}
+declare class StateBuilder {
+    private collection;
+    isFinal: boolean;
+    outputs: StateOut;
+    queue: {
+        [key: string]: StateItem[];
+    };
+    actions: Map<GeneratorGrammarSymbol, string>;
+    goto: Map<GeneratorGrammarSymbol, string>;
+    reduce?: GeneratorGrammarRule;
+    constructor(collection: LRParseTableBuilder, items: StateItem[]);
+    private closure;
+    serialize(): State;
+}
+interface State {
+    actions: Next[];
+    goto: {
+        [key: string]: string;
+    };
+    reduce: GeneratorGrammarRule;
+    isFinal: boolean;
+}
+type Next = {
+    symbol: GeneratorGrammarSymbol;
+    next: string;
+};
+type StateItem = {
+    rule: GeneratorGrammarRule;
+    dot: number;
+};
+interface StateOut {
+    action: Dictionary<StateItem[]>;
+    goto: Dictionary<StateItem[]>;
+}
+export {};

package/build/{utility → compiler/generator/artifacts}/lr.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LRStack = exports.CanonicalCollection = void 0;
-const parser_1 = require("../parser/parser");
-const general_1 = require("./general");
-class CanonicalCollection {
-    grammar;
+exports.LRParseTableBuilder = void 0;
+const generator_1 = require("../generator");
+const general_1 = require("../../../utility/general");
+class LRParseTableBuilder {
+    generator;
     rules = new general_1.Collection();
-    states = Object.create(null);
-    symbols = new general_1.SymbolCollection();
-    constructor(grammar) {
-        this.grammar = grammar;
-        const augmented = { name: Symbol(), symbols: [grammar.start] };
-        grammar.rules[augmented.name] = [augmented];
+    table = Object.create(null);
+    symbols = new general_1.GeneratorSymbolCollection();
+    constructor(generator) {
+        this.generator = generator;
+        const augmented = { name: Symbol(), symbols: [{ rule: generator.state.grammar.start }] };
+        generator.state.grammar.rules[augmented.name] = [augmented];
         this.addState([{ rule: augmented, dot: 0 }]);
     }
     addState(seed) {
         const id = this.encodeStateItems(seed);
-        if (id in this.states)
-            return this.states[id];
-        const state = new State(this, seed);
-        this.states[id] = state;
+        if (id in this.table)
+            return this.table[id];
+        const state = new StateBuilder(this, seed);
+        this.table[id] = state;
         for (const q in state.queue) {
             this.addState(state.queue[q]);
         }
@@ -31,9 +31,30 @@ class CanonicalCollection {
     encodeStateItems(seed) {
         return Array.from(new Set(seed)).map(v => this.encodeRule(v.rule, v.dot)).sort().join();
     }
+    serialize(depth = 0) {
+        const map = {};
+        for (const key in this.table) {
+            map[key] = this.serializeState(this.table[key].serialize(), depth + 1);
+        }
+        return generator_1.Generator.Pretty(map, depth);
+    }
+    serializeState(state, depth = 0) {
+        return generator_1.Generator.Pretty({
+            actions: state.actions.map(v => this.serializeNext(v, depth + 1)),
+            goto: generator_1.Generator.Pretty(state.goto, depth + 1),
+            reduce: state.reduce ? this.generator.serializeGrammarRule(state.reduce) : null,
+            isFinal: state.isFinal ? 'true' : 'false'
+        }, depth);
+    }
+    serializeNext(next, depth) {
+        return generator_1.Generator.Pretty({
+            symbol: generator_1.Generator.SerializeSymbol(next.symbol),
+            next: JSON.stringify(next.next)
+        }, -1);
+    }
 }
-exports.CanonicalCollection = CanonicalCollection;
-class State {
+exports.LRParseTableBuilder = LRParseTableBuilder;
+class StateBuilder {
     collection;
     isFinal = false;
     outputs = {
@@ -51,12 +72,7 @@ class State {
             this.closure(item.rule, item.dot, visited);
         }
         if (this.isFinal) {
-            if (items.length == 1 && visited.size < 1) {
-                this.reduce = items[0].rule;
-            }
-            else {
-                throw 'Conflict Detected';
-            }
+            this.reduce = items[0].rule;
         }
         for (const k in this.outputs.goto) {
             const seed = this.outputs.goto[k];
@@ -74,57 +90,36 @@ class State {
     closure(rule, dot, visited) {
         const isFinal = rule.symbols.length == dot;
         this.isFinal = isFinal || this.isFinal;
-        const { [dot]: symbol } = rule.symbols;
+        const symbol = rule.symbols[dot];
         if (isFinal || visited.has(symbol))
             return;
         visited.add(symbol);
         const stateItem = { rule, dot: dot + 1 };
-        if (parser_1.ParserUtility.SymbolIsTerminal(symbol)) {
+        if (generator_1.Generator.SymbolIsTerminal(symbol)) {
             const id = this.collection.symbols.encode(symbol);
             this.outputs.action[id] = this.outputs.action[id] || [];
             this.outputs.action[id].push(stateItem);
         }
         else {
             const id = this.collection.symbols.encode(symbol);
+            const name = typeof symbol === 'string' ? symbol : symbol.rule;
             this.outputs.goto[id] = this.outputs.goto[id] || [];
             this.outputs.goto[id].push(stateItem);
-            for (const rule of this.collection.grammar.rules[symbol]) {
+            for (const rule of this.collection.generator.state.grammar.rules[name]) {
                 this.closure(rule, 0, visited);
             }
         }
     }
-}
-class LRStack {
-    stack = [];
-    get current() {
-        return this.stack[this.stack.length - 1];
-    }
-    get previous() {
-        return this.stack[this.stack.length - 2];
-    }
-    shift(state) {
-        this.current.state = state;
-    }
-    reduce(rule) {
-        const n = new LRStackItem();
-        const l = rule.symbols.length;
-        n.children = this.stack.splice(l * -1, l);
-        n.children.forEach(v => delete v.state);
-        n.rule = rule;
-        n.symbol = rule.name;
-        this.stack.push(n);
-    }
-    add(symbol) {
-        this.stack.push(new LRStackItem());
-        this.current.symbol = symbol;
+    serialize() {
+        const actions = [];
+        const goto = {};
+        for (const [symbol, next] of this.actions) {
+            actions.push({ symbol, next });
+        }
+        for (const [symbol, next] of this.goto) {
+            goto[typeof symbol == 'object' ? symbol.rule : symbol] = JSON.stringify(next);
+        }
+        return { actions, goto, reduce: this.reduce, isFinal: this.isFinal };
     }
 }
-exports.LRStack = LRStack;
-class LRStackItem {
-    children = [];
-    state;
-    symbol;
-    rule;
-    value;
-}
 //# sourceMappingURL=lr.js.map

package/build/compiler/generator/artifacts/lr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lr.js","sourceRoot":"","sources":["../../../../src/compiler/generator/artifacts/lr.ts"],"names":[],"mappings":"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"}

package/build/compiler/generator/artifacts/standard.d.ts

@@ -0,0 +1,7 @@
+import { Generator } from "../generator";
+export declare class StandardGrammar {
+    private generator;
+    constructor(generator: Generator);
+    serialize(depth?: number): string;
+    private serializeGrammarRules;
+}

package/build/compiler/generator/artifacts/standard.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StandardGrammar = void 0;
+const generator_1 = require("../generator");
+class StandardGrammar {
+    generator;
+    constructor(generator) {
+        this.generator = generator;
+    }
+    serialize(depth = 0) {
+        if (!this.generator.state.grammar) {
+            return null;
+        }
+        return generator_1.Generator.Pretty({
+            start: JSON.stringify(this.generator.state.grammar.start),
+            rules: this.serializeGrammarRules(depth + 1)
+        }, depth);
+    }
+    serializeGrammarRules(depth = 0) {
+        const map = {};
+        for (const rule in this.generator.state.grammar.rules) {
+            map[rule] = this.generator.state.grammar.rules[rule].map(v => this.generator.serializeGrammarRule(v));
+        }
+        return generator_1.Generator.Pretty(map, depth);
+    }
+}
+exports.StandardGrammar = StandardGrammar;
+//# sourceMappingURL=standard.js.map

package/build/compiler/generator/artifacts/standard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"standard.js","sourceRoot":"","sources":["../../../../src/compiler/generator/artifacts/standard.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,eAAe;IAEJ;IAApB,YAAoB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAI,CAAC;IAE7C,SAAS,CAAC,QAAgB,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE;YAC/B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,qBAAS,CAAC,MAAM,CAAC;YACpB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACzD,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,KAAK,GAAG,CAAC,CAAC;SAC/C,EAAE,KAAK,CAAC,CAAC;IACd,CAAC;IAEO,qBAAqB,CAAC,QAAgB,CAAC;QAC3C,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE;YACnD,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAA;SACxG;QACD,OAAO,qBAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CAEJ;AAtBD,0CAsBC"}

package/build/compiler/generator/generator.d.ts

@@ -0,0 +1,24 @@
+import { Dictionary, GeneratorState, GeneratorGrammarRule, GeneratorGrammarSymbol, LexerStateDefinition } from "../../typings";
+export declare class Generator {
+    state: GeneratorState;
+    serializeHead(): string;
+    serializeBody(): string;
+    serializeLanguage(depth?: number): string;
+    merge(state: GeneratorState): void;
+    grammarUUID(name: string): string;
+    addGrammarRule(rule: GeneratorGrammarRule): void;
+    addLexerState(state: LexerStateDefinition): void;
+    serializePostProcess(postprocess: GeneratorGrammarRule['postprocess'], alias: Dictionary<number>): any;
+    private templatePostProcess;
+    private serializeLexerConfig;
+    private serializeLexerConfigStates;
+    private serializeLexerConfigStateRules;
+    serializeGrammarRule(rule: GeneratorGrammarRule): string;
+    static NewLine(depth: number): string;
+    static Pretty(obj: string[] | {
+        [key: string]: string | (string[]);
+    }, depth?: number): string;
+    static IsVal(value: any): boolean;
+    static SerializeSymbol(s: GeneratorGrammarSymbol): string;
+    static SymbolIsTerminal(s: GeneratorGrammarSymbol): boolean;
+}

package/build/compiler/{generator.js → generator/generator.js}

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Generator = void 0;
+const lr_1 = require("./artifacts/lr");
+const standard_1 = require("./artifacts/standard");
 const PostProcessors = {
     "join": "({data}) => data.join('')",
     "concat": "({data}) => data[0].concat([data[1]])",
@@ -32,9 +34,19 @@ class Generator {
         return this.state.body.join('\n');
     }
     serializeLanguage(depth = 0) {
-        return this.pretty({
-            grammar: this.serializeGrammar(depth + 1),
-            lexer: this.serializeLexerConfig(depth + 1)
+        const serialier = new standard_1.StandardGrammar(this);
+        let lr = null;
+        if ('lr' in this.state.config) {
+            const table = new lr_1.LRParseTableBuilder(this);
+            lr = Generator.Pretty({
+                k: "0",
+                table: table.serialize(depth + 2)
+            }, depth + 1);
+        }
+        return Generator.Pretty({
+            grammar: serialier.serialize(depth + 1),
+            lexer: this.serializeLexerConfig(depth + 1),
+            lr
         }, depth);
     }
     merge(state) {
@@ -70,60 +82,6 @@ class Generator {
         target.unmatched = typeof state.unmatched == 'string' ? state.unmatched : target.unmatched;
         target.rules.push(...state.rules);
     }
-    serializeGrammar(depth = 0) {
-        if (!this.state.grammar) {
-            return null;
-        }
-        return this.pretty({
-            start: JSON.stringify(this.state.grammar.start),
-            rules: this.serializeGrammarRules(depth + 1)
-        }, depth);
-    }
-    serializeGrammarRules(depth = 0) {
-        const map = {};
-        for (const rule in this.state.grammar.rules) {
-            map[rule] = this.state.grammar.rules[rule].map(v => this.serializeGrammarRule(v));
-        }
-        return this.pretty(map, depth);
-    }
-    serializeSymbol(s) {
-        if (typeof s === 'string') {
-            return JSON.stringify(s);
-        }
-        else if ('rule' in s) {
-            return JSON.stringify(s.rule);
-        }
-        else if ('regex' in s) {
-            return `/${s.regex}/${s.flags || ''}`;
-        }
-        else if ('token' in s) {
-            return `{ token: ${JSON.stringify(s.token)} }`;
-        }
-        else if ('literal' in s) {
-            return `{ literal: ${JSON.stringify(s.literal)} }`;
-        }
-        else if ('js' in s) {
-            return s.js;
-        }
-        else {
-            return JSON.stringify(s);
-        }
-    }
-    serializeGrammarRule(rule) {
-        const symbols = [];
-        const alias = {};
-        for (let i = 0; i < rule.symbols.length; i++) {
-            symbols.push(this.serializeSymbol(rule.symbols[i]));
-            if (rule.symbols[i].alias) {
-                alias[rule.symbols[i].alias] = i;
-            }
-        }
-        return this.pretty({
-            name: JSON.stringify(rule.name),
-            symbols: this.pretty(symbols, -1),
-            postprocess: this.serializePostProcess(rule.postprocess, alias)
-        }, -1);
-    }
     serializePostProcess(postprocess, alias) {
         postprocess = this.state.grammar.config.postprocessorOverride || postprocess || this.state.grammar.config.postprocessorDefault;
         if (!postprocess)
@@ -150,7 +108,7 @@ class Generator {
             return null;
         if (typeof this.state.lexer === 'string')
             return this.state.lexer;
-        return this.pretty({
+        return Generator.Pretty({
             start: JSON.stringify(this.state.lexer.start),
             states: this.serializeLexerConfigStates(depth + 1)
         }, depth);
@@ -159,21 +117,21 @@ class Generator {
         const map = {};
         for (const key in this.state.lexer.states) {
             const state = this.state.lexer.states[key];
-            map[state.name] = this.pretty({
+            map[state.name] = Generator.Pretty({
                 name: JSON.stringify(state.name),
                 default: state.default ? JSON.stringify(state.default) : null,
                 unmatched: state.unmatched ? JSON.stringify(state.unmatched) : null,
                 rules: this.serializeLexerConfigStateRules(state.rules, depth + 2)
             }, depth + 1);
         }
-        return this.pretty(map, depth);
+        return Generator.Pretty(map, depth);
     }
     serializeLexerConfigStateRules(rules, depth) {
         const ary = rules.map(rule => {
             if ('import' in rule)
-                return this.pretty({ import: JSON.stringify(rule.import) }, -1);
-            return this.pretty({
-                when: this.serializeSymbol(rule.when),
+                return Generator.Pretty({ import: JSON.stringify(rule.import) }, -1);
+            return Generator.Pretty({
+                when: Generator.SerializeSymbol(rule.when),
                 type: JSON.stringify(rule.type),
                 tag: JSON.stringify(rule.tag),
                 pop: JSON.stringify(rule.pop),
@@ -183,36 +141,74 @@ class Generator {
                 goto: JSON.stringify(rule.goto),
             }, -1);
         });
-        return this.pretty(ary, depth);
+        return Generator.Pretty(ary, depth);
+    }
+    serializeGrammarRule(rule) {
+        const symbols = [];
+        const alias = {};
+        for (let i = 0; i < rule.symbols.length; i++) {
+            symbols.push(Generator.SerializeSymbol(rule.symbols[i]));
+            if (rule.symbols[i].alias) {
+                alias[rule.symbols[i].alias] = i;
+            }
+        }
+        return Generator.Pretty({
+            name: JSON.stringify(rule.name),
+            symbols: Generator.Pretty(symbols, -1),
+            postprocess: this.serializePostProcess(rule.postprocess, alias)
+        }, -1);
     }
-    newLine(depth) {
+    static NewLine(depth) {
         return '\n' + ' '.repeat(depth * 4);
     }
-    pretty(obj, depth = 0) {
+    static Pretty(obj, depth = 0) {
         if (Array.isArray(obj)) {
             let r = `[`;
             for (let i = 0; i < obj.length; i++) {
                 const value = obj[i];
-                r += `${depth >= 0 ? this.newLine(depth + 1) : ' '}${value}${(this.isVal(obj[i + 1]) ? ',' : '')}`;
+                r += `${depth >= 0 ? Generator.NewLine(depth + 1) : ' '}${value}${(Generator.IsVal(obj[i + 1]) ? ',' : '')}`;
             }
-            r += `${depth >= 0 ? this.newLine(depth) : ' '}]`;
+            r += `${depth >= 0 ? Generator.NewLine(depth) : ' '}]`;
             return r;
         }
         let r = `{`;
-        const keys = Object.keys(obj).filter(v => this.isVal(obj[v]));
-        const prefix = depth >= 0 ? this.newLine(depth + 1) : ' ';
+        const keys = Object.keys(obj).filter(v => Generator.IsVal(obj[v]));
+        const prefix = depth >= 0 ? Generator.NewLine(depth + 1) : ' ';
         for (let i = 0; i < keys.length; i++) {
-            const key = /[a-z_][a-z\d_$]*/i.test(keys[i]) ? keys[i] : keys[i];
-            const value = Array.isArray(obj[keys[i]]) ? this.pretty(obj[keys[i]], depth >= 0 ? depth + 1 : -1) : obj[keys[i]];
-            const suffix = (this.isVal(obj[keys[i + 1]]) ? ',' : '');
+            const key = /[a-z_][a-z\d_$]*/i.test(keys[i]) ? keys[i] : JSON.stringify(keys[i]);
+            const value = Array.isArray(obj[keys[i]]) ? Generator.Pretty(obj[keys[i]], depth >= 0 ? depth + 1 : -1) : obj[keys[i]];
+            const suffix = (Generator.IsVal(obj[keys[i + 1]]) ? ',' : '');
             r += `${prefix}${key}: ${value}${suffix}`;
         }
-        r += `${depth >= 0 ? this.newLine(depth) : ' '}}`;
+        r += `${depth >= 0 ? Generator.NewLine(depth) : ' '}}`;
         return r;
     }
-    isVal(value) {
+    static IsVal(value) {
         return typeof value !== 'undefined' && value !== null;
     }
+    static SerializeSymbol(s) {
+        if (typeof s === 'string') {
+            return JSON.stringify(s);
+        }
+        else if ('rule' in s) {
+            return JSON.stringify(s.rule);
+        }
+        else if ('regex' in s) {
+            return `/${s.regex}/${s.flags || ''}`;
+        }
+        else if ('token' in s) {
+            return `{ token: ${JSON.stringify(s.token)} }`;
+        }
+        else if ('literal' in s) {
+            return `{ literal: ${JSON.stringify(s.literal)} }`;
+        }
+        else {
+            return JSON.stringify(s);
+        }
+    }
+    static SymbolIsTerminal(s) {
+        return !(typeof s === 'string' || 'rule' in s);
+    }
 }
 exports.Generator = Generator;
 //# sourceMappingURL=generator.js.map

package/build/compiler/generator/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/compiler/generator/generator.ts"],"names":[],"mappings":"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"}

package/build/compiler/outputs/javascript.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from "../generator";
+import { Generator } from "../generator/generator";
 export declare function JavascriptOutput(generator: Generator, exportName: string): string;
 export declare function ESMOutput(generator: Generator, exportName: string): string;

package/build/compiler/outputs/json.d.ts

@@ -1,2 +1,2 @@
-import { Generator } from "../generator";
+import { Generator } from "../generator/generator";
 export declare function JSONFormatter(generator: Generator, exportName: any): string;

package/build/compiler/outputs/typescript.d.ts

@@ -1,2 +1,2 @@
-import { Generator } from "../generator";
+import { Generator } from "../generator/generator";
 export declare function TypescriptFormat(generator: Generator, exportName: string): string;