Remove usage of Array.prototype.includes to support IE11

JohnWeisz · Oct 28, 2019 · 38b57d8 · 38b57d8
1 parent a749955
commit 38b57d8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/js/typedjson.js b/js/typedjson.js
diff --git a/js/typedjson.js.map b/js/typedjson.js.map
diff --git a/js/typedjson.min.js b/js/typedjson.min.js
diff --git a/js/typedjson.min.js.map b/js/typedjson.min.js.map
diff --git a/js/typedjson/options-base.d.ts b/js/typedjson/options-base.d.ts
@@ -11,7 +11,9 @@ export interface OptionsBase {
      */
     preserveNull?: boolean;
 }
-export declare function extractOptionBase(from: any): OptionsBase | undefined;
+export declare function extractOptionBase(from: {
+    [key: string]: any;
+} & OptionsBase): OptionsBase | undefined;
 export declare function getDefaultOptionOf<K extends keyof OptionsBase>(key: K): Required<OptionsBase>[K];
 export declare function getOptionValue<K extends keyof OptionsBase>(key: K, options?: OptionsBase): Required<OptionsBase>[K];
 export declare function mergeOptions(existing?: OptionsBase, moreSpecific?: OptionsBase): OptionsBase | undefined;
diff --git a/src/typedjson/options-base.ts b/src/typedjson/options-base.ts
@@ -3,7 +3,6 @@
  * in the more specific place override the previous option.
  * Ex. @jsonMember overrides TypedJson options.
  */
-
 export interface OptionsBase {
     /**
      * Whether to preserve null in the JSON output. When false it
@@ -17,9 +16,9 @@ const kAllOptions: (keyof OptionsBase)[] = [
     'preserveNull',
 ];
 
-export function extractOptionBase(from: any): OptionsBase|undefined {
+export function extractOptionBase(from: {[key: string]: any} & OptionsBase): OptionsBase|undefined {
     const options = Object.keys(from)
-        .filter(key => (kAllOptions as string[]).includes(key))
+        .filter(key => (kAllOptions as string[]).indexOf(key) > -1)
         .reduce((obj, key) => {
             obj[key] = from[key];
             return obj;