feat(eslint-plugin) improve schema extension technique

typescript-eslint · Mar 28, 2019 · d83bc8e · d83bc8e
1 parent 26c51e3
commit d83bc8e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-magic-numbers.ts b/packages/eslint-plugin/src/rules/no-magic-numbers.ts
@@ -11,13 +11,7 @@ import { JSONSchema4 } from 'json-schema';
 type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
 type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
 
-// Extend base schema with additional property to ignore TS numeric literal types
-const properties = {
-  ...(baseRule.meta.schema as JSONSchema4[])[0].properties,
-  ignoreNumericLiteralTypes: {
-    type: 'boolean',
-  },
-};
+const baseRuleSchema = (baseRule.meta.schema as JSONSchema4[])[0];
 
 export default util.createRule<Options, MessageIds>({
   name: 'no-magic-numbers',
@@ -28,7 +22,16 @@ export default util.createRule<Options, MessageIds>({
       category: 'Best Practices',
       recommended: false,
     },
-    schema: { ...baseRule.meta.schema, ...properties },
+    // Extend base schema with additional property to ignore TS numeric literal types
+    schema: [{
+      ...baseRuleSchema,
+      properties: {
+        ...baseRuleSchema.properties,
+        ignoreNumericLiteralTypes: {
+          type: 'boolean',
+        },
+      },
+    }],
     messages: baseRule.meta.messages,
   },
   defaultOptions: [