change indentation to 2 spaces

Author: sertonix

package-lock.json

@@ -1,26 +1,26 @@
 {
-    "name": "typed-regexp",
-    "version": "1.0.3",
-    "description": "Adds type checks for regular expressions.",
-    "main": "src/index.js",
-    "types": "src/index.d.ts",
-    "scripts": {
-        "test": "tsc"
-    },
-    "keywords": [
-        "regex",
-        "regexp",
-        "typesafe",
-        "type-safe",
-        "typescript"
-    ],
-    "author": "Sertonix",
-    "license": "MIT",
-    "repository": "https://github.com/Sertonix/typed-regexp",
-    "devDependencies": {
-        "typescript": "^4.9.4"
-    },
-    "files": [
-        "src/**/*"
-    ]
+  "name": "typed-regexp",
+  "version": "1.0.3",
+  "description": "Adds type checks for regular expressions.",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
+  "scripts": {
+    "test": "tsc"
+  },
+  "keywords": [
+    "regex",
+    "regexp",
+    "typesafe",
+    "type-safe",
+    "typescript"
+  ],
+  "author": "Sertonix",
+  "license": "MIT",
+  "repository": "https://github.com/Sertonix/typed-regexp",
+  "devDependencies": {
+    "typescript": "^4.9.4"
+  },
+  "files": [
+    "src/**/*"
+  ]
 }

package.json

@@ -10,69 +10,69 @@ type Groups = string[];
 type NamedGroups = undefined | { [key: string]: string };
 
 export type TypedRegExpMatchArray<TGroups extends Groups = Groups, TNamedGroups extends NamedGroups = NamedGroups, TInputString extends string = string> = {
-    index?: number;
-    input?: TInputString;
-    groups: TNamedGroups;
+  index?: number;
+  input?: TInputString;
+  groups: TNamedGroups;
 } & ( [string,...TGroups] & IntersectedArray<string,TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString>> );
 
 export type TypedRegExpExecArray<TGroups extends Groups = Groups, TNamedGroups extends NamedGroups = NamedGroups, TInputString extends string = string> = TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString> & {
-    index: number;
-    input: TInputString;
+  index: number;
+  input: TInputString;
 };
 
 export interface TypedRegExp<
