Allow build subs parameter to accept objects (#35351)

This commit is contained in:
Alan Christopher Thomas 2019-05-14 16:02:53 -05:00 committed by Nathan Shively-Sanders
parent fd4c71f928
commit 2e56cef0c5
2 changed files with 5 additions and 2 deletions

View File

@ -49,7 +49,7 @@ declare namespace OuterXRegExp {
// begin API definitions
function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
function build(pattern: string, subs: string[], flags?: string): RegExp;
function build(pattern: string, subs: string[] | {[name: string]: RegExp}, flags?: string): RegExp;
function cache(pattern: string, flags?: string): RegExp;
function escape(str: string): string;
function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
@ -92,7 +92,7 @@ declare namespace OuterXRegExp {
// begin API definitions
function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
function build(pattern: string, subs: string[], flags?: string): RegExp;
function build(pattern: string, subs: string[] | {[name: string]: RegExp}, flags?: string): RegExp;
function cache(pattern: string, flags?: string): RegExp;
function escape(str: string): string;
function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;

View File

@ -22,6 +22,7 @@ var bool: boolean;
var strArr: string[];
var strArrArr: string[][];
var pattern: string;
var subs: { [name: string]: RegExp };
var flags: string;
var right: string;
var left: string;
@ -68,6 +69,8 @@ XRegExp.addToken(regex, (arr, scope) => {
regex = XRegExp.build(pattern, strArr, flags);
regex = XRegExp.build(pattern, strArr);
regex = XRegExp.build(pattern, subs, flags);
regex = XRegExp.build(pattern, subs);
regex = XRegExp.cache(pattern);
regex = XRegExp.cache(pattern, flags);