From ae738c3c0f02557960c9c45b3bbac6f8ccb292f3 Mon Sep 17 00:00:00 2001
From: Andrew Hlynskyi <ahlincq@gmail.com>
Date: Tue, 24 Jan 2023 14:25:29 +0200
Subject: [PATCH 1/2] fix(dsl): add support for rule refs to externals

---
 cli/npm/dsl.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/npm/dsl.d.ts b/cli/npm/dsl.d.ts
index fdf43b55..316400f8 100644
--- a/cli/npm/dsl.d.ts
+++ b/cli/npm/dsl.d.ts
@@ -102,7 +102,7 @@ interface Grammar<
   externals?: (
     $: Record<string, SymbolRule<string>>,
     previous: Rule[],
-  ) => SymbolRule<string>[];
+  ) => (SymbolRule<string> | RegExp | string)[];
 
   /**
    * An array of tokens that may appear anywhere in the language. This

From 8c6d157ca571460bef2220512e9721e65261a12f Mon Sep 17 00:00:00 2001
From: Andrew Hlynskyi <ahlincq@gmail.com>
Date: Sat, 11 Mar 2023 11:08:38 +0200
Subject: [PATCH 2/2] fix(dsl): fix formatting

---
 cli/npm/dsl.d.ts | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/cli/npm/dsl.d.ts b/cli/npm/dsl.d.ts
index 316400f8..78b654f3 100644
--- a/cli/npm/dsl.d.ts
+++ b/cli/npm/dsl.d.ts
@@ -1,19 +1,19 @@
-type AliasRule = {type: 'ALIAS'; named: boolean; content: Rule; value: string};
-type BlankRule = {type: 'BLANK'};
-type ChoiceRule = {type: 'CHOICE'; members: Rule[]};
-type FieldRule = {type: 'FIELD'; name: string; content: Rule};
-type ImmediateTokenRule = {type: 'IMMEDIATE_TOKEN'; content: Rule};
-type PatternRule = {type: 'PATTERN'; value: string};
-type PrecDynamicRule = {type: 'PREC_DYNAMIC'; content: Rule; value: number};
-type PrecLeftRule = {type: 'PREC_LEFT'; content: Rule; value: number};
-type PrecRightRule = {type: 'PREC_RIGHT'; content: Rule; value: number};
-type PrecRule = {type: 'PREC'; content: Rule; value: number};
-type Repeat1Rule = {type: 'REPEAT1'; content: Rule};
-type RepeatRule = {type: 'REPEAT'; content: Rule};
-type SeqRule = {type: 'SEQ'; members: Rule[]};
-type StringRule = {type: 'STRING'; value: string};
-type SymbolRule<Name extends string> = {type: 'SYMBOL'; name: Name};
-type TokenRule = {type: 'TOKEN'; content: Rule};
+type AliasRule = { type: 'ALIAS'; named: boolean; content: Rule; value: string };
+type BlankRule = { type: 'BLANK' };
+type ChoiceRule = { type: 'CHOICE'; members: Rule[] };
+type FieldRule = { type: 'FIELD'; name: string; content: Rule };
+type ImmediateTokenRule = { type: 'IMMEDIATE_TOKEN'; content: Rule };
+type PatternRule = { type: 'PATTERN'; value: string };
+type PrecDynamicRule = { type: 'PREC_DYNAMIC'; content: Rule; value: number };
+type PrecLeftRule = { type: 'PREC_LEFT'; content: Rule; value: number };
+type PrecRightRule = { type: 'PREC_RIGHT'; content: Rule; value: number };
+type PrecRule = { type: 'PREC'; content: Rule; value: number };
+type Repeat1Rule = { type: 'REPEAT1'; content: Rule };
+type RepeatRule = { type: 'REPEAT'; content: Rule };
+type SeqRule = { type: 'SEQ'; members: Rule[] };
+type StringRule = { type: 'STRING'; value: string };
+type SymbolRule<Name extends string> = { type: 'SYMBOL'; name: Name };
+type TokenRule = { type: 'TOKEN'; content: Rule };
 
 type Rule =
   | AliasRule
@@ -48,8 +48,8 @@ type RuleBuilders<
   RuleName extends string,
   BaseGrammarRuleName extends string
 > = {
-  [name in RuleName]: RuleBuilder<RuleName | BaseGrammarRuleName>;
-};
+    [name in RuleName]: RuleBuilder<RuleName | BaseGrammarRuleName>;
+  };
 
 interface Grammar<
   RuleName extends string,
@@ -153,8 +153,8 @@ interface Grammar<
 
 type GrammarSchema<RuleName extends string> = {
   [K in keyof Grammar<RuleName>]: K extends 'rules'
-    ? Record<RuleName, Rule>
-    : Grammar<RuleName>[K];
+  ? Record<RuleName, Rule>
+  : Grammar<RuleName>[K];
 };
 
 /**