-    TGroups extends Groups = Groups,
-    TNamedGroups extends NamedGroups = NamedGroups,
-    TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos,
+  TGroups extends Groups = Groups,
+  TNamedGroups extends NamedGroups = NamedGroups,
+  TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos,
 > extends RegExp {
-    exec<TInputString extends string, TMatches extends boolean = boolean>(string: TInputString): If<TMatches,TypedRegExpExecArray<TGroups,TNamedGroups,TInputString>,null>;
-    readonly dotAll: HasFlag<TFlagCombo,"d">;
-    readonly global: HasFlag<TFlagCombo,"g">;
-    readonly ignoreCase: HasFlag<TFlagCombo,"i">;
-    readonly multiline: HasFlag<TFlagCombo,"m">;
-    readonly unicode: HasFlag<TFlagCombo,"u">;
-    readonly sticky: HasFlag<TFlagCombo,"y">;
-    readonly flags: SortRegExpFlags<TFlagCombo>;
-    // this method is restricted to return a sub type so that the type safety is kept
-    compile< TNewGroups extends TGroups = TGroups, TNewNamedGroups extends TNamedGroups = TNamedGroups, NewFlagCombo extends TFlagCombo = TFlagCombo >(pattern: string, flags?: NewFlagCombo): this & TypedRegExp<TNewGroups,TNewNamedGroups,NewFlagCombo>;
-    [Symbol.match]<TInputString extends string, TMatches extends boolean = boolean>(string: TInputString): If<TMatches,TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString>,null>;
-    [Symbol.replace](string: string, replaceValue: string): string;
-    [Symbol.replace](string: string, replacer: (substring: string, ...args: [...TGroups,number,string,...(undefined extends TNamedGroups ? [] : [TNamedGroups])]) => string): string;
-    [Symbol.matchAll]<TInputString extends string>(str: TInputString): IterableIterator<TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString>>;
+  exec<TInputString extends string, TMatches extends boolean = boolean>(string: TInputString): If<TMatches,TypedRegExpExecArray<TGroups,TNamedGroups,TInputString>,null>;
+  readonly dotAll: HasFlag<TFlagCombo,"d">;
+  readonly global: HasFlag<TFlagCombo,"g">;
+  readonly ignoreCase: HasFlag<TFlagCombo,"i">;
+  readonly multiline: HasFlag<TFlagCombo,"m">;
+  readonly unicode: HasFlag<TFlagCombo,"u">;
+  readonly sticky: HasFlag<TFlagCombo,"y">;
+  readonly flags: SortRegExpFlags<TFlagCombo>;
+  // this method is restricted to return a sub type so that the type safety is kept
+  compile< TNewGroups extends TGroups = TGroups, TNewNamedGroups extends TNamedGroups = TNamedGroups, NewFlagCombo extends TFlagCombo = TFlagCombo >(pattern: string, flags?: NewFlagCombo): this & TypedRegExp<TNewGroups,TNewNamedGroups,NewFlagCombo>;
+  [Symbol.match]<TInputString extends string, TMatches extends boolean = boolean>(string: TInputString): If<TMatches,TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString>,null>;
+  [Symbol.replace](string: string, replaceValue: string): string;
+  [Symbol.replace](string: string, replacer: (substring: string, ...args: [...TGroups,number,string,...(undefined extends TNamedGroups ? [] : [TNamedGroups])]) => string): string;
+  [Symbol.matchAll]<TInputString extends string>(str: TInputString): IterableIterator<TypedRegExpMatchArray<TGroups,TNamedGroups,TInputString>>;
 }
 
 export declare const TypedRegExp: TypedRegExpConstructor;
 
 type RegExpConstructor = typeof RegExp;
 interface TypedRegExpConstructor extends RegExpConstructor {
-    new (): TypedRegExp<[],{},"">;
-    new <TGroups extends Groups, TNamedGroups extends NamedGroups>(pattern: string): TypedRegExp<TGroups,TNamedGroups,"">;
-    new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: string, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups>, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    <TGroups extends Groups, TNamedGroups extends NamedGroups>(pattern: string): TypedRegExp<TGroups,TNamedGroups,"">;
-    <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: string, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups>, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
-    readonly prototype: TypedRegExp;
-    readonly [Symbol.species]: TypedRegExpConstructor;
+  new (): TypedRegExp<[],{},"">;
+  new <TGroups extends Groups, TNamedGroups extends NamedGroups>(pattern: string): TypedRegExp<TGroups,TNamedGroups,"">;
+  new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: string, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  new <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups>, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  <TGroups extends Groups, TNamedGroups extends NamedGroups>(pattern: string): TypedRegExp<TGroups,TNamedGroups,"">;
+  <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: string, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  <TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos>(pattern: TypedRegExp<TGroups,TNamedGroups>, flags: TFlagCombo): TypedRegExp<TGroups,TNamedGroups,TFlagCombo>;
+  readonly prototype: TypedRegExp;
+  readonly [Symbol.species]: TypedRegExpConstructor;
 }
 
 /** @experimental This class is intended to prevent overloads from the default string methods. */
 export interface TypedRegExpString extends Omit<String,"match"|"matchAll"|"replace"|"replaceAll"> /* excludes the old properties to prevent overloads */ {
-    // IDEA use return value from the Regexp[Symbol.match] etc. definitions
-    // IDEA pass this as string to matches
+  // IDEA use return value from the Regexp[Symbol.match] etc. definitions
+  // IDEA pass this as string to matches
+  match<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos, TMatches extends boolean = boolean>(regexp: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): If<TMatches,TypedRegExpMatchArray<TGroups,TNamedGroups>,null>;
+  matchAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(regexp: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): IterableIterator<TypedRegExpMatchArray<TGroups,TNamedGroups>>;
+  replace<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
+  replaceAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
+}
+
+declare global {
+  interface String {
     match<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos, TMatches extends boolean = boolean>(regexp: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): If<TMatches,TypedRegExpMatchArray<TGroups,TNamedGroups>,null>;
     matchAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(regexp: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): IterableIterator<TypedRegExpMatchArray<TGroups,TNamedGroups>>;
     replace<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
     replaceAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
-}
-
-declare global {
-    interface String {
-        match<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos, TMatches extends boolean = boolean>(regexp: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): If<TMatches,TypedRegExpMatchArray<TGroups,TNamedGroups>,null>;
-        matchAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(regexp: TypedRegExp<TGroups,TNamedGroups,TFlagCombo>): IterableIterator<TypedRegExpMatchArray<TGroups,TNamedGroups>>;
-        replace<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos = RegExpFlagCombos>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
-        replaceAll<TGroups extends Groups, TNamedGroups extends NamedGroups, TFlagCombo extends RegExpFlagCombos<{g:true}> = RegExpFlagCombos<{g:true}>>(searchValue: string | TypedRegExp<TGroups,TNamedGroups,TFlagCombo>, replacer: (substring: string, ...args: [...TGroups,number,string,...(keyof TNamedGroups extends never ? [] : [TNamedGroups])]) => string): string;
-    }
+  }
 }

src/index.d.ts

@@ -21,8 +21,8 @@ export type NoAlwaysTrueValue<O extends {[k:string]:boolean},T> = {[k in keyof O
 
 /** modified array that fixes return value from the sort function when the type is used in an intersection */
 export interface IntersectedArray<T,S> extends Array<T> {
-    sort(compareFn?: (a: T, b: T) => number): this & S;
-    [n: number]: never; // elements are defined by the intersected array
+  sort(compareFn?: (a: T, b: T) => number): this & S;
+  [n: number]: never; // elements are defined by the intersected array
 }
 
 /** toggle if a substring is in a string */

src/utils.d.ts

@@ -1,14 +1,14 @@
 {
-    "compilerOptions": {
-        "target": "ES2020",
-        "noEmit": true,
-        "strict": true,
-        "noImplicitOverride": true,
-        "noImplicitReturns": true,
-        "noPropertyAccessFromIndexSignature": true,
-        "noUncheckedIndexedAccess": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "moduleResolution": "node"
-    }
+  "compilerOptions": {
+    "target": "ES2020",
+    "noEmit": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "moduleResolution": "node"
+  }
 }