diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6f749b..ac32d2ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.6.1 + +- Update dependencies +- Change `resistor-color-duo` expected export name to `decodedValue` + ## 0.6.0 - Fix various `shared` comments which had `generic` instead of `general` in their name. diff --git a/package.json b/package.json index e50fd45f..783ef479 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@exercism/javascript-analyzer", - "version": "0.6.0", + "version": "0.6.1", "description": "Exercism analyzer for javascript", "repository": "https://github.com/exercism/javascript-analyzer", "author": "Derk-Jan Karrenbeld ", @@ -24,25 +24,25 @@ "posttest": "yarn lint" }, "devDependencies": { - "@babel/core": "^7.6.0", - "@babel/preset-env": "^7.6.0", - "@babel/preset-typescript": "^7.6.0", - "@types/jest": "^24.0.18", - "@types/node": "^12.7.5", - "@types/yargs": "^13.0.2", - "@typescript-eslint/eslint-plugin": "^2.3.0", + "@babel/core": "^7.7.5", + "@babel/preset-env": "^7.7.6", + "@babel/preset-typescript": "^7.7.4", + "@types/jest": "^24.0.23", + "@types/node": "^12.12.17", + "@types/yargs": "^13.0.3", + "@typescript-eslint/eslint-plugin": "^2.11.0", "babel-jest": "^24.9.0", - "eslint": "^6.4.0", - "eslint-plugin-jest": "^22.17.0", + "eslint": "^6.7.2", + "eslint-plugin-jest": "^23.1.1", "jest": "^24.9.0" }, "dependencies": { - "@typescript-eslint/parser": "^2.3.1", - "@typescript-eslint/typescript-estree": "^2.3.1", + "@typescript-eslint/parser": "^2.11.0", + "@typescript-eslint/typescript-estree": "^2.11.0", "esm": "^3.2.25", - "module-alias": "^2.2.1", - "yargs": "^14.0.0", - "typescript": "^3.6.3" + "module-alias": "^2.2.2", + "yargs": "^15.0.2", + "typescript": "^3.7.3" }, "_moduleAliases": { "~src": "dist", diff --git a/src/analyzers/resistor-color-duo/ResistorColorDuoSolution.ts b/src/analyzers/resistor-color-duo/ResistorColorDuoSolution.ts index 9f960ef5..beb39209 100644 --- a/src/analyzers/resistor-color-duo/ResistorColorDuoSolution.ts +++ b/src/analyzers/resistor-color-duo/ResistorColorDuoSolution.ts @@ -1,13 +1,10 @@ import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/typescript-estree"; -import { Statement, Node, MemberExpression, CallExpression, ArrowFunctionExpression, FunctionExpression, TemplateLiteral } from "@typescript-eslint/typescript-estree/dist/ts-estree/ts-estree"; - +import { ArrowFunctionExpression, CallExpression, FunctionExpression, Node, Statement, TemplateLiteral } from "@typescript-eslint/typescript-estree/dist/ts-estree/ts-estree"; import { extractExport } from "~src/analyzers/utils/extract_export"; import { extractMainBody, MainBody } from "~src/analyzers/utils/extract_main_body"; import { extractMainMethod, MainMethod } from "~src/analyzers/utils/extract_main_method"; import { parameterName } from "~src/analyzers/utils/extract_parameter"; import { findFirst } from "~src/analyzers/utils/find_first"; -import { findMemberCall } from "~src/analyzers/utils/find_member_call"; -import { isNewExpression } from "~src/analyzers/utils/find_new_expression"; import { findTopLevelConstants, ProgramConstant, ProgramConstants } from "~src/analyzers/utils/find_top_level_constants"; import { isBinaryExpression } from "~src/analyzers/utils/is_binary_expression"; import { isCallExpression } from "~src/analyzers/utils/is_call_expression"; @@ -27,8 +24,8 @@ type Expression = TSESTree.Expression type MainExport = ReturnType -const EXPECTED_METHOD = 'value' -const EXPECTED_EXPORT = 'value' +const EXPECTED_METHOD = 'decodedValue' +const EXPECTED_EXPORT = 'decodedValue' const PROBABLE_CONSTANT = 'COLORS' export class MissingExpectedCall { @@ -811,10 +808,10 @@ export class ResistorColorDuoSolution { } public get hasInlineExport(): boolean { - // export function value + // export function decodedValue // => no specififers // - // export { value } + // export { decodedValue } // => yes specififers // return !this.mainExport[0].specifiers || this.mainExport[0].specifiers.length === 0 diff --git a/src/analyzers/resistor-color-duo/index.ts b/src/analyzers/resistor-color-duo/index.ts index 8d0ff0d8..45216200 100644 --- a/src/analyzers/resistor-color-duo/index.ts +++ b/src/analyzers/resistor-color-duo/index.ts @@ -22,7 +22,7 @@ in and replace the more cryptic numeric indexers with the named items. `('javascript.resistor-color-duo.destructuring_in_parameter') const SIGNATURE_NOT_OPTIMAL = factory` -📕 If you look at the tests, the function \`value\` only receives one +📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -173,7 +173,7 @@ export class ResistorColorDuoAnalyzer extends IsolatedAnalyzerImpl { // // function colorCode(...) { ... } // - // export function value([tens, ones]) { + // export function decodedValue([tens, ones]) { // return colorCode(ones) + colorCode(tens) * 10 // } // diff --git a/src/analyzers/utils/extract_main_method.ts b/src/analyzers/utils/extract_main_method.ts index 8ea66a7a..b037577e 100644 --- a/src/analyzers/utils/extract_main_method.ts +++ b/src/analyzers/utils/extract_main_method.ts @@ -105,11 +105,12 @@ export function extractMainMethod(program: Program, n node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === name + && node.value !== null ) { switch(node.value.type) { case AST_NODE_TYPES.ArrowFunctionExpression: case AST_NODE_TYPES.FunctionExpression: - result = Object.assign(node.value, { id: node.key, parent: node }) + result = Object.assign(node.value, { id: node.key, parent: node }) this.break() break; } diff --git a/src/analyzers/utils/type_annotations.ts b/src/analyzers/utils/type_annotations.ts index da01bb1b..0327069b 100644 --- a/src/analyzers/utils/type_annotations.ts +++ b/src/analyzers/utils/type_annotations.ts @@ -27,8 +27,8 @@ export function parameterType(parameter: Parameter, fallback: string = 'any'): s } } -export function annotateType(typeAnnotation?: TSTypeAnnotation, fallback: string = 'any'): string { - if (typeAnnotation === undefined) { +export function annotateType(typeAnnotation?: TSTypeAnnotation | null, fallback: string = 'any'): string { + if (typeAnnotation === undefined || typeAnnotation === null) { return fallback } diff --git a/test/analyzers/resistor-color-duo/__snapshots__/snapshot.ts.snap b/test/analyzers/resistor-color-duo/__snapshots__/snapshot.ts.snap index 5c89b961..e5d212a2 100644 --- a/test/analyzers/resistor-color-duo/__snapshots__/snapshot.ts.snap +++ b/test/analyzers/resistor-color-duo/__snapshots__/snapshot.ts.snap @@ -115,7 +115,7 @@ IsolatedAnalyzerOutput { "message": "Did you know that you can export functions, classes and constants directly inline? \`\`\`javascript -export const value = colors => ...; +export const decodedValue = colors => ...; \`\`\`", "template": "Did you know that you can export functions, classes and constants directly inline? @@ -123,7 +123,7 @@ inline? export %{method.signature} \`\`\`", "variables": Object { - "method.signature": "const value = colors => ...;", + "method.signature": "const decodedValue = colors => ...;", }, }, CommentImpl { @@ -191,7 +191,7 @@ IsolatedAnalyzerOutput { "message": "Did you know that you can export functions, classes and constants directly inline? \`\`\`javascript -export function value(bands) ... +export function decodedValue(bands) ... \`\`\`", "template": "Did you know that you can export functions, classes and constants directly inline? @@ -199,7 +199,7 @@ inline? export %{method.signature} \`\`\`", "variables": Object { - "method.signature": "function value(bands) ...", + "method.signature": "function decodedValue(bands) ...", }, }, CommentImpl { @@ -371,10 +371,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], @@ -1098,12 +1098,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.resistor-color-duo.signature_not_optimal", - "message": "📕 If you look at the tests, the function \`value\` only receives one + "message": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will always be \`undefined\` or whatever default you've assigned.", - "template": "📕 If you look at the tests, the function \`value\` only receives one + "template": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -1292,12 +1292,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.resistor-color-duo.signature_not_optimal", - "message": "📕 If you look at the tests, the function \`value\` only receives one + "message": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will always be \`undefined\` or whatever default you've assigned.", - "template": "📕 If you look at the tests, the function \`value\` only receives one + "template": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -1330,12 +1330,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_parameter", - "message": "Your function \`value\` does not have a parameter. + "message": "Your function \`decodedValue\` does not have a parameter. The tests won't pass without it.", "template": "Your function \`%{function.name}\` does not have a parameter. The tests won't pass without it.", "variables": Object { - "function.name": "value", + "function.name": "decodedValue", }, }, ], @@ -1428,12 +1428,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.resistor-color-duo.signature_not_optimal", - "message": "📕 If you look at the tests, the function \`value\` only receives one + "message": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will always be \`undefined\` or whatever default you've assigned.", - "template": "📕 If you look at the tests, the function \`value\` only receives one + "template": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -1450,10 +1450,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], @@ -1638,10 +1638,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], @@ -2510,12 +2510,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.resistor-color-duo.signature_not_optimal", - "message": "📕 If you look at the tests, the function \`value\` only receives one + "message": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will always be \`undefined\` or whatever default you've assigned.", - "template": "📕 If you look at the tests, the function \`value\` only receives one + "template": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -2604,10 +2604,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], @@ -2932,12 +2932,12 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.resistor-color-duo.signature_not_optimal", - "message": "📕 If you look at the tests, the function \`value\` only receives one + "message": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will always be \`undefined\` or whatever default you've assigned.", - "template": "📕 If you look at the tests, the function \`value\` only receives one + "template": "📕 If you look at the tests, the function \`decodedValue\` only receives one parameter. Nothing more and nothing less. 📕 Remove the additional parameters from your function, as their value will @@ -3054,10 +3054,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], @@ -3530,10 +3530,10 @@ IsolatedAnalyzerOutput { "comments": Array [ CommentImpl { "externalTemplate": "javascript.general.no_method", - "message": "No method called \`value\`. The tests won't pass without it.", + "message": "No method called \`decodedValue\`. The tests won't pass without it.", "template": "No method called \`%{method.name}\`. The tests won't pass without it.", "variables": Object { - "method.name": "value", + "method.name": "decodedValue", }, }, ], diff --git a/test/analyzers/resistor-color-duo/smoke.ts b/test/analyzers/resistor-color-duo/smoke.ts index 4a175d93..05f0e32a 100644 --- a/test/analyzers/resistor-color-duo/smoke.ts +++ b/test/analyzers/resistor-color-duo/smoke.ts @@ -24,7 +24,7 @@ describe('When running analysis on resistor-color-duo', () => { return COLORS.indexOf(color) } - export function value([tens, ones]) { + export function decodedValue([tens, ones]) { return colorCode(tens) * 10 + colorCode(ones) } `.trim() diff --git a/test/fixtures/resistor-color-duo/0/resistor-color-duo.js b/test/fixtures/resistor-color-duo/0/resistor-color-duo.js index d455e972..3945a9ea 100644 --- a/test/fixtures/resistor-color-duo/0/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/0/resistor-color-duo.js @@ -4,6 +4,6 @@ function digit(color) { return COLORS.indexOf(color); } -export function value(colors) { +export function decodedValue(colors) { return digit(colors[0]) * 10 + digit(colors[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/1/resistor-color-duo.js b/test/fixtures/resistor-color-duo/1/resistor-color-duo.js index f532bb72..81ce84da 100644 --- a/test/fixtures/resistor-color-duo/1/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/1/resistor-color-duo.js @@ -13,4 +13,4 @@ const COLORS = [ const colorCode = color => COLORS.indexOf(color); -export const value = colors => new Number(colors.map(colorCode).join("")); +export const decodedValue = colors => new Number(colors.map(colorCode).join("")); diff --git a/test/fixtures/resistor-color-duo/1/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/1/resistor-color-duo.spec.js index 53a5e11e..ab92b5a5 100644 --- a/test/fixtures/resistor-color-duo/1/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/1/resistor-color-duo.spec.js @@ -1,19 +1,19 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); diff --git a/test/fixtures/resistor-color-duo/10/resistor-color-duo.js b/test/fixtures/resistor-color-duo/10/resistor-color-duo.js index 99185e1d..c2965d8e 100644 --- a/test/fixtures/resistor-color-duo/10/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/10/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(input) { +export function decodedValue(input) { const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; return parseInt(colors.indexOf(input[0]).toString() + colors.indexOf(input[1]).toString()); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/100/resistor-color-duo.js b/test/fixtures/resistor-color-duo/100/resistor-color-duo.js index ea477898..4855e157 100644 --- a/test/fixtures/resistor-color-duo/100/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/100/resistor-color-duo.js @@ -12,10 +12,10 @@ const mappingColors = { } -export const value = (colors) => { +export const decodedValue = (colors) => { let color1 = mappingColors[colors[0]]; let color2 = mappingColors[colors[1]]; const result = `${color1}${color2}`; return parseInt(result) -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/100/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/100/resistor-color-duo.spec.js index 53a5e11e..ab92b5a5 100644 --- a/test/fixtures/resistor-color-duo/100/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/100/resistor-color-duo.spec.js @@ -1,19 +1,19 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); diff --git a/test/fixtures/resistor-color-duo/101/resistor-color-duo.js b/test/fixtures/resistor-color-duo/101/resistor-color-duo.js index d9bf3379..d534a086 100644 --- a/test/fixtures/resistor-color-duo/101/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/101/resistor-color-duo.js @@ -1,6 +1,6 @@ // import function from precedent exercise import { colorCode } from "../resistor-color/resistor-color"; -export const value = colors => { +export const decodedValue = colors => { return colors.reduce((a, color) => a * 10 + colorCode(color), 0); }; diff --git a/test/fixtures/resistor-color-duo/102/resistor-color-duo.js b/test/fixtures/resistor-color-duo/102/resistor-color-duo.js index fb7b1268..a033885e 100644 --- a/test/fixtures/resistor-color-duo/102/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/102/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const colorCode = (color) => COLORS.indexOf(color); -export function value(colors) { +export function decodedValue(colors) { return colorCode(colors[0]) * 10 + colorCode(colors[1]); } diff --git a/test/fixtures/resistor-color-duo/103/resistor-color-duo.js b/test/fixtures/resistor-color-duo/103/resistor-color-duo.js index dd6735f4..7f30bb34 100644 --- a/test/fixtures/resistor-color-duo/103/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/103/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = (colors) => { +export const decodedValue = (colors) => { const stringValue = colors .map((color) => COLORS.indexOf(color)) .join(''); diff --git a/test/fixtures/resistor-color-duo/104/resistor-color-duo.js b/test/fixtures/resistor-color-duo/104/resistor-color-duo.js index 7d9613ca..c1491ef9 100644 --- a/test/fixtures/resistor-color-duo/104/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/104/resistor-color-duo.js @@ -1,9 +1,9 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -const value = (colors) => { +const decodedValue = (colors) => { return colors.map( color => { return COLORS.indexOf(color); }).join('')*1; } -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/105/resistor-color-duo.js b/test/fixtures/resistor-color-duo/105/resistor-color-duo.js index b42f0c0d..6bdb65b0 100644 --- a/test/fixtures/resistor-color-duo/105/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/105/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (resistorColors) => { +export const decodedValue = (resistorColors) => { const COLORS = { 'black': 0, @@ -14,4 +14,4 @@ export const value = (resistorColors) => { }; return parseInt(`${COLORS[resistorColors[0]]}${COLORS[resistorColors[1]]}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/106/resistor-color-duo.js b/test/fixtures/resistor-color-duo/106/resistor-color-duo.js index fec5c6bf..b309e50f 100644 --- a/test/fixtures/resistor-color-duo/106/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/106/resistor-color-duo.js @@ -2,4 +2,4 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet', const valueOf = (color) => COLORS.indexOf(color) -export const value = (colors) => Number( colors.map(c => valueOf(c.toLowerCase())).join('') ) \ No newline at end of file +export const decodedValue = (colors) => Number( colors.map(c => valueOf(c.toLowerCase())).join('') ) diff --git a/test/fixtures/resistor-color-duo/107/resistor-color-duo.js b/test/fixtures/resistor-color-duo/107/resistor-color-duo.js index bc16fe5f..957b2a3b 100644 --- a/test/fixtures/resistor-color-duo/107/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/107/resistor-color-duo.js @@ -1,9 +1,9 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (color_array) => { +export const decodedValue = (color_array) => { var result = []; // in case of unkonwn input array size we could have used a for loop... result[0] = COLORS.indexOf(color_array[0]); result[1] = COLORS.indexOf(color_array[1]); return Number.parseInt(result.join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/108/resistor-color-duo.js b/test/fixtures/resistor-color-duo/108/resistor-color-duo.js index 53a5a70a..e125ebda 100644 --- a/test/fixtures/resistor-color-duo/108/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/108/resistor-color-duo.js @@ -11,8 +11,8 @@ export const COLORS = [ "white" ]; -export const value = (value_list) => { +export const decodedValue = (value_list) => { const tens = COLORS.indexOf(value_list[0]); const ones = COLORS.indexOf(value_list[1]); return tens * 10 + ones; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/109/resistor-color-duo.js b/test/fixtures/resistor-color-duo/109/resistor-color-duo.js index 5ae8bff7..01034060 100644 --- a/test/fixtures/resistor-color-duo/109/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/109/resistor-color-duo.js @@ -11,8 +11,8 @@ export const COLORS = [ "white" ]; -export function value(values) { - return values.reverse().reduce((acc, value, index) => { - return acc + COLORS.indexOf(value) * Math.pow(10, index); +export function decodedValue(values) { + return values.reverse().reduce((acc, decodedValue, index) => { + return acc + COLORS.indexOf(decodedValue) * Math.pow(10, index); }, 0); } diff --git a/test/fixtures/resistor-color-duo/11/resistor-color-duo.js b/test/fixtures/resistor-color-duo/11/resistor-color-duo.js index 5c079389..cba26e88 100644 --- a/test/fixtures/resistor-color-duo/11/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/11/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = color => { +export const decodedValue = color => { let number = ""; color.forEach(element => { number += COLORS.indexOf(element).toString(); diff --git a/test/fixtures/resistor-color-duo/110/resistor-color-duo.js b/test/fixtures/resistor-color-duo/110/resistor-color-duo.js index 109f58fb..e57a301e 100644 --- a/test/fixtures/resistor-color-duo/110/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/110/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = function(colors) { +export const decodedValue = function(colors) { return + colors.map(c => COLORS.indexOf(c)).join(''); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/111/resistor-color-duo.js b/test/fixtures/resistor-color-duo/111/resistor-color-duo.js index 0ce43f45..fcab73ab 100644 --- a/test/fixtures/resistor-color-duo/111/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/111/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ 'white' ] -function value(colors) { +function decodedValue(colors) { return parseInt( colors .map(function mapColorToValue(color) { @@ -21,4 +21,4 @@ function value(colors) { ) } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/112/resistor-color-duo.js b/test/fixtures/resistor-color-duo/112/resistor-color-duo.js index da2739d9..2e65bf88 100644 --- a/test/fixtures/resistor-color-duo/112/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/112/resistor-color-duo.js @@ -1,9 +1,9 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export function value(colors) { +export function decodedValue(colors) { let col1Index = COLORS.indexOf(colors[0].toLowerCase()); let col2Index = COLORS.indexOf(colors[1].toLowerCase()); return parseInt(`${col1Index}${col2Index}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/114/resistor-color-duo.js b/test/fixtures/resistor-color-duo/114/resistor-color-duo.js index d67e6f13..d47cc401 100644 --- a/test/fixtures/resistor-color-duo/114/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/114/resistor-color-duo.js @@ -11,10 +11,10 @@ const COLORS = { white: 9 } -function value ([val1, val2]) { +function decodedValue ([val1, val2]) { return Number.parseInt( `${COLORS[val1.toLowerCase()]}${COLORS[val2.toLowerCase()]}` ) } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/115/resistor-color-duo.js b/test/fixtures/resistor-color-duo/115/resistor-color-duo.js index f7132c8a..9cc7f98d 100644 --- a/test/fixtures/resistor-color-duo/115/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/115/resistor-color-duo.js @@ -11,5 +11,5 @@ export const COLORS = [ "white" ] -export const value = (colors) => +export const decodedValue = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]) diff --git a/test/fixtures/resistor-color-duo/116/resistor-color-duo.js b/test/fixtures/resistor-color-duo/116/resistor-color-duo.js index 6d450e94..fd1cc920 100644 --- a/test/fixtures/resistor-color-duo/116/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/116/resistor-color-duo.js @@ -10,9 +10,9 @@ const COLORS = [ "grey", "white" ]; - - export const value = (colors) => { + + export const decodedValue = (colors) => { return colors .map(i => COLORS.indexOf(i)) .join('') * 1; - } \ No newline at end of file + } diff --git a/test/fixtures/resistor-color-duo/117/resistor-color-duo.js b/test/fixtures/resistor-color-duo/117/resistor-color-duo.js index 5fa3b24c..415cbb4a 100644 --- a/test/fixtures/resistor-color-duo/117/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/117/resistor-color-duo.js @@ -12,7 +12,7 @@ const colors = { "white": 9 } -const value = (array) => { +const decodedValue = (array) => { let string = ''; array.forEach(element => { string += colors[element]; @@ -23,5 +23,5 @@ const value = (array) => { export { - value -}; \ No newline at end of file + decodedValue +}; diff --git a/test/fixtures/resistor-color-duo/118/resistor-color-duo.js b/test/fixtures/resistor-color-duo/118/resistor-color-duo.js index 9c01a34e..256e933d 100644 --- a/test/fixtures/resistor-color-duo/118/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/118/resistor-color-duo.js @@ -2,4 +2,4 @@ export var COLORS = ["black","brown","red","orange","yellow","green","blue","vio export const colorCode = color => COLORS.indexOf(color); -export const value = ([color1, color2]) => COLORS.indexOf(color1)*10 + COLORS.indexOf(color2) \ No newline at end of file +export const decodedValue = ([color1, color2]) => COLORS.indexOf(color1)*10 + COLORS.indexOf(color2) diff --git a/test/fixtures/resistor-color-duo/119/resistor-color-duo.js b/test/fixtures/resistor-color-duo/119/resistor-color-duo.js index 07316a50..7ba4a67e 100644 --- a/test/fixtures/resistor-color-duo/119/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/119/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => parseInt(COLORS.indexOf(colors[0]).toString() + COLORS.indexOf(colors[1]).toString()); \ No newline at end of file +export const decodedValue = (colors) => parseInt(COLORS.indexOf(colors[0]).toString() + COLORS.indexOf(colors[1]).toString()); diff --git a/test/fixtures/resistor-color-duo/12/resistor-color-duo.js b/test/fixtures/resistor-color-duo/12/resistor-color-duo.js index 30fdc9f8..79d806fb 100644 --- a/test/fixtures/resistor-color-duo/12/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/12/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const value = (colors) => { +const decodedValue = (colors) => { return COLORS.indexOf(colors[0]) + COLORS.indexOf(colors[1]); }; -export { value }; \ No newline at end of file +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/120/resistor-color-duo.js b/test/fixtures/resistor-color-duo/120/resistor-color-duo.js index 194aea39..3b3b51c1 100644 --- a/test/fixtures/resistor-color-duo/120/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/120/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = (array) => { +export const decodedValue = (array) => { let resistance = array.map(color => COLORS.indexOf(color)).join('') console.log(resistance) return Number(resistance); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/121/resistor-color-duo.js b/test/fixtures/resistor-color-duo/121/resistor-color-duo.js index 373798c4..48f69100 100644 --- a/test/fixtures/resistor-color-duo/121/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/121/resistor-color-duo.js @@ -1,9 +1,9 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = colors => { +export const decodedValue = colors => { return 10 * colorDigit(colors[0]) + colorDigit(colors[1]) } const colorDigit = color => { return COLORS.indexOf(color) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/122/resistor-color-duo.js b/test/fixtures/resistor-color-duo/122/resistor-color-duo.js index 2eb94a06..b8929ef8 100644 --- a/test/fixtures/resistor-color-duo/122/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/122/resistor-color-duo.js @@ -20,7 +20,7 @@ export const colorCode = (color) => { return CODES[color]; }; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colors.map(colorCode).join(""), 10); }; diff --git a/test/fixtures/resistor-color-duo/123/resistor-color-duo.js b/test/fixtures/resistor-color-duo/123/resistor-color-duo.js index 926a261c..f335d5b3 100644 --- a/test/fixtures/resistor-color-duo/123/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/123/resistor-color-duo.js @@ -1,2 +1,2 @@ export const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = (colors, list = COLORS) => parseInt(colors.map(color => list.indexOf(color).toString()).join('')); +export const decodedValue = (colors, list = COLORS) => parseInt(colors.map(color => list.indexOf(color).toString()).join('')); diff --git a/test/fixtures/resistor-color-duo/124/resistor-color-duo.js b/test/fixtures/resistor-color-duo/124/resistor-color-duo.js index 19e917b0..186b6db7 100644 --- a/test/fixtures/resistor-color-duo/124/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/124/resistor-color-duo.js @@ -4,6 +4,6 @@ export const colorCode = (color) => { return COLORS.indexOf(color); } -export const value = (colors) => { +export const decodedValue = (colors) => { return Number(`${colorCode(colors[0])}${colorCode(colors[1])}`) } diff --git a/test/fixtures/resistor-color-duo/125/resistor-color-duo.js b/test/fixtures/resistor-color-duo/125/resistor-color-duo.js index 6ec5923c..a89f3939 100644 --- a/test/fixtures/resistor-color-duo/125/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/125/resistor-color-duo.js @@ -11,14 +11,14 @@ const COLORS = { 'Grey': 8, 'White': 9 } -export const value = (acids) => { +export const decodedValue = (acids) => { let number = ''; acids.map((acidColor) => { let color = acidColor .charAt(0) - .toUpperCase() + .toUpperCase() + acidColor.slice(1); number = number + '' + COLORS[color]; }); return parseInt(number); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/126/resistor-color-duo.js b/test/fixtures/resistor-color-duo/126/resistor-color-duo.js index 5d285928..b46399fc 100644 --- a/test/fixtures/resistor-color-duo/126/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/126/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(COLORS.indexOf(colors[0]) + '' + COLORS.indexOf(colors[1])); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/127/resistor-color-duo.js b/test/fixtures/resistor-color-duo/127/resistor-color-duo.js index 15e0b68d..4f185fa8 100644 --- a/test/fixtures/resistor-color-duo/127/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/127/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; const colorCode = (code) => COLORS.indexOf(code); -const value = (arr) => parseInt(arr.map(code => colorCode(code) + '').join('')); +const decodedValue = (arr) => parseInt(arr.map(code => colorCode(code) + '').join('')); -export { value } \ No newline at end of file +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/128/resistor-color-duo.js b/test/fixtures/resistor-color-duo/128/resistor-color-duo.js index e9439186..eb1c35c9 100644 --- a/test/fixtures/resistor-color-duo/128/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/128/resistor-color-duo.js @@ -13,4 +13,4 @@ const COLORS = [ const colorCode = (color) => COLORS.indexOf(color); -export const value = color => ((colorCode(color[0]) * 10) + colorCode(color[1])); \ No newline at end of file +export const decodedValue = color => ((colorCode(color[0]) * 10) + colorCode(color[1])); diff --git a/test/fixtures/resistor-color-duo/129/resistor-color-duo.js b/test/fixtures/resistor-color-duo/129/resistor-color-duo.js index d592a396..df011449 100644 --- a/test/fixtures/resistor-color-duo/129/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/129/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(colorsParams) { +export function decodedValue(colorsParams) { const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; const [COLOR1, COLOR2] = COLORS.reduce((colorsArray, currentColor, index) => { diff --git a/test/fixtures/resistor-color-duo/13/resistor-colour-duo.js b/test/fixtures/resistor-color-duo/13/resistor-colour-duo.js index 709ab825..9dc67644 100644 --- a/test/fixtures/resistor-color-duo/13/resistor-colour-duo.js +++ b/test/fixtures/resistor-color-duo/13/resistor-colour-duo.js @@ -25,5 +25,5 @@ let combinedColourValue = (arrayOfColours) => { }; module.exports = { - value: combinedColourValue, -}; \ No newline at end of file + decodedValue: combinedColourValue, +}; diff --git a/test/fixtures/resistor-color-duo/130/resistor-color-duo.js b/test/fixtures/resistor-color-duo/130/resistor-color-duo.js index 3ff8ac62..8238f2d6 100644 --- a/test/fixtures/resistor-color-duo/130/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/130/resistor-color-duo.js @@ -2,14 +2,14 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; const colorCode = (color) => { - const value = COLORS.indexOf(color); - if (value === -1) { + const decodedValue = COLORS.indexOf(color); + if (decodedValue === -1) { throw new Error(`Invalid color name: ${color}`) } - return value; + return decodedValue; }; -export const value = (colors) => { +export const decodedValue = (colors) => { let total = 0; for (const [index, color] of colors.entries()) { total = (total * 10) + colorCode(color); diff --git a/test/fixtures/resistor-color-duo/131/resistor-color-duo.js b/test/fixtures/resistor-color-duo/131/resistor-color-duo.js index 5da28ae5..1943dba0 100644 --- a/test/fixtures/resistor-color-duo/131/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/131/resistor-color-duo.js @@ -11,5 +11,5 @@ const resistorColors = [ "white" ]; -export let value = ([one, two]) => +export let decodedValue = ([one, two]) => Number("" + resistorColors.indexOf(one) + resistorColors.indexOf(two)); diff --git a/test/fixtures/resistor-color-duo/132/resistor-color-duo.js b/test/fixtures/resistor-color-duo/132/resistor-color-duo.js index fb8734dc..3185f82f 100644 --- a/test/fixtures/resistor-color-duo/132/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/132/resistor-color-duo.js @@ -1,2 +1,2 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = colors => Number(colors.reduce((code, color) => `${code}${COLORS.indexOf(color)}`, '')) +export const decodedValue = colors => Number(colors.reduce((code, color) => `${code}${COLORS.indexOf(color)}`, '')) diff --git a/test/fixtures/resistor-color-duo/133/resistor-color-duo.js b/test/fixtures/resistor-color-duo/133/resistor-color-duo.js index 2b0e18c1..962d5dae 100644 --- a/test/fixtures/resistor-color-duo/133/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/133/resistor-color-duo.js @@ -1,10 +1,10 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -let value = ([color1, color2]) => { +let decodedValue = ([color1, color2]) => { let colorTotal = COLORS.indexOf(color1) + '' + COLORS.indexOf(color2); return Number(colorTotal); } -export { value }; \ No newline at end of file +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/134/resistor-color-duo.js b/test/fixtures/resistor-color-duo/134/resistor-color-duo.js index 920c7fe6..8ed8b35e 100644 --- a/test/fixtures/resistor-color-duo/134/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/134/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const value = (colors) => +colors.map(c => COLORS.indexOf(c)).join(''); +const decodedValue = (colors) => +colors.map(c => COLORS.indexOf(c)).join(''); -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/135/resistor-color-duo.js b/test/fixtures/resistor-color-duo/135/resistor-color-duo.js index 28cd5bce..068ebf78 100644 --- a/test/fixtures/resistor-color-duo/135/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/135/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = colorArray => { +export const decodedValue = colorArray => { const COLORS = { black: 0, brown: 1, diff --git a/test/fixtures/resistor-color-duo/136/resistor-color-duo.js b/test/fixtures/resistor-color-duo/136/resistor-color-duo.js index dd3e08a3..93ce67c3 100644 --- a/test/fixtures/resistor-color-duo/136/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/136/resistor-color-duo.js @@ -4,17 +4,17 @@ /* jshint esversion: 6 */ const resistors = [ 'black', - 'brown', - 'red', + 'brown', + 'red', 'orange', - 'yellow' , + 'yellow' , 'green', 'blue', 'violet', 'grey', 'white']; -export function value(group,obj=resistors) { +export function decodedValue(group,obj=resistors) { const ids = group.map(color => obj.indexOf(color) ); return parseInt(ids.join('')); } diff --git a/test/fixtures/resistor-color-duo/137/resistor-color-duo.js b/test/fixtures/resistor-color-duo/137/resistor-color-duo.js index 75f48efb..89a37abd 100644 --- a/test/fixtures/resistor-color-duo/137/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/137/resistor-color-duo.js @@ -2,4 +2,4 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'bl export const colorCode = color => COLORS.indexOf(color) ; -export const value = colors => Number(colors.map(color => colorCode(color)).join('')); \ No newline at end of file +export const decodedValue = colors => Number(colors.map(color => colorCode(color)).join('')); diff --git a/test/fixtures/resistor-color-duo/138/resistor-color-duo.js b/test/fixtures/resistor-color-duo/138/resistor-color-duo.js index e627af1b..a4710719 100644 --- a/test/fixtures/resistor-color-duo/138/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/138/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; return Number(String(COLORS.indexOf(color1)) + String(COLORS.indexOf(color2))); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/139/resistor-color-duo.js b/test/fixtures/resistor-color-duo/139/resistor-color-duo.js index 55d9f980..49f18884 100644 --- a/test/fixtures/resistor-color-duo/139/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/139/resistor-color-duo.js @@ -11,9 +11,9 @@ export const COLORS = [ 'white' ] -export const value = (inputColors) => { +export const decodedValue = (inputColors) => { return Number( - COLORS.indexOf(inputColors[0]) + COLORS.indexOf(inputColors[0]) + '' + COLORS.indexOf(inputColors[1])); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/14/resistor-color-duo.js b/test/fixtures/resistor-color-duo/14/resistor-color-duo.js index b68b9090..0693e756 100644 --- a/test/fixtures/resistor-color-duo/14/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/14/resistor-color-duo.js @@ -2,4 +2,4 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "v const colorCode = (code) => COLORS.indexOf(code); -export const value = (codeList) => codeList.reduce((acc, code) => acc * 10 + colorCode(code), 0); \ No newline at end of file +export const decodedValue = (codeList) => codeList.reduce((acc, code) => acc * 10 + colorCode(code), 0); diff --git a/test/fixtures/resistor-color-duo/140/resistor-color-duo.js b/test/fixtures/resistor-color-duo/140/resistor-color-duo.js index cc553408..fb9d046b 100644 --- a/test/fixtures/resistor-color-duo/140/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/140/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = colors => +export const decodedValue = colors => colors .reverse() .reduce( diff --git a/test/fixtures/resistor-color-duo/141/resistor-color-duo.js b/test/fixtures/resistor-color-duo/141/resistor-color-duo.js index 4042e283..91763ff3 100644 --- a/test/fixtures/resistor-color-duo/141/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/141/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS=[ - "black", - "brown", - "red", + "black", + "brown", + "red", "orange", "yellow", "green", @@ -10,5 +10,5 @@ const COLORS=[ "grey", "white"]; -export const value = (color) => parseInt(COLORS.indexOf(color[0]) - + "" + COLORS.indexOf(color[1])); \ No newline at end of file +export const decodedValue = (color) => parseInt(COLORS.indexOf(color[0]) + + "" + COLORS.indexOf(color[1])); diff --git a/test/fixtures/resistor-color-duo/142/resistor-color-duo.js b/test/fixtures/resistor-color-duo/142/resistor-color-duo.js index 9f8c0e7d..379d0f24 100644 --- a/test/fixtures/resistor-color-duo/142/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/142/resistor-color-duo.js @@ -1,3 +1,3 @@ -export const value = () => { - -} \ No newline at end of file +export const decodedValue = () => { + +} diff --git a/test/fixtures/resistor-color-duo/143/resistor-color-duo.js b/test/fixtures/resistor-color-duo/143/resistor-color-duo.js index a30fa803..46d9a963 100644 --- a/test/fixtures/resistor-color-duo/143/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/143/resistor-color-duo.js @@ -1,8 +1,8 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { const CODES = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; let result = ""; - + colors.forEach(function (color) {result += CODES.indexOf(color).toString()}); - + return parseInt(result); }; diff --git a/test/fixtures/resistor-color-duo/144/resistor-color-duo.js b/test/fixtures/resistor-color-duo/144/resistor-color-duo.js index 405044c5..fd26f808 100644 --- a/test/fixtures/resistor-color-duo/144/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/144/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { let values = colors.map(color => COLORS.indexOf(color)); return values[0]*10+values[1]; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/145/resistor-color-duo.js b/test/fixtures/resistor-color-duo/145/resistor-color-duo.js index d7c2df35..78803857 100644 --- a/test/fixtures/resistor-color-duo/145/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/145/resistor-color-duo.js @@ -13,6 +13,6 @@ const COLORS = [ const colorCode = color => COLORS.indexOf(color); -const value = colors => colorCode(colors[0]) * 10 + colorCode(colors[1]); +const decodedValue = colors => colorCode(colors[0]) * 10 + colorCode(colors[1]); -export { COLORS, value }; +export { COLORS, decodedValue }; diff --git a/test/fixtures/resistor-color-duo/146/resistor-color-duo.js b/test/fixtures/resistor-color-duo/146/resistor-color-duo.js index 31271fb3..9c7c64b7 100644 --- a/test/fixtures/resistor-color-duo/146/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/146/resistor-color-duo.js @@ -1,7 +1,7 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (arr) => { +export const decodedValue = (arr) => { return Number(arr.map((col) => { return COLORS.findIndex((i) => (i == col)) }).join("")); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/147/resistor-color-duo.js b/test/fixtures/resistor-color-duo/147/resistor-color-duo.js index 56467ec8..99e781ea 100644 --- a/test/fixtures/resistor-color-duo/147/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/147/resistor-color-duo.js @@ -11,9 +11,9 @@ export let COLORS = [ "white" ] -export const value = (a,b) => { +export const decodedValue = (a,b) => { const val1 = COLORS.indexOf(a); const val2 = COLORS.indexOf(b); return `${val1}${val2}`; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/148/resistor-color-duo.js b/test/fixtures/resistor-color-duo/148/resistor-color-duo.js index 2d86dc93..508e3f92 100644 --- a/test/fixtures/resistor-color-duo/148/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/148/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = colors => { +export const decodedValue = colors => { return colors.reduce((duo, color) => { return duo * 10 + [ 'black', diff --git a/test/fixtures/resistor-color-duo/149/resistor-color-duo.js b/test/fixtures/resistor-color-duo/149/resistor-color-duo.js index 03db9dd2..b19c1435 100644 --- a/test/fixtures/resistor-color-duo/149/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/149/resistor-color-duo.js @@ -10,9 +10,9 @@ const COLORS = [ 'grey', 'white' ]; - -function value([color1, color2]) { + +function decodedValue([color1, color2]) { return Number(COLORS.indexOf(color1.toLowerCase()).toString() + COLORS.indexOf(color2.toLowerCase()).toString()); } - -export { COLORS, value}; + +export { COLORS, decodedValue}; diff --git a/test/fixtures/resistor-color-duo/15/resistor-color-duo.js b/test/fixtures/resistor-color-duo/15/resistor-color-duo.js index 25143920..c09f475c 100644 --- a/test/fixtures/resistor-color-duo/15/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/15/resistor-color-duo.js @@ -8,6 +8,6 @@ function colorCode(color) { return COLORS.indexOf(color); } -export function value([color1, color2]) { +export function decodedValue([color1, color2]) { return colorCode(color1) * 10 + colorCode(color2); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/151/resistor-color-duo.js b/test/fixtures/resistor-color-duo/151/resistor-color-duo.js index b01b462a..18d48379 100644 --- a/test/fixtures/resistor-color-duo/151/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/151/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (colors) => { +export const decodedValue = (colors) => { colors.reverse(); // let endValue = 0; // for (let i = 0; i < colors.length; i++) { @@ -12,4 +12,4 @@ export const value = (colors) => { } -// return COLORS.indexOf(colors[0])*10 + COLORS.indexOf(colors[1]) \ No newline at end of file +// return COLORS.indexOf(colors[0])*10 + COLORS.indexOf(colors[1]) diff --git a/test/fixtures/resistor-color-duo/152/resistor-color-duo.js b/test/fixtures/resistor-color-duo/152/resistor-color-duo.js index 2f284a2e..bb988449 100644 --- a/test/fixtures/resistor-color-duo/152/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/152/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = colors => { +export const decodedValue = colors => { const digits = colors.map(color => COLORS.indexOf(color)); return digits[0] * 10 + digits[1]; }; diff --git a/test/fixtures/resistor-color-duo/153/resistor-color-duo.js b/test/fixtures/resistor-color-duo/153/resistor-color-duo.js index 6306d824..3b67b39b 100644 --- a/test/fixtures/resistor-color-duo/153/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/153/resistor-color-duo.js @@ -11,6 +11,6 @@ const COLOR_VALUES = { white: 9 }; -export const value = colorArray => { +export const decodedValue = colorArray => { return parseInt(colorArray.map(color => COLOR_VALUES[color]).join("")); }; diff --git a/test/fixtures/resistor-color-duo/154/resistor-color-duo.js b/test/fixtures/resistor-color-duo/154/resistor-color-duo.js index 2491859a..e63b85ab 100644 --- a/test/fixtures/resistor-color-duo/154/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/154/resistor-color-duo.js @@ -11,5 +11,5 @@ const COLORS = [ "white" ]; -export const value = params => +export const decodedValue = params => parseInt(`${COLORS.indexOf(params[0])}${COLORS.indexOf(params[1])}`); diff --git a/test/fixtures/resistor-color-duo/155/resistor-color-duo.js b/test/fixtures/resistor-color-duo/155/resistor-color-duo.js index cc7d18bc..4cbcfe03 100644 --- a/test/fixtures/resistor-color-duo/155/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/155/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"], - value = (colors) => ( + decodedValue = (colors) => ( parseInt(`${COLORS.indexOf(colors[0])}${COLORS.indexOf(colors[1])}`) ); -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/156/resistor-color-duo.js b/test/fixtures/resistor-color-duo/156/resistor-color-duo.js index ec4bfbfc..e573d7c3 100644 --- a/test/fixtures/resistor-color-duo/156/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/156/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(resistorColors) { +export function decodedValue(resistorColors) { let ret = ""; resistorColors.forEach(function(color) { ret += COLORS.indexOf(color); diff --git a/test/fixtures/resistor-color-duo/156/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/156/resistor-color-duo.spec.js index 53a5e11e..ab92b5a5 100644 --- a/test/fixtures/resistor-color-duo/156/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/156/resistor-color-duo.spec.js @@ -1,19 +1,19 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); diff --git a/test/fixtures/resistor-color-duo/157/resistor-color-duo.js b/test/fixtures/resistor-color-duo/157/resistor-color-duo.js index 0192b53a..686f6e23 100644 --- a/test/fixtures/resistor-color-duo/157/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/157/resistor-color-duo.js @@ -11,14 +11,14 @@ export const COLORS = { "white": "9" } -export function value(colors = []) { +export function decodedValue(colors = []) { - let bandsValue = ""; + let bandsValue = ""; colors.forEach(element => { bandsValue += COLORS[element]; }); - return parseInt(bandsValue); + return parseInt(bandsValue); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/158/resistor-color-duo.js b/test/fixtures/resistor-color-duo/158/resistor-color-duo.js index f4bf4e72..c7e9102e 100644 --- a/test/fixtures/resistor-color-duo/158/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/158/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { let result = (' ' + COLORS.indexOf(colors[0])) + (COLORS.indexOf(colors[1]) + ' '); return result.trim() * 1; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/159/resistor-color-duo.js b/test/fixtures/resistor-color-duo/159/resistor-color-duo.js index 8ea0563c..837911a3 100644 --- a/test/fixtures/resistor-color-duo/159/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/159/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = colors => { +export const decodedValue = colors => { return parseInt(`${COLORS.indexOf(colors[0])}` + `${COLORS.indexOf(colors[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/16/resistor-color-duo.js b/test/fixtures/resistor-color-duo/16/resistor-color-duo.js index e3e8a44f..8ae0c8c1 100644 --- a/test/fixtures/resistor-color-duo/16/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/16/resistor-color-duo.js @@ -1,8 +1,8 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const value = (arr = []) => { +const decodedValue = (arr = []) => { let str = ""; arr.forEach((el) => {str += COLORS.indexOf(el)}); return Number(str); } -export { COLORS, value } \ No newline at end of file +export { COLORS, decodedValue } diff --git a/test/fixtures/resistor-color-duo/160/resistor-color-duo.js b/test/fixtures/resistor-color-duo/160/resistor-color-duo.js index 513b4b3d..06359096 100644 --- a/test/fixtures/resistor-color-duo/160/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/160/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const colorCode = x => COLORS.indexOf(x); -export const value = resistors => 10*colorCode(resistors[0]) + colorCode(resistors[1]); +export const decodedValue = resistors => 10*colorCode(resistors[0]) + colorCode(resistors[1]); diff --git a/test/fixtures/resistor-color-duo/161/resistor-color-duo.js b/test/fixtures/resistor-color-duo/161/resistor-color-duo.js index 8379cab8..920e3852 100644 --- a/test/fixtures/resistor-color-duo/161/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/161/resistor-color-duo.js @@ -1,4 +1,4 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (color) => { +export const decodedValue = (color) => { return 10 * COLORS.indexOf(color[0]) + COLORS.indexOf(color[1]) } diff --git a/test/fixtures/resistor-color-duo/162/resistor-color-duo.js b/test/fixtures/resistor-color-duo/162/resistor-color-duo.js index 27088127..512a5fe0 100644 --- a/test/fixtures/resistor-color-duo/162/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/162/resistor-color-duo.js @@ -13,4 +13,4 @@ const Colors = [ const reducer = (acc, color, i) => acc + Colors.indexOf(color) * 10 ** i -export const value = colors => colors.reverse().reduce(reducer, 0) +export const decodedValue = colors => colors.reverse().reduce(reducer, 0) diff --git a/test/fixtures/resistor-color-duo/163/resistor-color-duo.js b/test/fixtures/resistor-color-duo/163/resistor-color-duo.js index 1ede048e..ff7cdfa0 100644 --- a/test/fixtures/resistor-color-duo/163/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/163/resistor-color-duo.js @@ -1,9 +1,9 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export function value(color){ +export function decodedValue(color){ let returnColor1 = color[0].toLowerCase(); let returnColor2 = color[1].toLowerCase(); let string = (COLORS.indexOf(returnColor1).toString()) + (COLORS.indexOf(returnColor2).toString()); return Number(string); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/165/resistor-color-duo.js b/test/fixtures/resistor-color-duo/165/resistor-color-duo.js index 876ee5c0..72bab85c 100644 --- a/test/fixtures/resistor-color-duo/165/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/165/resistor-color-duo.js @@ -11,10 +11,10 @@ export const colors = [ 'white' ]; -export function value(boje){ +export function decodedValue(boje){ let a=""; for(let i =0;i COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); \ No newline at end of file +export const decodedValue = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/167/resistor-color-duo.js b/test/fixtures/resistor-color-duo/167/resistor-color-duo.js index cd49a022..81127da1 100644 --- a/test/fixtures/resistor-color-duo/167/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/167/resistor-color-duo.js @@ -4,6 +4,6 @@ function colorCode(color) { return COLORS.indexOf(color) } -export function value(colors) { +export function decodedValue(colors) { return colors.reduce((a, b) => a * 10 + colorCode(b), 0) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/168/resistor-color-duo.js b/test/fixtures/resistor-color-duo/168/resistor-color-duo.js index 4740d22c..ee883b38 100644 --- a/test/fixtures/resistor-color-duo/168/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/168/resistor-color-duo.js @@ -1,12 +1,12 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = colors => { - let value = ''; +export const decodedValue = colors => { + let decodedValue = ''; colors.forEach(val => { if (COLORS.includes(val)) { - value += COLORS.indexOf(val); + decodedValue += COLORS.indexOf(val); } }); - return Number(value); + return Number(decodedValue); }; diff --git a/test/fixtures/resistor-color-duo/169/resistor-color-duo.js b/test/fixtures/resistor-color-duo/169/resistor-color-duo.js index 5f356835..28e0ff88 100644 --- a/test/fixtures/resistor-color-duo/169/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/169/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = colors => parseInt(colors.reduce((acc, color) => `${acc}${COLORS.indexOf(color)}`, ''), 10) +export const decodedValue = colors => parseInt(colors.reduce((acc, color) => `${acc}${COLORS.indexOf(color)}`, ''), 10) diff --git a/test/fixtures/resistor-color-duo/17/resistor-color-duo.js b/test/fixtures/resistor-color-duo/17/resistor-color-duo.js index e06d845f..38a96309 100644 --- a/test/fixtures/resistor-color-duo/17/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/17/resistor-color-duo.js @@ -11,6 +11,6 @@ export const COLORS = [ 'white', ]; -export function value(color) { +export function decodedValue(color) { return COLORS.indexOf(color[0]) * 10 + COLORS.indexOf(color[1]); } diff --git a/test/fixtures/resistor-color-duo/170/resistor-color-duo.js b/test/fixtures/resistor-color-duo/170/resistor-color-duo.js index 2a53c627..5672817a 100644 --- a/test/fixtures/resistor-color-duo/170/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/170/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = colors => { +export const decodedValue = colors => { const colorCode = color => COLORS.indexOf(color); return colorCode(colors[0]) * 10 + colorCode(colors[1]) diff --git a/test/fixtures/resistor-color-duo/171/resistor-color-duo.js b/test/fixtures/resistor-color-duo/171/resistor-color-duo.js index 8f424daf..513e4a7d 100644 --- a/test/fixtures/resistor-color-duo/171/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/171/resistor-color-duo.js @@ -2,6 +2,6 @@ const map = color => { return { black: 0, brown: 1, red: 2, orange: 3, yellow: 4, green: 5, blue: 6, violet: 7, grey: 8, white: 9 }[color]; }; -const value = ([ ten, unit ]) => +`${map(ten)}${map(unit)}`; +const decodedValue = ([ ten, unit ]) => +`${map(ten)}${map(unit)}`; -export { value, map } +export { decodedValue, map } diff --git a/test/fixtures/resistor-color-duo/172/resistor-color-duo.js b/test/fixtures/resistor-color-duo/172/resistor-color-duo.js index 2bafd714..5a26fdf5 100644 --- a/test/fixtures/resistor-color-duo/172/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/172/resistor-color-duo.js @@ -10,7 +10,7 @@ const COLORS = { "grey": 8, "white": 9} -export const value = function (colors) { +export const decodedValue = function (colors) { let color1 = colors[0]; let color2 = colors[1]; diff --git a/test/fixtures/resistor-color-duo/174/resistor-color-duo.js b/test/fixtures/resistor-color-duo/174/resistor-color-duo.js index 9bce25ad..a3c4c3f2 100644 --- a/test/fixtures/resistor-color-duo/174/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/174/resistor-color-duo.js @@ -11,5 +11,5 @@ const Colors = [ "white" ]; -export const value = ([c1, c2]) => +export const decodedValue = ([c1, c2]) => Colors.findIndex(d => d === c1) * 10 + Colors.findIndex(d => d === c2); diff --git a/test/fixtures/resistor-color-duo/175/resistor-color-duo.js b/test/fixtures/resistor-color-duo/175/resistor-color-duo.js index 25168bb3..e1d1a301 100644 --- a/test/fixtures/resistor-color-duo/175/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/175/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colorNames) => { +export const decodedValue = (colorNames) => { var resistanceValue = ""; colorNames.forEach(colorName => resistanceValue += COLORS.indexOf(colorName)); return parseInt(resistanceValue); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/177/resistor-color-duo.js b/test/fixtures/resistor-color-duo/177/resistor-color-duo.js index 0e7fb3ee..9158c0cb 100644 --- a/test/fixtures/resistor-color-duo/177/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/177/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (args) => { +export const decodedValue = (args) => { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; return parseInt(`${COLORS.indexOf(args[0])}${COLORS.indexOf(args[1])}`); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/178/resistor-color-duo.js b/test/fixtures/resistor-color-duo/178/resistor-color-duo.js index 46957a4b..c94049b6 100644 --- a/test/fixtures/resistor-color-duo/178/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/178/resistor-color-duo.js @@ -11,9 +11,9 @@ const COLORS = [ 'white' ] -const value = ([first, second]) => { +const decodedValue = ([first, second]) => { const response = `${COLORS.indexOf(first)}${COLORS.indexOf(second)}` return Number(response) } -module.exports = {value}; +module.exports = {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/179/resistor-color-duo.js b/test/fixtures/resistor-color-duo/179/resistor-color-duo.js index c032c4fa..fac47e6d 100644 --- a/test/fixtures/resistor-color-duo/179/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/179/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { const reducer = (accumulator, currentValue) => accumulator + COLORS.findIndex(color => color === currentValue); return parseInt(colors.reduce(reducer, '')); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/18/resistor-color-duo.js b/test/fixtures/resistor-color-duo/18/resistor-color-duo.js index c0fbc11c..e1bc2872 100644 --- a/test/fixtures/resistor-color-duo/18/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/18/resistor-color-duo.js @@ -1,13 +1,13 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = colors => { +export const decodedValue = colors => { let total = 0; let mantissa; - colors.reverse().forEach(function(value, index){ - mantissa = COLORS.indexOf(value); + colors.reverse().forEach(function(decodedValue, index){ + mantissa = COLORS.indexOf(decodedValue); total += mantissa * Math.pow(10, index); }) return total; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/180/resistor-color-duo.js b/test/fixtures/resistor-color-duo/180/resistor-color-duo.js index 725826d6..8171d08b 100644 --- a/test/fixtures/resistor-color-duo/180/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/180/resistor-color-duo.js @@ -1,7 +1,7 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors = [], colorArr = COLORS) => { +export const decodedValue = (colors = [], colorArr = COLORS) => { return +colors.map((color) => { return colorArr.indexOf(color) }).join('') -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/181/resistor-color-duo.js b/test/fixtures/resistor-color-duo/181/resistor-color-duo.js index 1d9e3c5b..bb1b4126 100644 --- a/test/fixtures/resistor-color-duo/181/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/181/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value([first, second]) { +export function decodedValue([first, second]) { const colorMap = { black: 0, brown: 1, diff --git a/test/fixtures/resistor-color-duo/182/resistor-color-duo.js b/test/fixtures/resistor-color-duo/182/resistor-color-duo.js index b91106ec..54429c4f 100644 --- a/test/fixtures/resistor-color-duo/182/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/182/resistor-color-duo.js @@ -1,8 +1,8 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export function value(colorsArray = []) { +export function decodedValue(colorsArray = []) { const result = []; colorsArray.forEach((color) => { - result.push(COLORS.indexOf(color)); + result.push(COLORS.indexOf(color)); }) return parseInt(result.join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/183/resistor-color-duo.js b/test/fixtures/resistor-color-duo/183/resistor-color-duo.js index 4c5dbdec..5867a07e 100644 --- a/test/fixtures/resistor-color-duo/183/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/183/resistor-color-duo.js @@ -1,4 +1,4 @@ -const value = ([colorOne, colorTwo]) => { +const decodedValue = ([colorOne, colorTwo]) => { const colors = [ "black", "brown", @@ -15,5 +15,5 @@ const value = ([colorOne, colorTwo]) => { return parseInt(val); }; -export {value}; +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/184/resistor-color-duo.js b/test/fixtures/resistor-color-duo/184/resistor-color-duo.js index ec1117d0..b4b0c39b 100644 --- a/test/fixtures/resistor-color-duo/184/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/184/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (arrOfcolours) => { - +export const decodedValue = (arrOfcolours) => { + const colourValues = { black: '0', brown: '1', diff --git a/test/fixtures/resistor-color-duo/185/resistor-color-duo.js b/test/fixtures/resistor-color-duo/185/resistor-color-duo.js index 8df7e983..0fbf0981 100644 --- a/test/fixtures/resistor-color-duo/185/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/185/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(''.concat(String(COLORS.findIndex(color => color===colors[0])), String(COLORS.findIndex(color => color===colors[1])))); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/186/resistor-color-duo.js b/test/fixtures/resistor-color-duo/186/resistor-color-duo.js index 5c8f5716..45ae78cb 100644 --- a/test/fixtures/resistor-color-duo/186/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/186/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = bands => Number.parseInt('' + COLORS.indexOf(bands[0]) + COLORS.indexOf(bands[1])); \ No newline at end of file +export const decodedValue = bands => Number.parseInt('' + COLORS.indexOf(bands[0]) + COLORS.indexOf(bands[1])); diff --git a/test/fixtures/resistor-color-duo/187/resistor-color-duo.js b/test/fixtures/resistor-color-duo/187/resistor-color-duo.js index 86408ba9..22e82353 100644 --- a/test/fixtures/resistor-color-duo/187/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/187/resistor-color-duo.js @@ -1,5 +1,5 @@ const colors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (bands) => { +export const decodedValue = (bands) => { return 10 * colors.indexOf(bands[0]) + colors.indexOf(bands[1]) } diff --git a/test/fixtures/resistor-color-duo/188/resistor-color-duo.js b/test/fixtures/resistor-color-duo/188/resistor-color-duo.js index 35059e31..0d87a415 100644 --- a/test/fixtures/resistor-color-duo/188/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/188/resistor-color-duo.js @@ -13,5 +13,5 @@ const COLORS = [ const colorCode = color => COLORS.indexOf(color); -export const value = colors => +export const decodedValue = colors => colors.reduce((sum, color) => sum * 10 + colorCode(color), 0); diff --git a/test/fixtures/resistor-color-duo/189/resistor-color-duo.js b/test/fixtures/resistor-color-duo/189/resistor-color-duo.js index 44c63656..a410cd62 100644 --- a/test/fixtures/resistor-color-duo/189/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/189/resistor-color-duo.js @@ -11,4 +11,4 @@ const colors = { "white": 9 }; -export const value = ([color1, color2]) => +`${colors[color1]}${colors[color2]}`; \ No newline at end of file +export const decodedValue = ([color1, color2]) => +`${colors[color1]}${colors[color2]}`; diff --git a/test/fixtures/resistor-color-duo/19/resistor-color-duo.js b/test/fixtures/resistor-color-duo/19/resistor-color-duo.js index 4ed7e91a..5410ccff 100644 --- a/test/fixtures/resistor-color-duo/19/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/19/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { let response = colors.map(color => { return `${COLORS.indexOf(color)}` }); return parseInt(response.join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/190/resistor-color-duo.js b/test/fixtures/resistor-color-duo/190/resistor-color-duo.js index a5aa052e..60347c61 100644 --- a/test/fixtures/resistor-color-duo/190/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/190/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value (colors) { +export function decodedValue (colors) { const bandColors = { black: '0', brown: '1', @@ -13,4 +13,4 @@ export function value (colors) { } return parseInt(colors.map(color => bandColors[color]).join('')) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/191/resistor-color-duo.js b/test/fixtures/resistor-color-duo/191/resistor-color-duo.js index dc4b5d0a..fea0311c 100644 --- a/test/fixtures/resistor-color-duo/191/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/191/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ 'white' ]; -export const value = inputColors => { +export const decodedValue = inputColors => { let result = ''; inputColors.map(color => { diff --git a/test/fixtures/resistor-color-duo/192/resistor-color-duo.js b/test/fixtures/resistor-color-duo/192/resistor-color-duo.js index 9f3835f4..06172c8d 100644 --- a/test/fixtures/resistor-color-duo/192/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/192/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = function ([color1, color2]) { +export const decodedValue = function ([color1, color2]) { return parseInt(COLORS.indexOf(color1).toString() + COLORS.indexOf(color2).toString()); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/193/resistor-color-duo.js b/test/fixtures/resistor-color-duo/193/resistor-color-duo.js index e8c82f74..2b115c05 100644 --- a/test/fixtures/resistor-color-duo/193/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/193/resistor-color-duo.js @@ -17,4 +17,4 @@ const reduceToDecimal = (acc, cur, idx) => acc + cur * Math.pow(10, idx) const arrayToDecimal = (array) => array.reverse().reduceRight(reduceToDecimal, 0) -export const value = (colors) => arrayToDecimal(colors.map(colorCode)) +export const decodedValue = (colors) => arrayToDecimal(colors.map(colorCode)) diff --git a/test/fixtures/resistor-color-duo/194/resistor-color-duo.js b/test/fixtures/resistor-color-duo/194/resistor-color-duo.js index 5dc94b4b..445e4776 100644 --- a/test/fixtures/resistor-color-duo/194/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/194/resistor-color-duo.js @@ -14,7 +14,7 @@ const Colors = { }; -export function value(arr) { +export function decodedValue(arr) { let result = ''; arr.map(color => { @@ -23,4 +23,4 @@ export function value(arr) { }); return parseInt(result); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/195/resistor-color-duo.js b/test/fixtures/resistor-color-duo/195/resistor-color-duo.js index c5002b19..59aca078 100644 --- a/test/fixtures/resistor-color-duo/195/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/195/resistor-color-duo.js @@ -9,7 +9,7 @@ const COLORS = ["black", "grey", "white"]; -export const value = (bands) => { +export const decodedValue = (bands) => { let result = ''; for (let i = 0; i < bands.length; i++) { result = result + COLORS.indexOf(bands[i]); diff --git a/test/fixtures/resistor-color-duo/196/resistor-color-duo.js b/test/fixtures/resistor-color-duo/196/resistor-color-duo.js index bc45894f..f990844d 100644 --- a/test/fixtures/resistor-color-duo/196/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/196/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = (colors = []) => { +export const decodedValue = (colors = []) => { let colorValue = ''; colors.forEach(color => colorValue += COLORS.indexOf(color)); return Number(colorValue); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/197/resistor-color-duo.js b/test/fixtures/resistor-color-duo/197/resistor-color-duo.js index 8fc100ab..e36023ce 100644 --- a/test/fixtures/resistor-color-duo/197/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/197/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (selectedColors) => { +export const decodedValue = (selectedColors) => { let result = '' for (let i = 0; i < selectedColors.length; i++) { @@ -11,4 +11,4 @@ export const value = (selectedColors) => { } } return parseInt(result) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/198/resistor-color-duo.js b/test/fixtures/resistor-color-duo/198/resistor-color-duo.js index 54106dd3..569c8f32 100644 --- a/test/fixtures/resistor-color-duo/198/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/198/resistor-color-duo.js @@ -11,5 +11,5 @@ const colorCode = { white: 9, }; -export const value = ([color1, color2]) => +export const decodedValue = ([color1, color2]) => Number(colorCode[color1].toString() + colorCode[color2].toString()); diff --git a/test/fixtures/resistor-color-duo/199/resistor-color-duo.js b/test/fixtures/resistor-color-duo/199/resistor-color-duo.js index 7530dbab..5c49c7ca 100644 --- a/test/fixtures/resistor-color-duo/199/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/199/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = arr => { +export const decodedValue = arr => { return parseInt( arr .map(color => { diff --git a/test/fixtures/resistor-color-duo/2/resistor-color-duo.js b/test/fixtures/resistor-color-duo/2/resistor-color-duo.js index b7d29d08..964fed7c 100644 --- a/test/fixtures/resistor-color-duo/2/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/2/resistor-color-duo.js @@ -11,5 +11,5 @@ export const COLORS = [ "white" ]; -export const value = ([color1, color2]) => - Number(`${COLORS.indexOf(color1)}${COLORS.indexOf(color2)}`); \ No newline at end of file +export const decodedValue = ([color1, color2]) => + Number(`${COLORS.indexOf(color1)}${COLORS.indexOf(color2)}`); diff --git a/test/fixtures/resistor-color-duo/2/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/2/resistor-color-duo.spec.js index 53a5e11e..ab92b5a5 100644 --- a/test/fixtures/resistor-color-duo/2/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/2/resistor-color-duo.spec.js @@ -1,19 +1,19 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); diff --git a/test/fixtures/resistor-color-duo/20/resistor-color-duo.js b/test/fixtures/resistor-color-duo/20/resistor-color-duo.js index f8277cab..79c4457a 100644 --- a/test/fixtures/resistor-color-duo/20/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/20/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = colors => { +export const decodedValue = colors => { return COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); }; diff --git a/test/fixtures/resistor-color-duo/200/resistor-color-duo.js b/test/fixtures/resistor-color-duo/200/resistor-color-duo.js index 5a79a6c4..8782bc09 100644 --- a/test/fixtures/resistor-color-duo/200/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/200/resistor-color-duo.js @@ -1,6 +1,6 @@ const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -const value = (colorArray) => { +const decodedValue = (colorArray) => { if (colorArray.length === 0) return 0; let output = ""; @@ -11,4 +11,4 @@ const value = (colorArray) => { return parseInt(output); } -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/201/resistor-color-duo.js b/test/fixtures/resistor-color-duo/201/resistor-color-duo.js index 450826bd..415be454 100644 --- a/test/fixtures/resistor-color-duo/201/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/201/resistor-color-duo.js @@ -1,12 +1,12 @@ const COLORS = [ 'black', - 'brown', + 'brown', 'red', 'orange', - 'yellow', - 'green', + 'yellow', + 'green', 'blue', - 'violet', + 'violet', 'grey', 'white' ] @@ -15,8 +15,8 @@ const decode = (color) => { return COLORS.indexOf(color) } -const value = (colors) => { +const decodedValue = (colors) => { return parseInt(`${decode(colors[0])}${decode(colors[1])}`) } -export { value } \ No newline at end of file +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/202/resistor-color-duo.js b/test/fixtures/resistor-color-duo/202/resistor-color-duo.js index 525eccad..b492bc74 100644 --- a/test/fixtures/resistor-color-duo/202/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/202/resistor-color-duo.js @@ -12,8 +12,8 @@ const COLOR_VALUE = { } -export function value(colors) { +export function decodedValue(colors) { const values = colors.map((color) => COLOR_VALUE[color]).join(''); return Number(values); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/203/resistor-color-duo.js b/test/fixtures/resistor-color-duo/203/resistor-color-duo.js index 878122b0..fa97b30c 100644 --- a/test/fixtures/resistor-color-duo/203/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/203/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value([color1, color2]) { +export function decodedValue([color1, color2]) { let COLORS = [ "black", "brown", diff --git a/test/fixtures/resistor-color-duo/204/resistor-color-duo.js b/test/fixtures/resistor-color-duo/204/resistor-color-duo.js index b7c4aa2e..73c37efa 100644 --- a/test/fixtures/resistor-color-duo/204/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/204/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -const value = (colors) => { +const decodedValue = (colors) => { var result = String(COLORS.indexOf(colors[0])) + String(COLORS.indexOf(colors[1])); @@ -9,4 +9,4 @@ const value = (colors) => { }; -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/205/resistor-color-duo.js b/test/fixtures/resistor-color-duo/205/resistor-color-duo.js index b3a3ce1a..8a2108e5 100644 --- a/test/fixtures/resistor-color-duo/205/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/205/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (arr) => { +export const decodedValue = (arr) => { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; var sum = 0; for (var color in arr) { diff --git a/test/fixtures/resistor-color-duo/206/resistor-color-duo.js b/test/fixtures/resistor-color-duo/206/resistor-color-duo.js index f7398bfa..d32463ee 100644 --- a/test/fixtures/resistor-color-duo/206/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/206/resistor-color-duo.js @@ -1,9 +1,9 @@ -export {value}; +export {decodedValue}; -function value(a) { +function decodedValue(a) { var num = (allcolors.indexOf(a[0])).toString() + (allcolors.indexOf(a[1])).toString(); - return parseInt(num); + return parseInt(num); } -const allcolors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] \ No newline at end of file +const allcolors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] diff --git a/test/fixtures/resistor-color-duo/207/resistor-color-duo.js b/test/fixtures/resistor-color-duo/207/resistor-color-duo.js index dc256ff4..9803a9e3 100644 --- a/test/fixtures/resistor-color-duo/207/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/207/resistor-color-duo.js @@ -1,10 +1,10 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (values) => { +export const decodedValue = (values) => { let total = ''; for (const val of values) { total += COLORS.indexOf(val); } return parseInt(total); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/208/resistor-color-duo.js b/test/fixtures/resistor-color-duo/208/resistor-color-duo.js index 7e087760..e5a1c332 100644 --- a/test/fixtures/resistor-color-duo/208/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/208/resistor-color-duo.js @@ -10,7 +10,7 @@ COLORS[7] = 'violet'; COLORS[8] = 'grey'; COLORS[9] = 'white'; -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { return parseInt(COLORS.indexOf(colorArray[0]).toString() + COLORS.indexOf(colorArray[1]).toString()); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/209/resistor-color-duo.js b/test/fixtures/resistor-color-duo/209/resistor-color-duo.js index ec9efac3..8ad4b325 100644 --- a/test/fixtures/resistor-color-duo/209/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/209/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = ([colorOne,colorTwo])=>{ +export const decodedValue = ([colorOne,colorTwo])=>{ return Number([COLORS.indexOf(colorOne.toLowerCase()),COLORS.indexOf(colorTwo.toLowerCase())].join('')) } diff --git a/test/fixtures/resistor-color-duo/21/resistor-color-duo.js b/test/fixtures/resistor-color-duo/21/resistor-color-duo.js index 3771c086..1c5bf442 100644 --- a/test/fixtures/resistor-color-duo/21/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/21/resistor-color-duo.js @@ -11,9 +11,9 @@ const lookup = { white: 9, } -export const value = (bands = []) => { +export const decodedValue = (bands = []) => { return bands.reduce((number, band) => { const nextDigit = lookup[band]; return Number('' + number + nextDigit); }, ''); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/210/resistor-color-duo.js b/test/fixtures/resistor-color-duo/210/resistor-color-duo.js index 760d22c4..0453fb0d 100644 --- a/test/fixtures/resistor-color-duo/210/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/210/resistor-color-duo.js @@ -2,6 +2,6 @@ export const COLORS = ["black","brown","red","orange","yellow", "green","blue","violet","grey","white"]; -export const value = (twoColors) => +export const decodedValue = (twoColors) => Number('' + COLORS.indexOf(twoColors[0]) + COLORS.indexOf(twoColors[1])); diff --git a/test/fixtures/resistor-color-duo/211/resistor-color-duo.js b/test/fixtures/resistor-color-duo/211/resistor-color-duo.js index af199fa6..0525cfce 100644 --- a/test/fixtures/resistor-color-duo/211/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/211/resistor-color-duo.js @@ -11,4 +11,4 @@ const resistors = { 'white': '9' }; -export const value = bands => parseInt( resistors[ bands[ 0 ] ] + resistors[ bands[ 1 ] ] ); \ No newline at end of file +export const decodedValue = bands => parseInt( resistors[ bands[ 0 ] ] + resistors[ bands[ 1 ] ] ); diff --git a/test/fixtures/resistor-color-duo/212/resistor-color-duo.js b/test/fixtures/resistor-color-duo/212/resistor-color-duo.js index 9fefda28..bd577c80 100644 --- a/test/fixtures/resistor-color-duo/212/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/212/resistor-color-duo.js @@ -1,7 +1,7 @@ -export const value = (array) => { +export const decodedValue = (array) => { return Number(String(colors.indexOf(array[0])) + String(colors.indexOf(array[1]))); } const colors = [ "black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white" -] \ No newline at end of file +] diff --git a/test/fixtures/resistor-color-duo/213/resistor-color-duo.js b/test/fixtures/resistor-color-duo/213/resistor-color-duo.js index 2c75cbb4..2adef185 100644 --- a/test/fixtures/resistor-color-duo/213/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/213/resistor-color-duo.js @@ -13,7 +13,7 @@ const COLORS = [ const colorValue = color => COLORS.indexOf(color); -export const value = colors => { +export const decodedValue = colors => { const allDigits = colors.reduce( (digits, color) => digits + colorValue(color), "" diff --git a/test/fixtures/resistor-color-duo/214/resistor-color-duo.js b/test/fixtures/resistor-color-duo/214/resistor-color-duo.js index d160b856..90853676 100644 --- a/test/fixtures/resistor-color-duo/214/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/214/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = [ "white" ]; -const value = ([firstItem, secondItem]) => { +const decodedValue = ([firstItem, secondItem]) => { return Number(String(COLORS.indexOf(firstItem)) + String(COLORS.indexOf(secondItem))); } -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/215/resistor-color-duo.js b/test/fixtures/resistor-color-duo/215/resistor-color-duo.js index 539bd053..73b3c359 100644 --- a/test/fixtures/resistor-color-duo/215/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/215/resistor-color-duo.js @@ -1,3 +1,3 @@ const resistors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (colors) => Number(`${resistors.indexOf(colors[0])}${resistors.indexOf(colors[1])}`) \ No newline at end of file +export const decodedValue = (colors) => Number(`${resistors.indexOf(colors[0])}${resistors.indexOf(colors[1])}`) diff --git a/test/fixtures/resistor-color-duo/216/resistor-color-duo.js b/test/fixtures/resistor-color-duo/216/resistor-color-duo.js index 1844fe02..4b4896a4 100644 --- a/test/fixtures/resistor-color-duo/216/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/216/resistor-color-duo.js @@ -4,6 +4,6 @@ const colorCode = (color) => { return COLORS.indexOf(color); } -export const value = (colorDuo) => { +export const decodedValue = (colorDuo) => { return Number(`${colorCode(colorDuo[0])}` + `${colorCode(colorDuo[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/217/resistor-color-duo.js b/test/fixtures/resistor-color-duo/217/resistor-color-duo.js index c34ed9a8..61ff34f4 100644 --- a/test/fixtures/resistor-color-duo/217/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/217/resistor-color-duo.js @@ -1,9 +1,9 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors) => { - const value = colors.reduce( +export const decodedValue = (colors) => { + const decodedValue = colors.reduce( (acc, colour) => acc += COLORS.findIndex(color => color === colour), '' ) - return Number(value) -} \ No newline at end of file + return Number(decodedValue) +} diff --git a/test/fixtures/resistor-color-duo/218/resistor-color-duo.js b/test/fixtures/resistor-color-duo/218/resistor-color-duo.js index ee761202..dad352f3 100644 --- a/test/fixtures/resistor-color-duo/218/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/218/resistor-color-duo.js @@ -14,7 +14,7 @@ const colorMap = new Map([ ["white", 9], ]); -export const value = colorPair => { +export const decodedValue = colorPair => { const [firstColor, secondColor] = colorPair; return 10 * colorMap.get(firstColor.toLowerCase()) + colorMap.get(secondColor.toLowerCase()); } diff --git a/test/fixtures/resistor-color-duo/219/resistor-color-duo.js b/test/fixtures/resistor-color-duo/219/resistor-color-duo.js index 3d353462..52b8c5e3 100644 --- a/test/fixtures/resistor-color-duo/219/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/219/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export function value(resistorPair) { +export function decodedValue(resistorPair) { let resultStr = resistorPair.reduce((acc, resistor) => acc + COLORS.indexOf(resistor).toString(10), '') return Number.parseInt(resultStr, 10) } diff --git a/test/fixtures/resistor-color-duo/22/resistor-color-duo.js b/test/fixtures/resistor-color-duo/22/resistor-color-duo.js index 5d8df5a4..53a1559c 100644 --- a/test/fixtures/resistor-color-duo/22/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/22/resistor-color-duo.js @@ -6,6 +6,6 @@ const colorCode = (color) => { return COLORS.indexOf(color); }; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colors.map(colorCode).join("")); }; diff --git a/test/fixtures/resistor-color-duo/220/resistor-color-duo.js b/test/fixtures/resistor-color-duo/220/resistor-color-duo.js index dd4efae1..ac080666 100644 --- a/test/fixtures/resistor-color-duo/220/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/220/resistor-color-duo.js @@ -2,7 +2,7 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors)=>{ +export const decodedValue = (colors)=>{ let val=0; let decimalPart=1; for(let i=colors.length-1;i>=0;i--){ @@ -10,4 +10,4 @@ export const value = (colors)=>{ decimalPart*=10; } return val; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/221/resistor-color-duo.js b/test/fixtures/resistor-color-duo/221/resistor-color-duo.js index 14e9b16c..0714fa6a 100644 --- a/test/fixtures/resistor-color-duo/221/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/221/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -function value([c1, c2]) { +function decodedValue([c1, c2]) { let v1 = COLORS.indexOf(c1); let v2 = COLORS.indexOf(c2); @@ -8,4 +8,4 @@ function value([c1, c2]) { }; -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/222/resistor-color-duo.js b/test/fixtures/resistor-color-duo/222/resistor-color-duo.js index e9ef2ea4..4156c6dd 100644 --- a/test/fixtures/resistor-color-duo/222/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/222/resistor-color-duo.js @@ -2,9 +2,9 @@ export const colorCode = color => COLORS.indexOf(color); export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { const firstColor = colorCode(colors[0]); const secondColor = colorCode(colors[1]); return (firstColor * 10) + secondColor; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/223/resistor-color-duo.js b/test/fixtures/resistor-color-duo/223/resistor-color-duo.js index 13bda2fc..091d9fab 100644 --- a/test/fixtures/resistor-color-duo/223/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/223/resistor-color-duo.js @@ -13,10 +13,10 @@ const colorConverter = { } /** - * - * @param {Array} colors + * + * @param {Array} colors * @returns {number} */ -export function value(colors) { +export function decodedValue(colors) { return colorConverter[colors[0]] * 10 + colorConverter[colors[1]]; } diff --git a/test/fixtures/resistor-color-duo/224/resistor-color-duo.js b/test/fixtures/resistor-color-duo/224/resistor-color-duo.js index cb2a374e..47f2516a 100644 --- a/test/fixtures/resistor-color-duo/224/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/224/resistor-color-duo.js @@ -1,6 +1,6 @@ -export { value }; +export { decodedValue }; -const value = colors => { +const decodedValue = colors => { const COLORS = { black: 0, brown: 1, @@ -18,4 +18,4 @@ const value = colors => { return parseInt(`${c1}` + `${c2}`); }; -console.log(value(["Brown", "Black"])); +console.log(decodedValue(["Brown", "Black"])); diff --git a/test/fixtures/resistor-color-duo/225/resistor-color-duo.js b/test/fixtures/resistor-color-duo/225/resistor-color-duo.js index 02076e5f..926ebbdc 100644 --- a/test/fixtures/resistor-color-duo/225/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/225/resistor-color-duo.js @@ -1,5 +1,5 @@ var COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(COLORS.indexOf(colors[0]).toString() + COLORS.indexOf(colors[1]).toString()); } diff --git a/test/fixtures/resistor-color-duo/226/resistor-color-duo.js b/test/fixtures/resistor-color-duo/226/resistor-color-duo.js index 6edbdb3d..b6830cfe 100644 --- a/test/fixtures/resistor-color-duo/226/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/226/resistor-color-duo.js @@ -1,7 +1,7 @@ const arr=['black','brown','red','orange', 'yellow','green','blue','violet', 'grey','white'] -export function value(x,y){ +export function decodedValue(x,y){ return arr.indexOf(x)*10+arr.indexOf(y) } diff --git a/test/fixtures/resistor-color-duo/227/resistor-color-duo.js b/test/fixtures/resistor-color-duo/227/resistor-color-duo.js index 2c5ce955..38d9cf44 100644 --- a/test/fixtures/resistor-color-duo/227/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/227/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black', 'brown','red','orange','yellow','green','blue','violet', 'grey', 'white'] -export const value = colors => { +export const decodedValue = colors => { return Number(colors.map(color => COLORS.indexOf(color)).join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/228/resistor-color-duo.js b/test/fixtures/resistor-color-duo/228/resistor-color-duo.js index 0bd5fbc2..ec7e697e 100644 --- a/test/fixtures/resistor-color-duo/228/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/228/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = [ "white" ]; -export const value = (colors) => { +export const decodedValue = (colors) => { return colors .map(i => COLORS.indexOf(i)) .join('') * 1; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/229/resistor-color-duo.js b/test/fixtures/resistor-color-duo/229/resistor-color-duo.js index b0ed07d1..f0cb0c5f 100644 --- a/test/fixtures/resistor-color-duo/229/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/229/resistor-color-duo.js @@ -15,8 +15,8 @@ function code(name) { return COLORS.indexOf(name); } -function value(bands) { +function decodedValue(bands) { return code(bands[0]) * 10 + code(bands[1]); } -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/23/resistor-color-duo.js b/test/fixtures/resistor-color-duo/23/resistor-color-duo.js index 70c2c09c..433c6f30 100644 --- a/test/fixtures/resistor-color-duo/23/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/23/resistor-color-duo.js @@ -15,10 +15,10 @@ function colorCode(color) { return COLORS.indexOf(color); } -function value(resistors) { +function decodedValue(resistors) { return Number (resistors.map( resistor => { return colorCode(resistor); }).join('')); } -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/230/resistor-color-duo.js b/test/fixtures/resistor-color-duo/230/resistor-color-duo.js index f3f33a45..433875f1 100644 --- a/test/fixtures/resistor-color-duo/230/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/230/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = colors => { +export const decodedValue = colors => { let c1 = COLORS.indexOf(colors[0].toLowerCase()).toString(); let c2 = COLORS.indexOf(colors[1].toLowerCase()).toString(); return parseInt(c1 + c2); diff --git a/test/fixtures/resistor-color-duo/232/resistor-color-duo.js b/test/fixtures/resistor-color-duo/232/resistor-color-duo.js index 06f6742e..cb4b9a59 100644 --- a/test/fixtures/resistor-color-duo/232/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/232/resistor-color-duo.js @@ -1,6 +1,6 @@ -export function value([color1, color2]) { +export function decodedValue([color1, color2]) { const bandColors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] let index1 = bandColors.indexOf(color1); let index2 = bandColors.indexOf(color2); return Number([index1, index2].join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/233/resistor-color-duo.js b/test/fixtures/resistor-color-duo/233/resistor-color-duo.js index d8334579..470646c1 100644 --- a/test/fixtures/resistor-color-duo/233/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/233/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = colors => { +export const decodedValue = colors => { return Number(colors.reduce((resistance, color) => `${resistance}${colorCode(color)}`, "")); }; diff --git a/test/fixtures/resistor-color-duo/234/resistor-color-duo.js b/test/fixtures/resistor-color-duo/234/resistor-color-duo.js index 941733f6..4b46fe30 100644 --- a/test/fixtures/resistor-color-duo/234/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/234/resistor-color-duo.js @@ -11,9 +11,9 @@ const COLOR = [ "white" ]; -const value = ([name1, name2]) => { +const decodedValue = ([name1, name2]) => { COLOR.indexOf(name1) + COLOR.indexOf(name2); }; -console.log(value(["red", "blue"])); -export { value }; +console.log(decodedValue(["red", "blue"])); +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/235/resistor-color-duo.js b/test/fixtures/resistor-color-duo/235/resistor-color-duo.js index 62318a95..158cbb30 100644 --- a/test/fixtures/resistor-color-duo/235/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/235/resistor-color-duo.js @@ -1,5 +1,5 @@ -export function value([color1, color2]) { +export function decodedValue([color1, color2]) { var colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; var resistor = colors.indexOf(color1).toString() + colors.indexOf(color2).toString(); return parseInt(resistor); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/236/resistor-color-duo.js b/test/fixtures/resistor-color-duo/236/resistor-color-duo.js index c19bd713..4a6618a1 100644 --- a/test/fixtures/resistor-color-duo/236/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/236/resistor-color-duo.js @@ -1,4 +1,4 @@ export const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = (color) => { +export const decodedValue = (color) => { return COLORS.indexOf(color[0].toLowerCase()) * 10 + COLORS.indexOf(color[1].toLowerCase()); }; diff --git a/test/fixtures/resistor-color-duo/237/resistor-color-duo.js b/test/fixtures/resistor-color-duo/237/resistor-color-duo.js index dbecd590..e1677158 100644 --- a/test/fixtures/resistor-color-duo/237/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/237/resistor-color-duo.js @@ -1,4 +1,4 @@ -export { value, COLORS }; +export { decodedValue, COLORS }; const COLORS = [ "black", @@ -13,7 +13,7 @@ const COLORS = [ "white" ]; -const value = aColors => { +const decodedValue = aColors => { let sOutput = ``; aColors.forEach(el => (sOutput = sOutput + COLORS.indexOf(el))); return parseInt(sOutput); diff --git a/test/fixtures/resistor-color-duo/238/resistor-color-duo.js b/test/fixtures/resistor-color-duo/238/resistor-color-duo.js index 0614ed83..8e6af8ee 100644 --- a/test/fixtures/resistor-color-duo/238/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/238/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { let resistorNumber = ''; colors.forEach(color => { diff --git a/test/fixtures/resistor-color-duo/239/resistor-color-duo.js b/test/fixtures/resistor-color-duo/239/resistor-color-duo.js index 51cd29b0..06a84b9f 100644 --- a/test/fixtures/resistor-color-duo/239/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/239/resistor-color-duo.js @@ -3,7 +3,7 @@ export const colorCode = (color) => { return COLORS.indexOf(color) } -export const value = (code) => { +export const decodedValue = (code) => { return Number(colorCode(code[0]).toString() + colorCode(code[1]).toString()) } diff --git a/test/fixtures/resistor-color-duo/24/resistor-color-duo.js b/test/fixtures/resistor-color-duo/24/resistor-color-duo.js index 150e8b28..836ffaa0 100644 --- a/test/fixtures/resistor-color-duo/24/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/24/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export function value(resistorColors) { +export function decodedValue(resistorColors) { return parseInt(COLORS.indexOf(resistorColors[0]).toString() + COLORS.indexOf(resistorColors[1]).toString()); } diff --git a/test/fixtures/resistor-color-duo/240/resistor-color-duo.js b/test/fixtures/resistor-color-duo/240/resistor-color-duo.js index 748a6201..91a66b7a 100644 --- a/test/fixtures/resistor-color-duo/240/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/240/resistor-color-duo.js @@ -15,6 +15,6 @@ function colorCode(color) { return COLORS.indexOf(color); } -export function value(colors) { +export function decodedValue(colors) { return colors.reduce((acc, color) => acc * 10 + colorCode(color), 0); } diff --git a/test/fixtures/resistor-color-duo/241/resistor-color-duo.js b/test/fixtures/resistor-color-duo/241/resistor-color-duo.js index f314a7ff..a855c9d2 100644 --- a/test/fixtures/resistor-color-duo/241/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/241/resistor-color-duo.js @@ -1,3 +1,3 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (color) => parseInt(color.map(num => { return COLORS.indexOf(num) ;}).join('')); \ No newline at end of file +export const decodedValue = (color) => parseInt(color.map(num => { return COLORS.indexOf(num) ;}).join('')); diff --git a/test/fixtures/resistor-color-duo/242/resistor-color-duo.js b/test/fixtures/resistor-color-duo/242/resistor-color-duo.js index 2ec6ed1c..3bceb577 100644 --- a/test/fixtures/resistor-color-duo/242/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/242/resistor-color-duo.js @@ -3,7 +3,7 @@ export var COLORS = ["black","brown","red","orange","yellow","green","blue","vio export function colorCode(theColor){ return COLORS.indexOf(theColor); } - -export function value(colors){ + +export function decodedValue(colors){ return colorCode(colors[0]) * 10 + colorCode(colors[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/243/resistor-color-duo.js b/test/fixtures/resistor-color-duo/243/resistor-color-duo.js index 03ac906f..84384f60 100644 --- a/test/fixtures/resistor-color-duo/243/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/243/resistor-color-duo.js @@ -1,6 +1,6 @@ export const ALL_COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value([color_one, color_two]) { +export function decodedValue([color_one, color_two]) { const foo = ALL_COLORS.indexOf(color_one).toString() + ALL_COLORS.indexOf(color_two).toString(); return new Number(foo); } diff --git a/test/fixtures/resistor-color-duo/244/resistor-color-duo.js b/test/fixtures/resistor-color-duo/244/resistor-color-duo.js index 6aa3d39a..f95bc2b5 100644 --- a/test/fixtures/resistor-color-duo/244/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/244/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export function value(color) { +export function decodedValue(color) { return Number(String(COLORS.indexOf(color[0])+String(COLORS.indexOf(color[1])))) -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/245/resistor-color-duo.js b/test/fixtures/resistor-color-duo/245/resistor-color-duo.js index 2bd5893d..a8eeb2e5 100644 --- a/test/fixtures/resistor-color-duo/245/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/245/resistor-color-duo.js @@ -12,7 +12,7 @@ const COLORS = [ ]; -export function value(colorDuo) { +export function decodedValue(colorDuo) { // console.log(colorDuo.forEach(function(color) { // COLORS.indexOf(color); // }) diff --git a/test/fixtures/resistor-color-duo/246/resistor-color-duo.js b/test/fixtures/resistor-color-duo/246/resistor-color-duo.js index 2485d929..d767aa08 100644 --- a/test/fixtures/resistor-color-duo/246/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/246/resistor-color-duo.js @@ -1,9 +1,9 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -function value(combine) { +function decodedValue(combine) { var res = [COLORS.indexOf(combine[0]), COLORS.indexOf(combine[1])]; res.reverse(); return Number(`${res[1]}${res[0]}`); } -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/247/resistor-color-duo.js b/test/fixtures/resistor-color-duo/247/resistor-color-duo.js index ad41bf11..8b7570fa 100644 --- a/test/fixtures/resistor-color-duo/247/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/247/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colorDuoString) => { +export const decodedValue = (colorDuoString) => { return (COLORS.indexOf(colorDuoString[0]) * 10) + COLORS.indexOf(colorDuoString[1]); diff --git a/test/fixtures/resistor-color-duo/248/resistor-color-duo.js b/test/fixtures/resistor-color-duo/248/resistor-color-duo.js index 3c11007b..8cec1f7b 100644 --- a/test/fixtures/resistor-color-duo/248/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/248/resistor-color-duo.js @@ -11,6 +11,6 @@ const COLORS = { white: 9 } -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { return parseInt(`${COLORS[color1]}${COLORS[color2]}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/249/resistor-color-duo.js b/test/fixtures/resistor-color-duo/249/resistor-color-duo.js index 394012b3..558953d9 100644 --- a/test/fixtures/resistor-color-duo/249/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/249/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = { white: 9 } -export function value(colors) { +export function decodedValue(colors) { return colors.reduce((n, color) => { return Number(`${n}${COLORS[color]}`) }, 0); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/25/resistor-color-duo.js b/test/fixtures/resistor-color-duo/25/resistor-color-duo.js index 92abc5e7..083e31de 100644 --- a/test/fixtures/resistor-color-duo/25/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/25/resistor-color-duo.js @@ -15,7 +15,7 @@ export const codeGolf = colors => { return Number(colors.map(c => COLORS.indexOf(c).toString()).join("")); }; -export function value(colors) { +export function decodedValue(colors) { const result = Array(colors.length); for (const name of colors) { diff --git a/test/fixtures/resistor-color-duo/250/resistor-color-duo.js b/test/fixtures/resistor-color-duo/250/resistor-color-duo.js index ed4709e7..a7e01415 100644 --- a/test/fixtures/resistor-color-duo/250/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/250/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export function value(colors) { +export function decodedValue(colors) { return colors.reduce((acc, color) => acc * 10 + COLORS.findIndex(x => x === color), 0); } diff --git a/test/fixtures/resistor-color-duo/251/resistor-color-duo.js b/test/fixtures/resistor-color-duo/251/resistor-color-duo.js index e888d22a..638cc8d7 100644 --- a/test/fixtures/resistor-color-duo/251/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/251/resistor-color-duo.js @@ -1,4 +1,4 @@ -const colors = +const colors = { 'black' : '0', 'brown': '1', @@ -12,6 +12,6 @@ const colors = 'white': '9' }; -export function value (arr) { +export function decodedValue (arr) { return parseInt(colors[arr[0]] + colors[arr[1]]); } diff --git a/test/fixtures/resistor-color-duo/252/resistor-color-duo.js b/test/fixtures/resistor-color-duo/252/resistor-color-duo.js index 3ec42590..55499ec5 100644 --- a/test/fixtures/resistor-color-duo/252/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/252/resistor-color-duo.js @@ -36,16 +36,16 @@ class ResistorDuo { } static getResistorColorValue(resistorColor) { - const value = RESISTOR_COLOR_VALUE_MAPPING[resistorColor] + const decodedValue = RESISTOR_COLOR_VALUE_MAPPING[resistorColor] - if (value === undefined) { + if (decodedValue === undefined) { throw new Error(`invalid resistor color ${resistorColor} does not exist`) } - return value + return decodedValue } } -export function value(resistorColorPair) { +export function decodedValue(resistorColorPair) { return new ResistorDuo(resistorColorPair).calculateResistance() -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/253/resistor-color-duo.js b/test/fixtures/resistor-color-duo/253/resistor-color-duo.js index 5aed0e14..147f0b6b 100644 --- a/test/fixtures/resistor-color-duo/253/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/253/resistor-color-duo.js @@ -1,5 +1,5 @@ -export { value }; +export { decodedValue }; const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -const value = (colors = []) => colors.map(c => COLORS.indexOf(c)).reduce((pVal, cVal) => Number(pVal + '' + cVal)); \ No newline at end of file +const decodedValue = (colors = []) => colors.map(c => COLORS.indexOf(c)).reduce((pVal, cVal) => Number(pVal + '' + cVal)); diff --git a/test/fixtures/resistor-color-duo/254/resistor-color-duo.js b/test/fixtures/resistor-color-duo/254/resistor-color-duo.js index fd9cdca8..a558ed01 100644 --- a/test/fixtures/resistor-color-duo/254/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/254/resistor-color-duo.js @@ -1,11 +1,11 @@ -export {value}; +export {decodedValue}; // solution for any number of colors -// const value = (arr) => Number(arr.reduce((a,c) => a + bands[c], '')); +// const decodedValue = (arr) => Number(arr.reduce((a,c) => a + bands[c], '')); // faster solution with just 2 colors -const value = (arr) => { +const decodedValue = (arr) => { const bands = { black: '0', brown: '1', @@ -19,4 +19,4 @@ const value = (arr) => { white: '9', }; return Number(bands[arr[0]] + bands[arr[1]]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/255/resistor-color-duo.js b/test/fixtures/resistor-color-duo/255/resistor-color-duo.js index 968d1a46..2888e75f 100644 --- a/test/fixtures/resistor-color-duo/255/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/255/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (color) => { +export const decodedValue = (color) => { let colorArr = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; @@ -6,4 +6,4 @@ export const value = (color) => { return Number(resistance); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/256/resistor-color-duo.js b/test/fixtures/resistor-color-duo/256/resistor-color-duo.js index 82156b0f..60816835 100644 --- a/test/fixtures/resistor-color-duo/256/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/256/resistor-color-duo.js @@ -4,6 +4,6 @@ const colorCode = (color) => { return COLORS.indexOf(color); } -export const value = (color) => { +export const decodedValue = (color) => { return parseInt(`${colorCode(color[0])}${colorCode(color[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/257/resistor-color-duo.js b/test/fixtures/resistor-color-duo/257/resistor-color-duo.js index 1edcf70d..09131b19 100644 --- a/test/fixtures/resistor-color-duo/257/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/257/resistor-color-duo.js @@ -1,8 +1,8 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -const value = (inputValue) => { +const decodedValue = (inputValue) => { return parseInt(`${COLORS.indexOf(inputValue[0])}${COLORS.indexOf(inputValue[1])}`) } -module.exports = { value } \ No newline at end of file +module.exports = { decodedValue } diff --git a/test/fixtures/resistor-color-duo/258/resistor-color-duo.js b/test/fixtures/resistor-color-duo/258/resistor-color-duo.js index c56461fb..72a60667 100644 --- a/test/fixtures/resistor-color-duo/258/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/258/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = colors => { +export const decodedValue = colors => { return parseInt(`${COLORS.indexOf(colors[0])}${COLORS.indexOf(colors[1])}`, 10); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/259/resistor-color-duo.js b/test/fixtures/resistor-color-duo/259/resistor-color-duo.js index f8c3590c..9fc29253 100644 --- a/test/fixtures/resistor-color-duo/259/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/259/resistor-color-duo.js @@ -1,15 +1,15 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (stringArr, array=COLORS) => { +export const decodedValue = (stringArr, array=COLORS) => { let string_code = ''; stringArr.forEach((color) => { array.forEach((item, index) => { if (color == item) { - string_code = string_code + index; - } + string_code = string_code + index; + } }); }); return parseInt(string_code, 10); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/26/resistor-color-duo.js b/test/fixtures/resistor-color-duo/26/resistor-color-duo.js index 9b12a407..abf2797d 100644 --- a/test/fixtures/resistor-color-duo/26/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/26/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = (colors) => Number.parseInt(colors.map((color) => COLORS.indexOf(color)).join('')); +export const decodedValue = (colors) => Number.parseInt(colors.map((color) => COLORS.indexOf(color)).join('')); diff --git a/test/fixtures/resistor-color-duo/260/resistor-color-duo.js b/test/fixtures/resistor-color-duo/260/resistor-color-duo.js index bd064703..3423be97 100644 --- a/test/fixtures/resistor-color-duo/260/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/260/resistor-color-duo.js @@ -1,10 +1,10 @@ let color = ["brown", "yellow"]; -function value(color) { +function decodedValue(color) { let x = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; return x.indexOf(color[0]) * 10 + x.indexOf(color[1]); } module.exports = { - value -} \ No newline at end of file + decodedValue +} diff --git a/test/fixtures/resistor-color-duo/261/resistor-color-duo.js b/test/fixtures/resistor-color-duo/261/resistor-color-duo.js index ea6eb39f..9f305ee6 100644 --- a/test/fixtures/resistor-color-duo/261/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/261/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (input) => { +export const decodedValue = (input) => { if (!Array.isArray(input)) { throw new Error('inpout has to be array') } diff --git a/test/fixtures/resistor-color-duo/262/resistor-color-duo.js b/test/fixtures/resistor-color-duo/262/resistor-color-duo.js index 62dab0f2..5b525aba 100644 --- a/test/fixtures/resistor-color-duo/262/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/262/resistor-color-duo.js @@ -11,10 +11,10 @@ const COLORS_OBJ = { white: 9, }; -const value = colors => parseInt(colors.reduce((acc, color) => ( +const decodedValue = colors => parseInt(colors.reduce((acc, color) => ( acc + COLORS_OBJ[color] ), ''), 10); module.exports = { - value, + decodedValue, }; diff --git a/test/fixtures/resistor-color-duo/263/resistor-color-duo.js b/test/fixtures/resistor-color-duo/263/resistor-color-duo.js index e4ee953f..0f12468c 100644 --- a/test/fixtures/resistor-color-duo/263/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/263/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colorsArr) => { +export const decodedValue = (colorsArr) => { const resistor = []; colorsArr.forEach(color => { switch (color) { @@ -22,7 +22,7 @@ export const value = (colorsArr) => { return resistor.push(8); default: return resistor.push(9) - } + } }) return parseInt(resistor.join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/264/resistor-color-duo.js b/test/fixtures/resistor-color-duo/264/resistor-color-duo.js index b5362f8a..496f1ec2 100644 --- a/test/fixtures/resistor-color-duo/264/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/264/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow' ,'green', 'blue', 'violet', 'grey', 'white'] -const value = (color) => { +const decodedValue = (color) => { if (Array.isArray(color)) { return Number(`${COLORS.indexOf(color[0])}${COLORS.indexOf(color[1])}`) } else { @@ -7,4 +7,4 @@ const value = (color) => { } } -export {value} \ No newline at end of file +export {decodedValue} diff --git a/test/fixtures/resistor-color-duo/266/resistor-color-duo.js b/test/fixtures/resistor-color-duo/266/resistor-color-duo.js index 1232c213..4b078635 100644 --- a/test/fixtures/resistor-color-duo/266/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/266/resistor-color-duo.js @@ -4,6 +4,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (bands) => { +export const decodedValue = (bands) => { return parseInt(`${COLORS.indexOf(bands[0])}${COLORS.indexOf(bands[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/267/resistor-color-duo.js b/test/fixtures/resistor-color-duo/267/resistor-color-duo.js index b91a20da..ba00d381 100644 --- a/test/fixtures/resistor-color-duo/267/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/267/resistor-color-duo.js @@ -1,14 +1,14 @@ -// Convert Resistor Color input sequence to numeric value. -// Note: this function supports an arbitrary number of input colors. +// Convert Resistor Color input sequence to numeric decodedValue. +// Note: this function supports an arbitrary number of input colors. // input: list with one or more colors, as strings. -// output: single integer value representing the colors +// output: single integer decodedValue representing the colors // specified in the input string. -// example: value(['red', 'blue']), yields: 26 +// example: decodedValue(['red', 'blue']), yields: 26 -const colors = +const colors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (input_colors) => { +export const decodedValue = (input_colors) => { if (! input_colors || input_colors.length == 0) { throw Error("Invalid input: minimum number of colors is one."); } @@ -22,4 +22,4 @@ export const value = (input_colors) => { position_factor *= 10; } return output; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/268/resistor-color-duo.js b/test/fixtures/resistor-color-duo/268/resistor-color-duo.js index 2dcf6b1b..acaf2a5b 100644 --- a/test/fixtures/resistor-color-duo/268/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/268/resistor-color-duo.js @@ -16,4 +16,4 @@ const getColorValue = colors => colorNames => colors[colorName.toLowerCase()]).join('') -export const value = (colorNames) => Number(getColorValue(colorMap)(colorNames)) \ No newline at end of file +export const decodedValue = (colorNames) => Number(getColorValue(colorMap)(colorNames)) diff --git a/test/fixtures/resistor-color-duo/269/resistor-color-duo.js b/test/fixtures/resistor-color-duo/269/resistor-color-duo.js index 09061566..50c2d8f7 100644 --- a/test/fixtures/resistor-color-duo/269/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/269/resistor-color-duo.js @@ -6,11 +6,11 @@ export const colorCode = (color) => { }; -export const value = (colors) => { +export const decodedValue = (colors) => { let numbers_array = colors.map(colorCode); let sum = ""; for (const item of numbers_array) { sum += String(item) } return parseInt(sum) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/27/resistor-color-duo.js b/test/fixtures/resistor-color-duo/27/resistor-color-duo.js index a1ca60e0..d5270db4 100644 --- a/test/fixtures/resistor-color-duo/27/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/27/resistor-color-duo.js @@ -1,8 +1,8 @@ export var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value([firstColor, secondColor]) { +export function decodedValue([firstColor, secondColor]) { var color1 = COLORS.indexOf(firstColor) var color2 = COLORS.indexOf(secondColor) const result = `${color1}${color2}` return parseInt(result) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/270/resistor-color-duo.js b/test/fixtures/resistor-color-duo/270/resistor-color-duo.js index 1b499683..7b588c54 100644 --- a/test/fixtures/resistor-color-duo/270/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/270/resistor-color-duo.js @@ -1,5 +1,5 @@ const colorArray=["black","brown","red","orange", "yellow", "green","blue", "violet", "grey","white"]; -export function value(colors){ +export function decodedValue(colors){ return colorArray.indexOf(colors[0])*10+colorArray.indexOf(colors[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/271/resistor-color-duo.js b/test/fixtures/resistor-color-duo/271/resistor-color-duo.js index bfa981e8..b8386ac5 100644 --- a/test/fixtures/resistor-color-duo/271/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/271/resistor-color-duo.js @@ -11,8 +11,8 @@ const resistorObj = { white: '9' }; -/* -const value = colors => { +/* +const decodedValue = colors => { const resistanceValue = colors .map(x => resistorObj[x]) .reduce((total, current) => total + current); @@ -20,6 +20,6 @@ const value = colors => { } */ -const value = colors => parseInt(resistorObj[colors[0]] + resistorObj[colors[1]]); +const decodedValue = colors => parseInt(resistorObj[colors[0]] + resistorObj[colors[1]]); -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/272/resistor-color-duo.js b/test/fixtures/resistor-color-duo/272/resistor-color-duo.js index 002edf06..ea41c745 100644 --- a/test/fixtures/resistor-color-duo/272/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/272/resistor-color-duo.js @@ -1,2 +1,2 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors) => Number(colors.map(c => COLORS.indexOf(c)).join(''), 10) +export const decodedValue = (colors) => Number(colors.map(c => COLORS.indexOf(c)).join(''), 10) diff --git a/test/fixtures/resistor-color-duo/273/resistor-color-duo.js b/test/fixtures/resistor-color-duo/273/resistor-color-duo.js index 4b3058f5..5c380520 100644 --- a/test/fixtures/resistor-color-duo/273/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/273/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { let resistorValueAsString = ""; colors.forEach(color => { resistorValueAsString += COLORS.indexOf(color).toString(); @@ -7,4 +7,4 @@ export const value = (colors) => { return parseInt(resistorValueAsString); } -export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; \ No newline at end of file +export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; diff --git a/test/fixtures/resistor-color-duo/274/resistor-color-duo.js b/test/fixtures/resistor-color-duo/274/resistor-color-duo.js index 6bf506ec..437ecc7d 100644 --- a/test/fixtures/resistor-color-duo/274/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/274/resistor-color-duo.js @@ -11,4 +11,4 @@ const resistors = { white: 9 } -export const value = ([key, key2]) => Number(`${resistors[key]}${resistors[key2]}`) \ No newline at end of file +export const decodedValue = ([key, key2]) => Number(`${resistors[key]}${resistors[key2]}`) diff --git a/test/fixtures/resistor-color-duo/275/resistor-color-duo.js b/test/fixtures/resistor-color-duo/275/resistor-color-duo.js index 6ec0499f..4f34a087 100644 --- a/test/fixtures/resistor-color-duo/275/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/275/resistor-color-duo.js @@ -11,8 +11,8 @@ var colorMap = { white: 9 }; -export const value = (colors) => { +export const decodedValue = (colors) => { var result = '' colors.forEach(color => result += colorMap[color]); return Number(result); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/276/resistor-color-duo.js b/test/fixtures/resistor-color-duo/276/resistor-color-duo.js index be980d9a..744d932c 100644 --- a/test/fixtures/resistor-color-duo/276/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/276/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colorPair) => COLORS.indexOf(colorPair[0])*10 + COLORS.indexOf(colorPair[1]); +export const decodedValue = (colorPair) => COLORS.indexOf(colorPair[0])*10 + COLORS.indexOf(colorPair[1]); diff --git a/test/fixtures/resistor-color-duo/277/resistor-color-duo.js b/test/fixtures/resistor-color-duo/277/resistor-color-duo.js index 0008a3b9..c4bd442a 100644 --- a/test/fixtures/resistor-color-duo/277/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/277/resistor-color-duo.js @@ -15,7 +15,7 @@ export const COLORS = [ 'white', ]; -export const value = colors => { +export const decodedValue = colors => { return colors.reduce((acc, color) => { return 10 * acc + colorCode(color); }, 0); diff --git a/test/fixtures/resistor-color-duo/278/resistor-color-duo.js b/test/fixtures/resistor-color-duo/278/resistor-color-duo.js index bd79cb2d..0d7cab1d 100644 --- a/test/fixtures/resistor-color-duo/278/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/278/resistor-color-duo.js @@ -1,7 +1,7 @@ export const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = (input) => { +export const decodedValue = (input) => { let firstValue = COLORS.indexOf(input[0]).toString(); let secondValue = COLORS.indexOf(input[1]).toString(); return parseInt(firstValue + secondValue); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/279/resistor-color-duo.js b/test/fixtures/resistor-color-duo/279/resistor-color-duo.js index 97ef7264..e8a0e3b7 100644 --- a/test/fixtures/resistor-color-duo/279/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/279/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = colors => { +export const decodedValue = colors => { return parseInt(colors.reduce((acc, color) => { return acc + COLORS.indexOf(color.toLowerCase()); diff --git a/test/fixtures/resistor-color-duo/28/resistor-color-duo.js b/test/fixtures/resistor-color-duo/28/resistor-color-duo.js index a713b1c7..5adfe978 100644 --- a/test/fixtures/resistor-color-duo/28/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/28/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colorArr) => colorArr.reduce((acc,cur) => acc*10+COLORS.indexOf(cur), 0); +export const decodedValue = (colorArr) => colorArr.reduce((acc,cur) => acc*10+COLORS.indexOf(cur), 0); diff --git a/test/fixtures/resistor-color-duo/280/resistor-color-duo.js b/test/fixtures/resistor-color-duo/280/resistor-color-duo.js index d9a0ead4..8e81c300 100644 --- a/test/fixtures/resistor-color-duo/280/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/280/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { const COLORS = { black: 0, brown: 1, diff --git a/test/fixtures/resistor-color-duo/281/resistor-color-duo.js b/test/fixtures/resistor-color-duo/281/resistor-color-duo.js index 814bd9d3..6bc01b04 100644 --- a/test/fixtures/resistor-color-duo/281/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/281/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value (x) { +export function decodedValue (x) { let val = ""; val += COLORS.indexOf(x[0]); diff --git a/test/fixtures/resistor-color-duo/282/resistor-color-duo.js b/test/fixtures/resistor-color-duo/282/resistor-color-duo.js index 2afedaf3..1218e8c6 100644 --- a/test/fixtures/resistor-color-duo/282/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/282/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (bands) => { +export const decodedValue = (bands) => { let numbers = []; bands.forEach((band) => { numbers.push(COLORS.indexOf(band)); diff --git a/test/fixtures/resistor-color-duo/283/resistor-color-duo.js b/test/fixtures/resistor-color-duo/283/resistor-color-duo.js index 1716a792..017d6f66 100644 --- a/test/fixtures/resistor-color-duo/283/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/283/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export function value(colors) { +export function decodedValue(colors) { return parseInt(colors.reduce((acc, color) => { return acc.concat(COLORS.findIndex(el => color === el).toString()); }, '')); diff --git a/test/fixtures/resistor-color-duo/284/resistor-color-duo.js b/test/fixtures/resistor-color-duo/284/resistor-color-duo.js index f6b73977..253a981b 100644 --- a/test/fixtures/resistor-color-duo/284/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/284/resistor-color-duo.js @@ -11,7 +11,7 @@ const colorMap = { white: 9, }; -function value(colorNameList) { +function decodedValue(colorNameList) { const accNumbers = colorNameList .map((colorName) => { return colorMap[colorName]; @@ -20,4 +20,4 @@ function value(colorNameList) { return parseInt(accNumbers); } -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/285/resistor-color-duo.js b/test/fixtures/resistor-color-duo/285/resistor-color-duo.js index ee0ef604..05f30117 100644 --- a/test/fixtures/resistor-color-duo/285/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/285/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLOR_CODES = { white: 9, }; -export function value(colors) +export function decodedValue(colors) { return colors.map(color => COLOR_CODES[color]).reduce((acc, digit) => acc * 10 + digit); } diff --git a/test/fixtures/resistor-color-duo/286/resistor-color-duo.js b/test/fixtures/resistor-color-duo/286/resistor-color-duo.js index cd2e7326..e75aad8e 100644 --- a/test/fixtures/resistor-color-duo/286/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/286/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ 'white' ]; -export const value = colors => { +export const decodedValue = colors => { var value1 = COLORS.indexOf(colors[0]); var value2 = COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/287/resistor-color-duo.js b/test/fixtures/resistor-color-duo/287/resistor-color-duo.js index 70dc7afe..4d1910b1 100644 --- a/test/fixtures/resistor-color-duo/287/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/287/resistor-color-duo.js @@ -1,12 +1,12 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const colorCode = (value) =>{ - - return COLORS.indexOf(value); +const colorCode = (decodedValue) =>{ + + return COLORS.indexOf(decodedValue); } -const value =(arr)=>{ +const decodedValue =(arr)=>{ var sol=''; for(var elem in arr){ sol=sol+colorCode(arr[elem]); @@ -15,4 +15,4 @@ const value =(arr)=>{ } -export {COLORS , colorCode, value}; +export {COLORS , colorCode, decodedValue}; diff --git a/test/fixtures/resistor-color-duo/288/resistor-color-duo.js b/test/fixtures/resistor-color-duo/288/resistor-color-duo.js index 68255f73..f006cd7e 100644 --- a/test/fixtures/resistor-color-duo/288/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/288/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (values) => { +export const decodedValue = (values) => { var sum = ""; @@ -40,4 +40,4 @@ export const value = (values) => { return parseInt(sum); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/289/resistor-color-duo.js b/test/fixtures/resistor-color-duo/289/resistor-color-duo.js index ec51282f..a41106c6 100644 --- a/test/fixtures/resistor-color-duo/289/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/289/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { var array = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; var number = parseInt((String(array.indexOf(colors[0])) + String(array.indexOf(colors[1]))), 10); return number; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/29/resistor-color-duo.js b/test/fixtures/resistor-color-duo/29/resistor-color-duo.js index d47dce93..b9a2a75d 100644 --- a/test/fixtures/resistor-color-duo/29/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/29/resistor-color-duo.js @@ -16,5 +16,5 @@ const colorMap = color.reduce((map, color, index) => { return map; }, {}); -export const value = (colors) => colors +export const decodedValue = (colors) => colors .reduce((result, color) => result * 10 + colorMap[color], 0); diff --git a/test/fixtures/resistor-color-duo/290/resistor-color-duo.js b/test/fixtures/resistor-color-duo/290/resistor-color-duo.js index 94db7f65..5d16b33c 100644 --- a/test/fixtures/resistor-color-duo/290/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/290/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value =(name) =>{ +export const decodedValue =(name) =>{ name = ""; for (var i=0; i<2; i++){ name = name+COLORS.indexOf(name); diff --git a/test/fixtures/resistor-color-duo/291/resistor-color-duo.js b/test/fixtures/resistor-color-duo/291/resistor-color-duo.js index db728e3a..7ae50c4f 100644 --- a/test/fixtures/resistor-color-duo/291/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/291/resistor-color-duo.js @@ -11,6 +11,6 @@ const colorMap = { "white": 9 } -export const value = (...args)=>{ - return parseInt(`${colorMap[args[0]]}${colorMap[args[1]]}`) +export const decodedValue = (...args)=>{ + return parseInt(`${colorMap[args[0]]}${colorMap[args[1]]}`) } diff --git a/test/fixtures/resistor-color-duo/292/resistor-color-duo.js b/test/fixtures/resistor-color-duo/292/resistor-color-duo.js index 0b1f7c3f..eb39d0bd 100644 --- a/test/fixtures/resistor-color-duo/292/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/292/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (arr) => { +export const decodedValue = (arr) => { const num_one = arr[0].toLowerCase() const num_two = arr[1].toLowerCase() let key = { @@ -14,4 +14,4 @@ export const value = (arr) => { "white": 9 } return +`${key[num_one]}${key[num_two]}` -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/294/resistor-color-duo.js b/test/fixtures/resistor-color-duo/294/resistor-color-duo.js index fb42b685..267a3009 100644 --- a/test/fixtures/resistor-color-duo/294/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/294/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ 'white' ]; -export const value = colorArr => { +export const decodedValue = colorArr => { return parseInt( colorArr.reduce((acc, next) => acc + COLORS.indexOf(next), '') ); diff --git a/test/fixtures/resistor-color-duo/295/resistor-color-duo.js b/test/fixtures/resistor-color-duo/295/resistor-color-duo.js index 4b721fcb..982bc43c 100644 --- a/test/fixtures/resistor-color-duo/295/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/295/resistor-color-duo.js @@ -1,7 +1,7 @@ const RESISTOR_VALUES = { 'black': '0', 'brown': '1', 'red': '2', 'orange': '3', 'yellow': '4', 'green': '5', 'blue': '6', 'violet':'7', 'grey':'8', 'white':'9' } -const value = (colors) => { +const decodedValue = (colors) => { return Number(RESISTOR_VALUES[colors[0]] + RESISTOR_VALUES[colors[1]]); } -export { RESISTOR_VALUES, value}; +export { RESISTOR_VALUES, decodedValue}; diff --git a/test/fixtures/resistor-color-duo/296/resistor-color-duo.js b/test/fixtures/resistor-color-duo/296/resistor-color-duo.js index b851bd99..c496d8f7 100644 --- a/test/fixtures/resistor-color-duo/296/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/296/resistor-color-duo.js @@ -1,17 +1,17 @@ -export const value = array=>{ +export const decodedValue = array=>{ let result = array.map(a=> [ - "black", - "brown", - "red", - "orange", - "yellow", - "green", - "blue", - "violet", - "grey", + "black", + "brown", + "red", + "orange", + "yellow", + "green", + "blue", + "violet", + "grey", "white" ].indexOf(a) ).join(''); return Number( result ); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/297/resistor-color-duo.js b/test/fixtures/resistor-color-duo/297/resistor-color-duo.js index 4cf080fb..45ba3644 100644 --- a/test/fixtures/resistor-color-duo/297/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/297/resistor-color-duo.js @@ -15,12 +15,12 @@ function colorCode(color) { return COLORS.findIndex(resistor => resistor === color.toLowerCase()); } -export function value(colors) { - let value = ""; +export function decodedValue(colors) { + let decodedValue = ""; colors.forEach(color => { - value += `${colorCode(color)}`; + decodedValue += `${colorCode(color)}`; }); - return parseInt(value); + return parseInt(decodedValue); } diff --git a/test/fixtures/resistor-color-duo/298/resistor-color-duo.js b/test/fixtures/resistor-color-duo/298/resistor-color-duo.js index ba71bc15..48486fe0 100644 --- a/test/fixtures/resistor-color-duo/298/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/298/resistor-color-duo.js @@ -11,10 +11,10 @@ const COLORS = [ "white" ]; -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { const firstIndex = COLORS.indexOf(color1); const secondIndex = COLORS.indexOf(color2); const strNumber = '' + firstIndex + secondIndex; return parseInt(strNumber); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/299/resistor-color-duo.js b/test/fixtures/resistor-color-duo/299/resistor-color-duo.js index ca27d1e8..21bf89b9 100644 --- a/test/fixtures/resistor-color-duo/299/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/299/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = [ 'white', ] -export const value = colors => Number( +export const decodedValue = colors => Number( colors .map(color => COLORS.indexOf(color)) .join('') -) \ No newline at end of file +) diff --git a/test/fixtures/resistor-color-duo/3/resistor-color-duo.js b/test/fixtures/resistor-color-duo/3/resistor-color-duo.js index 7ccd978a..bcb573aa 100644 --- a/test/fixtures/resistor-color-duo/3/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/3/resistor-color-duo.js @@ -1,18 +1,18 @@ -// Define the COLORS object (to be able to use name:value pairs) +// Define the COLORS object (to be able to use name:decodedValue pairs) export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; // Define the color corresponding code export const colorCode = (myColor) => { - + return COLORS.indexOf(myColor); }; // Define the number corresponding to colour array -export const value = (myColors) => { - +export const decodedValue = (myColors) => { + var myValues = myColors.map(colorCode); return Number(myValues.join("")); - + }; diff --git a/test/fixtures/resistor-color-duo/30/resistor-color-duo.js b/test/fixtures/resistor-color-duo/30/resistor-color-duo.js index c65ba3d9..f5156354 100644 --- a/test/fixtures/resistor-color-duo/30/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/30/resistor-color-duo.js @@ -1,9 +1,9 @@ import { colorCode } from '../resistor-color/resistor-color'; -export const value = (input) => { +export const decodedValue = (input) => { let output = ''; input.forEach(function(element) { output += colorCode(element); }); return Number(output); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/300/resistor-color-duo.js b/test/fixtures/resistor-color-duo/300/resistor-color-duo.js index 515bff89..510f44ed 100644 --- a/test/fixtures/resistor-color-duo/300/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/300/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colorArr) => { +export const decodedValue = (colorArr) => { var numStr = ''; for (var i=0; i { +const decodedValue = (colorArr) => { return +`${COLORS.indexOf(colorArr[0])}${COLORS.indexOf(colorArr[1])}`; }; -export { value, COLORS }; \ No newline at end of file +export { decodedValue, COLORS }; diff --git a/test/fixtures/resistor-color-duo/302/resistor-color-duo.js b/test/fixtures/resistor-color-duo/302/resistor-color-duo.js index f603588e..03e0a7a6 100644 --- a/test/fixtures/resistor-color-duo/302/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/302/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colors.map(color => COLORS.indexOf(color)).join('')); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/303/resistor-color-duo.js b/test/fixtures/resistor-color-duo/303/resistor-color-duo.js index b929877c..d685796d 100644 --- a/test/fixtures/resistor-color-duo/303/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/303/resistor-color-duo.js @@ -9,7 +9,7 @@ function colorCode(color) { } } -export const value = (colors) => { +export const decodedValue = (colors) => { const array = new Array; colors.forEach(element => { array.push(colorCode(element)); diff --git a/test/fixtures/resistor-color-duo/304/resistor-color-duo.js b/test/fixtures/resistor-color-duo/304/resistor-color-duo.js index 569b0596..cdf4c6d6 100644 --- a/test/fixtures/resistor-color-duo/304/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/304/resistor-color-duo.js @@ -1,7 +1,7 @@ const resistorColors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (colors) => { - let a = resistorColors.indexOf(colors[0]); - let b = resistorColors.indexOf(colors[1]); +export const decodedValue = (colors) => { + let a = resistorColors.indexOf(colors[0]); + let b = resistorColors.indexOf(colors[1]); return parseInt(a + '' + b) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/305/resistor-color-duo.js b/test/fixtures/resistor-color-duo/305/resistor-color-duo.js index f032b12c..4096c0e4 100644 --- a/test/fixtures/resistor-color-duo/305/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/305/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = arr => { +export const decodedValue = arr => { let total = ""; arr.forEach(function(color) { total += COLORS.indexOf(color); diff --git a/test/fixtures/resistor-color-duo/306/resistor-color-duo.js b/test/fixtures/resistor-color-duo/306/resistor-color-duo.js index e480ee68..e2c7ec3c 100644 --- a/test/fixtures/resistor-color-duo/306/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/306/resistor-color-duo.js @@ -2,7 +2,7 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; module.exports = { - value(input) { + decodedValue(input) { const numbers = input.map(color => COLORS.indexOf(color)); return parseInt(numbers.join("")); } diff --git a/test/fixtures/resistor-color-duo/307/resistor-color-duo.js b/test/fixtures/resistor-color-duo/307/resistor-color-duo.js index 77401bfd..81716347 100644 --- a/test/fixtures/resistor-color-duo/307/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/307/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; const colorCode = (color) => COLORS.indexOf(color); -export const value = (input) => Number(input.map(color => colorCode(color)).join('')); \ No newline at end of file +export const decodedValue = (input) => Number(input.map(color => colorCode(color)).join('')); diff --git a/test/fixtures/resistor-color-duo/308/resistor-color-duo.js b/test/fixtures/resistor-color-duo/308/resistor-color-duo.js index e375ee4c..866d88c7 100644 --- a/test/fixtures/resistor-color-duo/308/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/308/resistor-color-duo.js @@ -1,6 +1,6 @@ -export const value = (arr) => { +export const decodedValue = (arr) => { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const half = COLORS.indexOf(arr[0]); const half2 = COLORS.indexOf(arr[1]); return Number(half.toString() + half2.toString()); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/309/resistor-color-duo.js b/test/fixtures/resistor-color-duo/309/resistor-color-duo.js index 249af98b..24fd930e 100644 --- a/test/fixtures/resistor-color-duo/309/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/309/resistor-color-duo.js @@ -1,3 +1,3 @@ const RESISTORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = (colors) => parseInt(colors.map(color => RESISTORS.findIndex(c => c === color)).join('')); \ No newline at end of file +export const decodedValue = (colors) => parseInt(colors.map(color => RESISTORS.findIndex(c => c === color)).join('')); diff --git a/test/fixtures/resistor-color-duo/31/resistor-color-duo.js b/test/fixtures/resistor-color-duo/31/resistor-color-duo.js index dedcca20..67b71ede 100644 --- a/test/fixtures/resistor-color-duo/31/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/31/resistor-color-duo.js @@ -1,8 +1,8 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (color) => { +export const decodedValue = (color) => { let result = '' for (let i = 0; i< color.length; i++){ result += `${COLORS.indexOf(color[i])}`; } return Number(result); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/310/resistor-color-duo.js b/test/fixtures/resistor-color-duo/310/resistor-color-duo.js index ba0a1027..6000cf5f 100644 --- a/test/fixtures/resistor-color-duo/310/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/310/resistor-color-duo.js @@ -9,7 +9,7 @@ function getColorValue(color) { return -1; } -function value(colorNames) { +function decodedValue(colorNames) { const firstColorValue = getColorValue(colorNames[0]); const secondColorValue = getColorValue(colorNames[1]); return parseInt(`${firstColorValue}${secondColorValue}`, 10); @@ -17,5 +17,5 @@ function value(colorNames) { module.exports = { - value -}; \ No newline at end of file + decodedValue +}; diff --git a/test/fixtures/resistor-color-duo/311/resistor-color-duo.js b/test/fixtures/resistor-color-duo/311/resistor-color-duo.js index e9c365b3..ab3c7303 100644 --- a/test/fixtures/resistor-color-duo/311/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/311/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const colorCode = color => COLORS.indexOf(color); -export function value(ar){ +export function decodedValue(ar){ return colorCode(ar[0]) * 10 + colorCode(ar[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/312/resistor-color-duo.js b/test/fixtures/resistor-color-duo/312/resistor-color-duo.js index 9e8560de..b18dc23b 100644 --- a/test/fixtures/resistor-color-duo/312/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/312/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colora, colorb) => colors[colora] + '' + colors[colorb]; +export const decodedValue = (colora, colorb) => colors[colora] + '' + colors[colorb]; const colors = { black: 0, diff --git a/test/fixtures/resistor-color-duo/313/resistor-color-duo.js b/test/fixtures/resistor-color-duo/313/resistor-color-duo.js index 7ce15b5a..ce4826c7 100644 --- a/test/fixtures/resistor-color-duo/313/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/313/resistor-color-duo.js @@ -1,7 +1,7 @@ // IN arr, OUT num -// +// export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = arr => +(COLORS.indexOf(arr[0]).toString() + COLORS.indexOf(arr[1]).toString()); \ No newline at end of file +export const decodedValue = arr => +(COLORS.indexOf(arr[0]).toString() + COLORS.indexOf(arr[1]).toString()); diff --git a/test/fixtures/resistor-color-duo/314/resistor-color-duo.js b/test/fixtures/resistor-color-duo/314/resistor-color-duo.js index 07008c92..5c5fbff4 100644 --- a/test/fixtures/resistor-color-duo/314/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/314/resistor-color-duo.js @@ -15,8 +15,8 @@ const colorCode = color => { return COLORS.indexOf(color); }; -export const value = colorCode.reduce((value, currentColor) => -value + currentColor.colorCode, // reducer function - 0 // initial accumulator value +export const decodedValue = colorCode.reduce((decodedValue, currentColor) => +decodedValue + currentColor.colorCode, // reducer function + 0 // initial accumulator decodedValue ); diff --git a/test/fixtures/resistor-color-duo/315/resistors-color-duo.js b/test/fixtures/resistor-color-duo/315/resistors-color-duo.js index 4f6230f0..bb04948d 100644 --- a/test/fixtures/resistor-color-duo/315/resistors-color-duo.js +++ b/test/fixtures/resistor-color-duo/315/resistors-color-duo.js @@ -1,15 +1,15 @@ // const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -// const value = function (color1, color2) { -// var value=[]; -// value.push(colors.indexOf(color1)); -// value.push(colors.indexOf(color2)); -// return value.join(''); +// const decodedValue = function (color1, color2) { +// var decodedValue=[]; +// decodedValue.push(colors.indexOf(color1)); +// decodedValue.push(colors.indexOf(color2)); +// return decodedValue.join(''); // }; export const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = function (color) { +export const decodedValue = function (color) { var val=[]; val.push(colors.indexOf(color[0])); val.push(colors.indexOf(color[1])); return parseFloat(val.join('')); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/316/resistor-color-duo.js b/test/fixtures/resistor-color-duo/316/resistor-color-duo.js index 1ef119c6..40127ac1 100644 --- a/test/fixtures/resistor-color-duo/316/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/316/resistor-color-duo.js @@ -1,6 +1,6 @@ var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -function value(colorCode){ +function decodedValue(colorCode){ return parseInt((Array.from(colorCode , element=> COLORS.includes(element) ? COLORS.indexOf(element) : "")).join('')); } -module.exports={ value }; \ No newline at end of file +module.exports={ decodedValue }; diff --git a/test/fixtures/resistor-color-duo/317/resistor-color-duo.js b/test/fixtures/resistor-color-duo/317/resistor-color-duo.js index 4774291a..eecf5ccc 100644 --- a/test/fixtures/resistor-color-duo/317/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/317/resistor-color-duo.js @@ -1,8 +1,8 @@ export var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value([color1, color2]) { +export function decodedValue([color1, color2]) { var num1 = COLORS.indexOf(color1); var num2 = COLORS.indexOf(color2); var num3 = num1.toString() + num2.toString(); -return parseInt(num3); +return parseInt(num3); } - + diff --git a/test/fixtures/resistor-color-duo/319/resistor-color-duo.js b/test/fixtures/resistor-color-duo/319/resistor-color-duo.js index 3f1a2aca..e97a6c56 100644 --- a/test/fixtures/resistor-color-duo/319/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/319/resistor-color-duo.js @@ -1,3 +1,3 @@ import { colorCode } from '../resistor-color/resistor-color'; -export const value = ([a, b]) => parseInt(`${colorCode(a)}${colorCode(b)}`, 10); +export const decodedValue = ([a, b]) => parseInt(`${colorCode(a)}${colorCode(b)}`, 10); diff --git a/test/fixtures/resistor-color-duo/32/resistor-color-duo.js b/test/fixtures/resistor-color-duo/32/resistor-color-duo.js index f79d2210..065864f0 100644 --- a/test/fixtures/resistor-color-duo/32/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/32/resistor-color-duo.js @@ -2,4 +2,4 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet", const colorCode = color => COLORS.indexOf(color); -export const value = (colors) => colorCode(colors[0])*10 + colorCode(colors[1]); \ No newline at end of file +export const decodedValue = (colors) => colorCode(colors[0])*10 + colorCode(colors[1]); diff --git a/test/fixtures/resistor-color-duo/320/resistor-color-duo.js b/test/fixtures/resistor-color-duo/320/resistor-color-duo.js index 98fccb0f..af167929 100644 --- a/test/fixtures/resistor-color-duo/320/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/320/resistor-color-duo.js @@ -2,7 +2,7 @@ var COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'vio const colorCode = (color) => COLORS.indexOf(color); -function value(color1, color2) { +function decodedValue(color1, color2) { var firstValue = colorCode(color1).toString; var secondValue = colorCode(color2).toString; @@ -10,4 +10,4 @@ function value(color1, color2) { return truth; } -export { COLORS, value }; \ No newline at end of file +export { COLORS, decodedValue }; diff --git a/test/fixtures/resistor-color-duo/321/resistor-color-duo.js b/test/fixtures/resistor-color-duo/321/resistor-color-duo.js index ee7f74f3..de347111 100644 --- a/test/fixtures/resistor-color-duo/321/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/321/resistor-color-duo.js @@ -1,2 +1,2 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = colors => Number(colors.map(color => COLORS.indexOf(color)).join('')); +export const decodedValue = colors => Number(colors.map(color => COLORS.indexOf(color)).join('')); diff --git a/test/fixtures/resistor-color-duo/322/resistor-color-duo.js b/test/fixtures/resistor-color-duo/322/resistor-color-duo.js index b4bbe36b..d77065b8 100644 --- a/test/fixtures/resistor-color-duo/322/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/322/resistor-color-duo.js @@ -10,7 +10,7 @@ const COLORS = [ 'grey', 'white' ]; -export const value = ([first, second]) => { - let value = ''.concat(COLORS.indexOf(first), COLORS.indexOf(second)); - return Number(value); +export const decodedValue = ([first, second]) => { + let decodedValue = ''.concat(COLORS.indexOf(first), COLORS.indexOf(second)); + return Number(decodedValue); }; diff --git a/test/fixtures/resistor-color-duo/323/resistor-color-duo.js b/test/fixtures/resistor-color-duo/323/resistor-color-duo.js index 6000e58f..a461236f 100644 --- a/test/fixtures/resistor-color-duo/323/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/323/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const value = (duoColor = []) => { +const decodedValue = (duoColor = []) => { let code = ''; for (let i = 0; i < duoColor.length; i++) { code += `${COLORS.indexOf(duoColor[i])}`; @@ -8,4 +8,4 @@ const value = (duoColor = []) => { return parseInt(code); } -export { value }; \ No newline at end of file +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/324/resistor-color-duo.js b/test/fixtures/resistor-color-duo/324/resistor-color-duo.js index 8319f26e..6c43ef25 100644 --- a/test/fixtures/resistor-color-duo/324/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/324/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = ([res1, res2]) => { +export const decodedValue = ([res1, res2]) => { return parseInt( COLORS.indexOf(res1).toString() + COLORS.indexOf(res2).toString() ); diff --git a/test/fixtures/resistor-color-duo/325/resistor-color-duo.js b/test/fixtures/resistor-color-duo/325/resistor-color-duo.js index 44adc761..7e0d8619 100644 --- a/test/fixtures/resistor-color-duo/325/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/325/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colorSet) => { +export const decodedValue = (colorSet) => { let stringOut = COLORS.indexOf(colorSet[0]).toString() + COLORS.indexOf(colorSet[1]).toString() return parseInt(stringOut) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/326/resistor-color-duo.js b/test/fixtures/resistor-color-duo/326/resistor-color-duo.js index 7f9c47a4..bda4502b 100644 --- a/test/fixtures/resistor-color-duo/326/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/326/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ 'white' ]; -export const value = ([ color1, color2 ]) => { +export const decodedValue = ([ color1, color2 ]) => { const result = parseInt( `${COLORS.indexOf(color1)}${COLORS.indexOf(color2)}`, 10 diff --git a/test/fixtures/resistor-color-duo/327/resistor-color-duo.js b/test/fixtures/resistor-color-duo/327/resistor-color-duo.js index 483d28a9..1eb1071e 100644 --- a/test/fixtures/resistor-color-duo/327/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/327/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (inputArray) => { +export const decodedValue = (inputArray) => { return parseInt(COLORS.indexOf(inputArray[0]).toString() + COLORS.indexOf(inputArray[1]).toString()) } diff --git a/test/fixtures/resistor-color-duo/328/resistor-color-duo.js b/test/fixtures/resistor-color-duo/328/resistor-color-duo.js index 65c7daee..379374a8 100644 --- a/test/fixtures/resistor-color-duo/328/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/328/resistor-color-duo.js @@ -11,11 +11,11 @@ export const COLORS = [ "white" ] -export const value = (arrColors) =>{ +export const decodedValue = (arrColors) =>{ var result = ""; arrColors.forEach(color => { result += COLORS.indexOf(color); }); return Number.parseInt(result); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/329/resistor-color-duo.js b/test/fixtures/resistor-color-duo/329/resistor-color-duo.js index 1b86eae9..e1abf5fa 100644 --- a/test/fixtures/resistor-color-duo/329/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/329/resistor-color-duo.js @@ -10,13 +10,13 @@ const COLORS = [ 'grey', 'white' ]; - - export function value() { + + export function decodedValue() { var s = ""; var colors = arguments[0]; for (var i = 0; i < colors.length; i++){ s += COLORS.indexOf(colors[i].toLowerCase()); - - } + + } return parseInt(s); - } \ No newline at end of file + } diff --git a/test/fixtures/resistor-color-duo/33/resistor-color-duo.js b/test/fixtures/resistor-color-duo/33/resistor-color-duo.js index cf501509..34122b49 100644 --- a/test/fixtures/resistor-color-duo/33/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/33/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = [ "white" ]; -function value([colorA, colorB]) { +function decodedValue([colorA, colorB]) { return COLORS.indexOf(colorA) * 10 + COLORS.indexOf(colorB); } -module.exports = { value }; +module.exports = { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/330/resistor-color-duo.js b/test/fixtures/resistor-color-duo/330/resistor-color-duo.js index cf937d27..3da5dc01 100644 --- a/test/fixtures/resistor-color-duo/330/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/330/resistor-color-duo.js @@ -12,6 +12,6 @@ grey: '8', white: '9' } -export function value(arrayofTwo) { - return parseInt((colorObj[arrayofTwo[0]] + colorObj[arrayofTwo[1]])) -} \ No newline at end of file +export function decodedValue(arrayofTwo) { + return parseInt((colorObj[arrayofTwo[0]] + colorObj[arrayofTwo[1]])) +} diff --git a/test/fixtures/resistor-color-duo/331/resistor-color-duo.js b/test/fixtures/resistor-color-duo/331/resistor-color-duo.js index de98251c..eab803d3 100644 --- a/test/fixtures/resistor-color-duo/331/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/331/resistor-color-duo.js @@ -1,2 +1,2 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = colors => Number(colors.reduce((accumulator, color) => accumulator + COLORS.indexOf(color), '')); +export const decodedValue = colors => Number(colors.reduce((accumulator, color) => accumulator + COLORS.indexOf(color), '')); diff --git a/test/fixtures/resistor-color-duo/332/index.js b/test/fixtures/resistor-color-duo/332/index.js index 304a9ebf..decd7a47 100644 --- a/test/fixtures/resistor-color-duo/332/index.js +++ b/test/fixtures/resistor-color-duo/332/index.js @@ -3,6 +3,6 @@ export const COLORS = [ 'black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white', ]; - export function value(colors) { + export function decodedValue(colors) { return Number(`${COLORS.indexOf(colors[0])}${COLORS.indexOf(colors[1])}`) - } \ No newline at end of file + } diff --git a/test/fixtures/resistor-color-duo/333/resistor-color-duo.js b/test/fixtures/resistor-color-duo/333/resistor-color-duo.js index d245fc69..9955f23c 100644 --- a/test/fixtures/resistor-color-duo/333/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/333/resistor-color-duo.js @@ -10,7 +10,7 @@ const resistorColors = [ 'grey', 'white' ] -let value = ([color1, color2]) => { +let decodedValue = ([color1, color2]) => { let colorIndex1 = resistorColors.indexOf(color1) let colorIndex2 = resistorColors.indexOf(color2) // concatenates the array indices as a string @@ -19,4 +19,4 @@ let value = ([color1, color2]) => { return Number(resistorCodes) } -export { value, resistorColors } +export { decodedValue, resistorColors } diff --git a/test/fixtures/resistor-color-duo/334/resistor-color-duo.js b/test/fixtures/resistor-color-duo/334/resistor-color-duo.js index eea4dac8..485b5292 100644 --- a/test/fixtures/resistor-color-duo/334/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/334/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = array => { +export const decodedValue = array => { return ( COLORS.indexOf(array[0]).toString() + COLORS.indexOf(array[1]).toString() ); diff --git a/test/fixtures/resistor-color-duo/335/resistor-color-duo.js b/test/fixtures/resistor-color-duo/335/resistor-color-duo.js index 6b537965..9521f71e 100644 --- a/test/fixtures/resistor-color-duo/335/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/335/resistor-color-duo.js @@ -11,6 +11,6 @@ export const COLORS = { white: 9 }; -export const value = input => { +export const decodedValue = input => { return +input.map(x => COLORS[x]).join(""); }; diff --git a/test/fixtures/resistor-color-duo/336/resistor-color-duo.js b/test/fixtures/resistor-color-duo/336/resistor-color-duo.js index 6f5e1c46..e5637f53 100644 --- a/test/fixtures/resistor-color-duo/336/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/336/resistor-color-duo.js @@ -24,4 +24,4 @@ const totalResistance = colors => 0 ); -export const value = totalResistance; +export const decodedValue = totalResistance; diff --git a/test/fixtures/resistor-color-duo/337/resistor-color-duo.js b/test/fixtures/resistor-color-duo/337/resistor-color-duo.js index 558c6c29..74d69f01 100644 --- a/test/fixtures/resistor-color-duo/337/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/337/resistor-color-duo.js @@ -12,7 +12,7 @@ export const COLORS = [ ]; /** - * Returns the value of the given `color` on the resister color code. + * Returns the decodedValue of the given `color` on the resister color code. * * @param {string} color * @@ -21,10 +21,10 @@ export const COLORS = [ export const colorCode = color => COLORS.indexOf(color.toLowerCase()); /** - * Returns the resistance value of a resistor with the given `colors`. + * Returns the resistance decodedValue of a resistor with the given `colors`. * * @param {Array} colors * * @return {number} */ -export const value = colors => +colors.map(colorCode).join(''); +export const decodedValue = colors => +colors.map(colorCode).join(''); diff --git a/test/fixtures/resistor-color-duo/338/resistor-color-duo.js b/test/fixtures/resistor-color-duo/338/resistor-color-duo.js index 24ea85ea..016ea7fd 100644 --- a/test/fixtures/resistor-color-duo/338/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/338/resistor-color-duo.js @@ -1,11 +1,11 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] - export const value = (arr) => { + export const decodedValue = (arr) => { let indexColorA = COLORS.indexOf(arr[0]).toString() let indexColorB = COLORS.indexOf(arr[1]).toString() - - + + return parseInt(indexColorA + indexColorB) } diff --git a/test/fixtures/resistor-color-duo/339/resistor-color-duo.js b/test/fixtures/resistor-color-duo/339/resistor-color-duo.js index da92c61f..510ff677 100644 --- a/test/fixtures/resistor-color-duo/339/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/339/resistor-color-duo.js @@ -11,9 +11,9 @@ const COLORS = { white: 9 } -function value(duo) { - const value = duo.map(color => COLORS[color]).join('') - return parseInt(value) +function decodedValue(duo) { + const decodedValue = duo.map(color => COLORS[color]).join('') + return parseInt(decodedValue) } -export { value } \ No newline at end of file +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/34/resistor-color-duo.js b/test/fixtures/resistor-color-duo/34/resistor-color-duo.js index 586c2871..f91465fe 100644 --- a/test/fixtures/resistor-color-duo/34/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/34/resistor-color-duo.js @@ -4,11 +4,11 @@ const colorCode = function (color){ return COLORS.indexOf(color) } -export const value = (colors) => { +export const decodedValue = (colors) => { let val = 0; colors.forEach((element,index) =>{ - //shift over the previous value and add the current color code value + //shift over the previous decodedValue and add the current color code decodedValue val = (val * Math.pow(10,index)) + colorCode(element) }) return val; diff --git a/test/fixtures/resistor-color-duo/340/resistor-color-duo.js b/test/fixtures/resistor-color-duo/340/resistor-color-duo.js index 5a03eada..58ae05db 100644 --- a/test/fixtures/resistor-color-duo/340/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/340/resistor-color-duo.js @@ -1,2 +1,2 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = ([color1, color2]) => Number("" + COLORS.indexOf(color1) + (COLORS.indexOf(color2))); \ No newline at end of file +export const decodedValue = ([color1, color2]) => Number("" + COLORS.indexOf(color1) + (COLORS.indexOf(color2))); diff --git a/test/fixtures/resistor-color-duo/341/resistor-color-duo.js b/test/fixtures/resistor-color-duo/341/resistor-color-duo.js index 93c4d5c6..4ac0ef30 100644 --- a/test/fixtures/resistor-color-duo/341/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/341/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { const values = [ 'black', 'brown', @@ -14,4 +14,4 @@ export const value = (colors) => { const number = Number(`${values.indexOf(colors[0])}${values.indexOf(colors[1])}`); return number; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/342/resistor-color-duo.js b/test/fixtures/resistor-color-duo/342/resistor-color-duo.js index 4cf917d2..9805664f 100644 --- a/test/fixtures/resistor-color-duo/342/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/342/resistor-color-duo.js @@ -1,8 +1,8 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { var firstValue = COLORS.indexOf(colors[0].toLowerCase()); var secondValue = COLORS.indexOf(colors[1].toLowerCase()); - + return(10 * firstValue + secondValue); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/343/resistor-color-duo.js b/test/fixtures/resistor-color-duo/343/resistor-color-duo.js index 7f043007..86b16c57 100644 --- a/test/fixtures/resistor-color-duo/343/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/343/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = function(colors) { +export const decodedValue = function(colors) { const colorArray = Array.from(colors); const resultAsString = colorArray.reduce((previous, current) => { if (previous) { diff --git a/test/fixtures/resistor-color-duo/344/resistor-color-duo.js b/test/fixtures/resistor-color-duo/344/resistor-color-duo.js index 671c3b1f..5c70b4e0 100644 --- a/test/fixtures/resistor-color-duo/344/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/344/resistor-color-duo.js @@ -10,9 +10,9 @@ const COLORS = [ 'grey', 'white' ]; - const value = ([x, y]) => { + const decodedValue = ([x, y]) => { let a = String(COLORS.indexOf(x)); let b = String(COLORS.indexOf(y)); return a + b; } - export { COLORS, value }; \ No newline at end of file + export { COLORS, decodedValue }; diff --git a/test/fixtures/resistor-color-duo/345/resistor-color-duo.js b/test/fixtures/resistor-color-duo/345/resistor-color-duo.js index 62c5074d..d538accb 100644 --- a/test/fixtures/resistor-color-duo/345/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/345/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = ([color1, color2]) => ( +export const decodedValue = ([color1, color2]) => ( parseInt(`${COLORS.indexOf(color1)}${COLORS.indexOf(color2)}`, 10) ) diff --git a/test/fixtures/resistor-color-duo/346/resistor-color-duo.js b/test/fixtures/resistor-color-duo/346/resistor-color-duo.js index ae5cdbe1..271bb90e 100644 --- a/test/fixtures/resistor-color-duo/346/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/346/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = function(bands) { +export const decodedValue = function(bands) { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; if (bands[0] == bands[1]) { // Case: matching bands @@ -9,14 +9,14 @@ export const value = function(bands) { let digit1 = -1 let digit2 = -1; - + // Search for both resistor values - for (let i = 0; digit1 < 0 || digit2 < 0 && i < COLORS.length; i++) { - if (bands[0] == COLORS[i]) + for (let i = 0; digit1 < 0 || digit2 < 0 && i < COLORS.length; i++) { + if (bands[0] == COLORS[i]) digit1 = i; - else if (bands[1] == COLORS[i]) - digit2 = i; + else if (bands[1] == COLORS[i]) + digit2 = i; } return parseInt(digit1.toString() + digit2.toString()); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/347/resistor-color-duo.js b/test/fixtures/resistor-color-duo/347/resistor-color-duo.js index 15fadc28..34a15ef0 100644 --- a/test/fixtures/resistor-color-duo/347/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/347/resistor-color-duo.js @@ -11,4 +11,4 @@ const COLORS = { white: 9, }; -export const value = resistors => COLORS[resistors[0]] * 10 + COLORS[resistors[1]]; \ No newline at end of file +export const decodedValue = resistors => COLORS[resistors[0]] * 10 + COLORS[resistors[1]]; diff --git a/test/fixtures/resistor-color-duo/348/resistor-color-duo.js b/test/fixtures/resistor-color-duo/348/resistor-color-duo.js index 92acfbc6..3973ebd2 100644 --- a/test/fixtures/resistor-color-duo/348/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/348/resistor-color-duo.js @@ -1,3 +1,3 @@ -export const value = { - -} \ No newline at end of file +export const decodedValue = { + +} diff --git a/test/fixtures/resistor-color-duo/349/resistor-color-duo.js b/test/fixtures/resistor-color-duo/349/resistor-color-duo.js index 4105ba13..8ead6beb 100644 --- a/test/fixtures/resistor-color-duo/349/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/349/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -export const value = ([value1, value2]) => { +export const decodedValue = ([value1, value2]) => { return COLORS.indexOf(value1) * 10 + COLORS.indexOf(value2); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/35/resistor-color-duo.js b/test/fixtures/resistor-color-duo/35/resistor-color-duo.js index 4c9c7400..a8a2618c 100644 --- a/test/fixtures/resistor-color-duo/35/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/35/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = colors => { +export const decodedValue = colors => { return Number( colors.reduce( (accumulator, color) => accumulator + COLORS.indexOf(color), diff --git a/test/fixtures/resistor-color-duo/350/resistor-color-duo.js b/test/fixtures/resistor-color-duo/350/resistor-color-duo.js index 3c4d4d3d..f17e7646 100644 --- a/test/fixtures/resistor-color-duo/350/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/350/resistor-color-duo.js @@ -2,7 +2,7 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","v export const colorCode = color => COLORS.indexOf(color) -export const value = colors => { +export const decodedValue = colors => { let firstColor, secondColor [firstColor, secondColor] = colors return parseInt(`${colorCode(firstColor)}${colorCode(secondColor)}`) diff --git a/test/fixtures/resistor-color-duo/351/resistor-color-duo.js b/test/fixtures/resistor-color-duo/351/resistor-color-duo.js index 5a7f8265..97f640c0 100644 --- a/test/fixtures/resistor-color-duo/351/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/351/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); +export const decodedValue = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/352/resistor-color-duo.js b/test/fixtures/resistor-color-duo/352/resistor-color-duo.js index 09876f8b..2d168430 100644 --- a/test/fixtures/resistor-color-duo/352/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/352/resistor-color-duo.js @@ -1,3 +1,3 @@ import { colorCode } from '../resistor-color/resistor-color.js'; -export const value = (colors) => parseInt(colors.map(arg => colorCode(arg)).filter(code => code > -1).join('')) \ No newline at end of file +export const decodedValue = (colors) => parseInt(colors.map(arg => colorCode(arg)).filter(code => code > -1).join('')) diff --git a/test/fixtures/resistor-color-duo/353/resistor-color-duo.js b/test/fixtures/resistor-color-duo/353/resistor-color-duo.js index 467def40..908c3e7d 100644 --- a/test/fixtures/resistor-color-duo/353/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/353/resistor-color-duo.js @@ -11,6 +11,6 @@ const values = { white: 9, } -export const value = ( [color1, color2] ) => { +export const decodedValue = ( [color1, color2] ) => { return Number(`${values[color1]}${values[color2]}`); } diff --git a/test/fixtures/resistor-color-duo/354/resistor-color-duo.js b/test/fixtures/resistor-color-duo/354/resistor-color-duo.js index 45b59a4e..36c732e0 100644 --- a/test/fixtures/resistor-color-duo/354/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/354/resistor-color-duo.js @@ -1,4 +1,4 @@ var COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export function value(colorArray) { +export function decodedValue(colorArray) { return + colorArray.map(color => COLORS.indexOf(color)).join('') -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/355/resistor-color-duo.js b/test/fixtures/resistor-color-duo/355/resistor-color-duo.js index fc7558cc..7e2695d0 100644 --- a/test/fixtures/resistor-color-duo/355/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/355/resistor-color-duo.js @@ -1,7 +1,7 @@ -export const value = (values) => { +export const decodedValue = (values) => { return values.reduce((acc, curr, index, arr) => { return acc + (COLORS.indexOf(curr) * Math.pow(10, arr.length - 1 - index)); },0); }; -export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; \ No newline at end of file +export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; diff --git a/test/fixtures/resistor-color-duo/356/resistor-color-duo.js b/test/fixtures/resistor-color-duo/356/resistor-color-duo.js index c68ef143..c04fbbfd 100644 --- a/test/fixtures/resistor-color-duo/356/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/356/resistor-color-duo.js @@ -10,4 +10,4 @@ const COLOR_MAP = { 'grey': '8', 'white': '9' } -export const value = (colors) => parseInt(colors.map(color => COLOR_MAP[color]).join(''), 10) +export const decodedValue = (colors) => parseInt(colors.map(color => COLOR_MAP[color]).join(''), 10) diff --git a/test/fixtures/resistor-color-duo/357/resistor-color-duo.js b/test/fixtures/resistor-color-duo/357/resistor-color-duo.js index cb8cd251..26980ad4 100644 --- a/test/fixtures/resistor-color-duo/357/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/357/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (something) => parseInt(colorsMap[something[0]].toString().concat(colorsMap[something[1]].toString())) +export const decodedValue = (something) => parseInt(colorsMap[something[0]].toString().concat(colorsMap[something[1]].toString())) const colorsMap = { "black": 0, "brown": 1, diff --git a/test/fixtures/resistor-color-duo/358/resistor-color-duo.js b/test/fixtures/resistor-color-duo/358/resistor-color-duo.js index 4e7fd624..43369862 100644 --- a/test/fixtures/resistor-color-duo/358/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/358/resistor-color-duo.js @@ -4,7 +4,7 @@ const colorCode = color => { return COLORS.indexOf(color.toLowerCase()); }; -const value = (colorString) => { +const decodedValue = (colorString) => { const color1 = colorString.split(' ')[0].toLowerCase(); const color2 = colorString.split(' ')[2].toLowerCase(); const value1 = colorCode(color1); diff --git a/test/fixtures/resistor-color-duo/359/resistor-color-duo.js b/test/fixtures/resistor-color-duo/359/resistor-color-duo.js index c04f532e..cd5f2c78 100644 --- a/test/fixtures/resistor-color-duo/359/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/359/resistor-color-duo.js @@ -1,17 +1,17 @@ -export const value = (ColorArray) => { +export const decodedValue = (ColorArray) => { var COLORS = [ - 'black', - 'brown', - 'red', - 'orange', - 'yellow', - 'green', - 'blue', - 'violet', - 'grey', + 'black', + 'brown', + 'red', + 'orange', + 'yellow', + 'green', + 'blue', + 'violet', + 'grey', 'white' ]; - return (COLORS.indexOf(ColorArray[0])*10 + return (COLORS.indexOf(ColorArray[0])*10 + COLORS.indexOf(ColorArray[1])); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/36/resistor-color-duo.js b/test/fixtures/resistor-color-duo/36/resistor-color-duo.js index 1de3dc85..c49b6da0 100644 --- a/test/fixtures/resistor-color-duo/36/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/36/resistor-color-duo.js @@ -1,8 +1,8 @@ var COLORS = ["black", "brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) =>{ +export const decodedValue = (colors) =>{ let color = colors[0]; let color2 = colors[1]; - return parseInt(COLORS.indexOf(color).toString() + + return parseInt(COLORS.indexOf(color).toString() + COLORS.indexOf(color2).toString()); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/360/resistor-color-duo.js b/test/fixtures/resistor-color-duo/360/resistor-color-duo.js index 0536f9f8..e56a52ae 100644 --- a/test/fixtures/resistor-color-duo/360/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/360/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ 'white' ] -export const value = colors => { +export const decodedValue = colors => { return parseInt(colors.reduce((acc, cur) => (acc += COLORS.indexOf(cur)), '')) // return COLORS.indexOf(color) } diff --git a/test/fixtures/resistor-color-duo/361/resistor-color-duo.js b/test/fixtures/resistor-color-duo/361/resistor-color-duo.js index 702a6464..f298b652 100644 --- a/test/fixtures/resistor-color-duo/361/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/361/resistor-color-duo.js @@ -1,3 +1,3 @@ import { colorCode } from './resistor-color.js'; -export const value = (colors) => parseInt(colors.map(color => colorCode(color)).join(''), 10); +export const decodedValue = (colors) => parseInt(colors.map(color => colorCode(color)).join(''), 10); diff --git a/test/fixtures/resistor-color-duo/361/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/361/resistor-color-duo.spec.js index adfe9c1b..ea73f99b 100644 --- a/test/fixtures/resistor-color-duo/361/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/361/resistor-color-duo.spec.js @@ -1,27 +1,27 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); describe('Invalid Color codes', () => { test('Ultraviolet and black', () => { try { - value(['ultraviolet', 'black']); + decodedValue(['ultraviolet', 'black']); } catch (error) { expect(error.message).toEqual('Color ultraviolet is not a valid resistor color'); } @@ -29,7 +29,7 @@ describe('Invalid Color codes', () => { test('Black and ultraviolet', () => { try { - value(['black', 'ultraviolet']); + decodedValue(['black', 'ultraviolet']); } catch (error) { expect(error.message).toEqual('Color ultraviolet is not a valid resistor color'); } diff --git a/test/fixtures/resistor-color-duo/362/resistor-color-duo.js b/test/fixtures/resistor-color-duo/362/resistor-color-duo.js index fb869728..fc187b5e 100644 --- a/test/fixtures/resistor-color-duo/362/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/362/resistor-color-duo.js @@ -2,6 +2,6 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { return parseInt("" + COLORS.indexOf(color1) + COLORS.indexOf(color2)) ; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/363/resistor-color-duo.js b/test/fixtures/resistor-color-duo/363/resistor-color-duo.js index c5395400..784627f0 100644 --- a/test/fixtures/resistor-color-duo/363/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/363/resistor-color-duo.js @@ -13,4 +13,4 @@ const COLORS = [ const colorCode = color => COLORS.indexOf(color.toLowerCase().trim()); -export const value = colors => parseInt(colors.map(c => colorCode(c)).join("")); +export const decodedValue = colors => parseInt(colors.map(c => colorCode(c)).join("")); diff --git a/test/fixtures/resistor-color-duo/364/resistor-color-duo.js b/test/fixtures/resistor-color-duo/364/resistor-color-duo.js index 40577705..097960c2 100644 --- a/test/fixtures/resistor-color-duo/364/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/364/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = cols => { +export const decodedValue = cols => { const [first, second] = cols; const COLORS = { diff --git a/test/fixtures/resistor-color-duo/365/resistor-color-duo.js b/test/fixtures/resistor-color-duo/365/resistor-color-duo.js index 510b91a0..ae2cef4c 100644 --- a/test/fixtures/resistor-color-duo/365/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/365/resistor-color-duo.js @@ -20,18 +20,18 @@ let colorToDigit = (inputColor) => { return resultDigit; } -let value = (duoColors = []) => { +let decodedValue = (duoColors = []) => { if (duoColors.length != 2) throw "must supply exactly two colors"; return duoColors .map(colorToDigit) .reduce( - (sum, colorDigit, index) => + (sum, colorDigit, index) => sum + Math.pow(10, (duoColors.length - index - 1)) * colorDigit, 0); } -export {value}; \ No newline at end of file +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/366/resistor-color-duo.js b/test/fixtures/resistor-color-duo/366/resistor-color-duo.js index 4a6fa8d4..ae97cbed 100644 --- a/test/fixtures/resistor-color-duo/366/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/366/resistor-color-duo.js @@ -2,6 +2,6 @@ var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value(colors){ +export function decodedValue(colors){ return COLORS.indexOf(colors[0]) + COLORS.indexOf(colors[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/367/resistor-color-duo.js b/test/fixtures/resistor-color-duo/367/resistor-color-duo.js index 3ad0de45..a354b5f9 100644 --- a/test/fixtures/resistor-color-duo/367/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/367/resistor-color-duo.js @@ -11,6 +11,6 @@ const VALUES = { white: "9" }; -export const value = colors => { +export const decodedValue = colors => { return parseInt(VALUES[colors[0]] + VALUES[colors[1]]); }; diff --git a/test/fixtures/resistor-color-duo/368/resistor-color-duo.js b/test/fixtures/resistor-color-duo/368/resistor-color-duo.js index 1c5b7b1c..9965a012 100644 --- a/test/fixtures/resistor-color-duo/368/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/368/resistor-color-duo.js @@ -1,13 +1,13 @@ const COLORS = [ "black","brown","red","orange","yellow", "green","blue","violet","grey","white" ] -const value = (colors) => { - let value = '' - colors.forEach((color) => value += COLORS.indexOf(color)) - return Number(value) +const decodedValue = (colors) => { + let decodedValue = '' + colors.forEach((color) => decodedValue += COLORS.indexOf(color)) + return Number(decodedValue) } module.exports = { - value, + decodedValue, COLORS -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/369/resistor-color-duo.js b/test/fixtures/resistor-color-duo/369/resistor-color-duo.js index bcb3bf03..f8aa2dcc 100644 --- a/test/fixtures/resistor-color-duo/369/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/369/resistor-color-duo.js @@ -1,5 +1,5 @@ export let COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value(color) { +export function decodedValue(color) { return +(COLORS.indexOf(color[0]) + '' + COLORS.indexOf(color[1])); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/370/resistor-color-duo.js b/test/fixtures/resistor-color-duo/370/resistor-color-duo.js index 1237fca9..60d2fea8 100644 --- a/test/fixtures/resistor-color-duo/370/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/370/resistor-color-duo.js @@ -1,9 +1,9 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = colors => { +export const decodedValue = colors => { let result = ''; for (let color of colors) { result = result + (COLORS.indexOf(color)) } return parseInt(result) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/371/resistor-color-duo.js b/test/fixtures/resistor-color-duo/371/resistor-color-duo.js index ceb65630..71b3e100 100644 --- a/test/fixtures/resistor-color-duo/371/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/371/resistor-color-duo.js @@ -9,10 +9,10 @@ const COLORS = [ 'violet', 'grey', 'white' -] +] + +export const decodedValue = (arr) => { -export const value = (arr) => { - let valueArr = [] arr.forEach(el => { diff --git a/test/fixtures/resistor-color-duo/372/resistor-color-duo.js b/test/fixtures/resistor-color-duo/372/resistor-color-duo.js index 38e3a351..030a142c 100644 --- a/test/fixtures/resistor-color-duo/372/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/372/resistor-color-duo.js @@ -1,9 +1,9 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { let tempString = '' colorArray.forEach(color => { tempString = tempString + COLORS.indexOf(color) }) return Number(tempString) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/373/resistor-color-duo.js b/test/fixtures/resistor-color-duo/373/resistor-color-duo.js index 3298097c..ea66f1fd 100644 --- a/test/fixtures/resistor-color-duo/373/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/373/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { return Number(`${COLORS.indexOf(colorArray[0])}${COLORS.indexOf(colorArray[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/374/resistor-color-duo.js b/test/fixtures/resistor-color-duo/374/resistor-color-duo.js index 70163d96..21edd91a 100644 --- a/test/fixtures/resistor-color-duo/374/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/374/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -function value(colorNames) { +function decodedValue(colorNames) { var result = colorNames.map(function(currentName, mapIndex){ return COLORS.reduce((accumulator, currentValue, currentIndex) => { return (currentValue == currentName) ? currentIndex : accumulator; @@ -10,4 +10,4 @@ function value(colorNames) { return result.join('') * 1; } -export { value }; \ No newline at end of file +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/375/resistor-color-duo.js b/test/fixtures/resistor-color-duo/375/resistor-color-duo.js index 4bf91eb3..b659959b 100644 --- a/test/fixtures/resistor-color-duo/375/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/375/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { let num = ""; for (let i = 0; i < colors.length; i++) { num += COLORS[colors[i]] @@ -6,5 +6,5 @@ export const value = (colors) => { return Number(num); } -export const COLORS = {"black": "0", "brown": "1", "red": "2", "orange": "3", "yellow": "4", - "green": "5", "blue": "6", "violet": "7", "grey": "8", "white": "9"} \ No newline at end of file +export const COLORS = {"black": "0", "brown": "1", "red": "2", "orange": "3", "yellow": "4", + "green": "5", "blue": "6", "violet": "7", "grey": "8", "white": "9"} diff --git a/test/fixtures/resistor-color-duo/376/resistor-color-duo.js b/test/fixtures/resistor-color-duo/376/resistor-color-duo.js index 7b1a27c4..cec1540d 100644 --- a/test/fixtures/resistor-color-duo/376/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/376/resistor-color-duo.js @@ -1,3 +1,3 @@ import { colorCode } from '../resistor-color/resistor-color.js'; -export const value = ([color1, color2]) => colorCode(color1) * 10 + colorCode(color2) +export const decodedValue = ([color1, color2]) => colorCode(color1) * 10 + colorCode(color2) diff --git a/test/fixtures/resistor-color-duo/377/resistor-color-duo.js b/test/fixtures/resistor-color-duo/377/resistor-color-duo.js index a2b8cf31..403a0c67 100644 --- a/test/fixtures/resistor-color-duo/377/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/377/resistor-color-duo.js @@ -11,7 +11,7 @@ const allColors = [ "white" ]; -export function value(resistorColors) { +export function decodedValue(resistorColors) { let total = ""; resistorColors.forEach(color => { total = total.concat(allColors.indexOf(color)); diff --git a/test/fixtures/resistor-color-duo/378/resistor-color-duo.js b/test/fixtures/resistor-color-duo/378/resistor-color-duo.js index ba676a28..79008828 100644 --- a/test/fixtures/resistor-color-duo/378/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/378/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = ([colorOne,colorTwo]) => { +export const decodedValue = ([colorOne,colorTwo]) => { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const resistorValue = (bandColor) => { @@ -9,4 +9,4 @@ export const value = ([colorOne,colorTwo]) => { const secondDigit = (resistorValue(colorTwo)); return (firstDigit + secondDigit); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/379/resistor-color-duo.js b/test/fixtures/resistor-color-duo/379/resistor-color-duo.js index e60cad86..c39ec0b5 100644 --- a/test/fixtures/resistor-color-duo/379/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/379/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const colorCode = color => COLORS.indexOf(color.toLowerCase()); -export const value = colors => parseInt(colors.map(x => colorCode(x)).join('')); \ No newline at end of file +export const decodedValue = colors => parseInt(colors.map(x => colorCode(x)).join('')); diff --git a/test/fixtures/resistor-color-duo/38/resistor-color-duo.js b/test/fixtures/resistor-color-duo/38/resistor-color-duo.js index 3388f4e6..0493c935 100644 --- a/test/fixtures/resistor-color-duo/38/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/38/resistor-color-duo.js @@ -11,6 +11,6 @@ const mapping = { 'white': 9, } -export function value(colors) { +export function decodedValue(colors) { return parseInt(colors.reduce((acc, color) => acc + mapping[color], ''), 10); } diff --git a/test/fixtures/resistor-color-duo/380/resistor-color-duo.js b/test/fixtures/resistor-color-duo/380/resistor-color-duo.js index 38e2607c..b11a754f 100644 --- a/test/fixtures/resistor-color-duo/380/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/380/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = ([x, y]) => { +export const decodedValue = ([x, y]) => { const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; const a = COLORS.indexOf(x) * 10; const b = COLORS.indexOf(y); diff --git a/test/fixtures/resistor-color-duo/381/resistor-color-duo.js b/test/fixtures/resistor-color-duo/381/resistor-color-duo.js index 69a17573..ce8300ab 100644 --- a/test/fixtures/resistor-color-duo/381/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/381/resistor-color-duo.js @@ -2,4 +2,4 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "bl export const colorCode = (color) => COLORS.indexOf(color) -export const value = (color_array) => 10 * colorCode(color_array[0]) + colorCode(color_array[1]) +export const decodedValue = (color_array) => 10 * colorCode(color_array[0]) + colorCode(color_array[1]) diff --git a/test/fixtures/resistor-color-duo/382/resistor-color-duo.js b/test/fixtures/resistor-color-duo/382/resistor-color-duo.js index c6d61b90..ce31189b 100644 --- a/test/fixtures/resistor-color-duo/382/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/382/resistor-color-duo.js @@ -1,6 +1,6 @@ -// export const value = (color1, color2) =>{ +// export const decodedValue = (color1, color2) =>{ // var COLORS = [ // "black" // , "brown" @@ -12,7 +12,7 @@ // , "violet" // , "grey" // , "white" -// ] +// ] //return COLORS.indexOf(color1); @@ -20,7 +20,7 @@ //The following conole logs the correct answers, //but does not pass the tests. The tests return -1 //in each instance. I'm wondering if it has to do with -//the expected value being in an array? +//the expected decodedValue being in an array? //plus they are testing color and color, not just color, color // const c1 = COLORS.indexOf(color1) @@ -45,12 +45,12 @@ //} -//console.log(value("brown", "black")) -// console.log(value("blue", "grey")) -// console.log(value("yellow", "violet")) -// console.log(value("orange", "orange")) +//console.log(decodedValue("brown", "black")) +// console.log(decodedValue("blue", "grey")) +// console.log(decodedValue("yellow", "violet")) +// console.log(decodedValue("orange", "orange")) -export const value = (Colorandcolor) => { +export const decodedValue = (Colorandcolor) => { var COLORS = [ "black" , "brown" @@ -79,12 +79,12 @@ export const value = (Colorandcolor) => { //const array1 = lwrcase.split(' ') //let color1 = Colorandcolor[0] //let color2 = Colorandcolor[1] - + // const array2 = array1.filter(function (el) { // return el != 'and' // }) //return array2 - + // const c1 = COLORS.indexOf(color1) // const c2 = COLORS.indexOf(color2) @@ -93,27 +93,27 @@ export const value = (Colorandcolor) => { // const intnumber = parseInt(trimmed) // return intnumber - - + + //so now I have an equivelent array, now I gotta //get that array to equal the number they are looking for //from the original array, I've done something similar in a different //exercism. which one? - //if value in 2nd array = value of first array then return index - //of that value in first array + //if decodedValue in 2nd array = decodedValue of first array then return index + //of that decodedValue in first array } -// console.log(value(['brown', 'black'])) -// console.log(value("Blue and grey")) -// console.log(value("Yellow and violet")) -// console.log(value("Orange and orange")) +// console.log(decodedValue(['brown', 'black'])) +// console.log(decodedValue("Blue and grey")) +// console.log(decodedValue("Yellow and violet")) +// console.log(decodedValue("Orange and orange")) // var COLORS = [ // "black" @@ -131,4 +131,4 @@ export const value = (Colorandcolor) => { // function colorCode(color) { // return COLORS.indexOf(color); // } -// export { COLORS, colorCode } \ No newline at end of file +// export { COLORS, colorCode } diff --git a/test/fixtures/resistor-color-duo/383/resistor-color-duo.js b/test/fixtures/resistor-color-duo/383/resistor-color-duo.js index fff582ba..1d092124 100644 --- a/test/fixtures/resistor-color-duo/383/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/383/resistor-color-duo.js @@ -1,2 +1,2 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => (COLORS.indexOf(colors[0]) * 10) + COLORS.indexOf(colors[1]); \ No newline at end of file +export const decodedValue = (colors) => (COLORS.indexOf(colors[0]) * 10) + COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/384/resistor-color-duo.js b/test/fixtures/resistor-color-duo/384/resistor-color-duo.js index f1f2a4d1..eaa370f9 100644 --- a/test/fixtures/resistor-color-duo/384/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/384/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (bandColors) => { +export const decodedValue = (bandColors) => { const resistorColor = `${COLORS.indexOf(bandColors[0])}${COLORS.indexOf(bandColors[1])}`; return parseInt(resistorColor, 10); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/385/resistor-color-duo.js b/test/fixtures/resistor-color-duo/385/resistor-color-duo.js index b504dd5b..cdc158aa 100644 --- a/test/fixtures/resistor-color-duo/385/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/385/resistor-color-duo.js @@ -11,5 +11,5 @@ const colors = { 'white': 9, }; -export const value = (bandColors) => bandColors.reduce((total, color, i) => +export const decodedValue = (bandColors) => bandColors.reduce((total, color, i) => total += colors[color] * 10 ** (Object.keys(bandColors).length - i - 1), 0); diff --git a/test/fixtures/resistor-color-duo/386/resistor-color-duo.js b/test/fixtures/resistor-color-duo/386/resistor-color-duo.js index 31a38f61..7bda7273 100644 --- a/test/fixtures/resistor-color-duo/386/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/386/resistor-color-duo.js @@ -15,7 +15,7 @@ export const colorCode = (color) => { return color_map.get(color.toLowerCase()); } -export const value = (code) => { +export const decodedValue = (code) => { return colorCode(code[0])*10 + colorCode(code[1]); } diff --git a/test/fixtures/resistor-color-duo/387/resistor-color-duo.js b/test/fixtures/resistor-color-duo/387/resistor-color-duo.js index 18527740..07727acd 100644 --- a/test/fixtures/resistor-color-duo/387/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/387/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -const value = (codes) => { +const decodedValue = (codes) => { const colorDuo = codes.map((color)=>{ if ( COLORS.indexOf(color) != -1 ) { return COLORS.indexOf(color) } }).join(''); @@ -8,4 +8,4 @@ const value = (codes) => { return Number(colorDuo); } -export { value }; \ No newline at end of file +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/388/resistor-color-duo.js b/test/fixtures/resistor-color-duo/388/resistor-color-duo.js index 3b38907c..2e0453a4 100644 --- a/test/fixtures/resistor-color-duo/388/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/388/resistor-color-duo.js @@ -10,5 +10,5 @@ const BANDS = { grey: "8", white: "9" }; -export const value = resistor => +export const decodedValue = resistor => parseInt(BANDS[resistor[0]] + BANDS[resistor[1]]); diff --git a/test/fixtures/resistor-color-duo/389/resistor-color-duo.js b/test/fixtures/resistor-color-duo/389/resistor-color-duo.js index 17b0c066..f536a920 100644 --- a/test/fixtures/resistor-color-duo/389/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/389/resistor-color-duo.js @@ -1,4 +1,4 @@ -export let value = (array) => { +export let decodedValue = (array) => { const COLORS = [ "black", @@ -19,4 +19,4 @@ export let value = (array) => { y = COLORS.indexOf(array[1]); return Number(x + "" + y); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/39/resistor-color-duo.js b/test/fixtures/resistor-color-duo/39/resistor-color-duo.js index 6a7553b2..014e4aee 100644 --- a/test/fixtures/resistor-color-duo/39/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/39/resistor-color-duo.js @@ -5,7 +5,7 @@ function colorCode(wantedColor) { return COLORS.indexOf(wantedColor); } -function value(colorsArr) { +function decodedValue(colorsArr) { const valueStr = colorsArr .map(colorCode) .join(''); @@ -14,4 +14,4 @@ function value(colorsArr) { } -module.exports = { value }; +module.exports = { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/390/resistor-color-duo.js b/test/fixtures/resistor-color-duo/390/resistor-color-duo.js index 3ef656ed..5ca43a4e 100644 --- a/test/fixtures/resistor-color-duo/390/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/390/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = (bands) => { +export const decodedValue = (bands) => { let output = ''; bands.forEach((color) => { output += COLORS.indexOf(color); diff --git a/test/fixtures/resistor-color-duo/390/resistor-color-duo.spec.js b/test/fixtures/resistor-color-duo/390/resistor-color-duo.spec.js index 53a5e11e..ab92b5a5 100644 --- a/test/fixtures/resistor-color-duo/390/resistor-color-duo.spec.js +++ b/test/fixtures/resistor-color-duo/390/resistor-color-duo.spec.js @@ -1,19 +1,19 @@ -import { value } from './resistor-color-duo.js'; +import { decodedValue } from './resistor-color-duo.js'; describe('Resistor Colors', () => { test('Brown and black', () => { - expect(value(['brown', 'black'])).toEqual(10); + expect(decodedValue(['brown', 'black'])).toEqual(10); }); test('Blue and grey', () => { - expect(value(['blue', 'grey'])).toEqual(68); + expect(decodedValue(['blue', 'grey'])).toEqual(68); }); test('Yellow and violet', () => { - expect(value(['yellow', 'violet'])).toEqual(47); + expect(decodedValue(['yellow', 'violet'])).toEqual(47); }); test('Orange and orange', () => { - expect(value(['orange', 'orange'])).toEqual(33); + expect(decodedValue(['orange', 'orange'])).toEqual(33); }); }); diff --git a/test/fixtures/resistor-color-duo/391/resistor-color-duo.js b/test/fixtures/resistor-color-duo/391/resistor-color-duo.js index aa32b793..2b5630cc 100644 --- a/test/fixtures/resistor-color-duo/391/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/391/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] export const colorCode = color => COLORS.indexOf(color) -export const value = colors => { +export const decodedValue = colors => { const n_list = colors.map(color => colorCode(color)) return Number(n_list.join("")) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/392/resistor-color-duo.js b/test/fixtures/resistor-color-duo/392/resistor-color-duo.js index 8a968d27..2afbc75b 100644 --- a/test/fixtures/resistor-color-duo/392/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/392/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; export const COLOR_CODES = new Map(COLORS.map((color, index) => [color,index] )); -export function value(colors) { +export function decodedValue(colors) { return parseInt(`${COLOR_CODES.get(colors[0])}${COLOR_CODES.get(colors[1])}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/393/resistor-color-duo.js b/test/fixtures/resistor-color-duo/393/resistor-color-duo.js index 1fe32258..68a79d09 100644 --- a/test/fixtures/resistor-color-duo/393/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/393/resistor-color-duo.js @@ -3,11 +3,11 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "bl // returns -1 if color isn't found export const colorCode = (name) => COLORS.indexOf(name); -export const value = (arr) => { +export const decodedValue = (arr) => { let code1 = colorCode(arr[0]); let code2 = colorCode(arr[1]); - if(code1 !== -1 && code2 !== -1) + if(code1 !== -1 && code2 !== -1) return code1 * 10 + code2; else return undefined; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/394/resistor-color-duo.js b/test/fixtures/resistor-color-duo/394/resistor-color-duo.js index 0bd5fbc2..ec7e697e 100644 --- a/test/fixtures/resistor-color-duo/394/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/394/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = [ "white" ]; -export const value = (colors) => { +export const decodedValue = (colors) => { return colors .map(i => COLORS.indexOf(i)) .join('') * 1; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/395/resistor-color-duo.js b/test/fixtures/resistor-color-duo/395/resistor-color-duo.js index 8662442d..b7aa42ec 100644 --- a/test/fixtures/resistor-color-duo/395/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/395/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors) => { +export const decodedValue = (colors) => { let code = ""; for (var color of colors ) { code += COLORS.indexOf(color); @@ -8,4 +8,4 @@ export const value = (colors) => { return parseInt(code); } -value(["black", "blue", "orange"]); \ No newline at end of file +decodedValue(["black", "blue", "orange"]); diff --git a/test/fixtures/resistor-color-duo/396/resistor-color-duo.js b/test/fixtures/resistor-color-duo/396/resistor-color-duo.js index 810c782c..dc1629b4 100644 --- a/test/fixtures/resistor-color-duo/396/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/396/resistor-color-duo.js @@ -15,6 +15,6 @@ const COLORS = [ const colorCode = input => COLORS.indexOf(input).toString(); // Join the string, and convert to number -export const value = input => { +export const decodedValue = input => { return Number(input.map(resistor => colorCode(resistor)).join("")); }; diff --git a/test/fixtures/resistor-color-duo/397/resistor-color-duo.js b/test/fixtures/resistor-color-duo/397/resistor-color-duo.js index 1782fa8e..7f160364 100644 --- a/test/fixtures/resistor-color-duo/397/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/397/resistor-color-duo.js @@ -15,11 +15,11 @@ function colorCode(color) { return COLORS.indexOf(color); } -function value(colors) { +function decodedValue(colors) { var result = ""; for (var i in colors ) { result += colorCode(colors[i]); } return parseInt(result); } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/398/resistor-color-duo.js b/test/fixtures/resistor-color-duo/398/resistor-color-duo.js index dc8b6f55..9e2e4e3e 100644 --- a/test/fixtures/resistor-color-duo/398/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/398/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white'] -export const value = (arr) => { +export const decodedValue = (arr) => { return COLORS.indexOf(arr[0])*10 + COLORS.indexOf(arr[1]); } diff --git a/test/fixtures/resistor-color-duo/399/resistor-color-duo.js b/test/fixtures/resistor-color-duo/399/resistor-color-duo.js index a1a65dca..75e2fd9a 100644 --- a/test/fixtures/resistor-color-duo/399/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/399/resistor-color-duo.js @@ -1,8 +1,8 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value(colors) { - let value=""; +export function decodedValue(colors) { + let decodedValue=""; for(let i=0; i { - value += (COLORS.indexOf(element)); + decodedValue += (COLORS.indexOf(element)); }); - return Number(value); -} \ No newline at end of file + return Number(decodedValue); +} diff --git a/test/fixtures/resistor-color-duo/40/resistor-color-duo.js b/test/fixtures/resistor-color-duo/40/resistor-color-duo.js index 20950c6a..016831c8 100644 --- a/test/fixtures/resistor-color-duo/40/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/40/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export function value(bands) { +export function decodedValue(bands) { return parseInt(bands.reduce((val, band) => val + COLORS.indexOf(band), '')) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/400/resistor-color-duo.js b/test/fixtures/resistor-color-duo/400/resistor-color-duo.js index c8e03356..8da2d503 100644 --- a/test/fixtures/resistor-color-duo/400/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/400/resistor-color-duo.js @@ -1,13 +1,13 @@ import { isArray } from "util"; const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export function value(colourArray){ +export function decodedValue(colourArray){ if (isArray(colourArray)){ - let value="" + let decodedValue="" for(let i=0;i COLORS.indexOf[color1,color2]; +export const decodedValue=([color1,color2]) => COLORS.indexOf[color1,color2]; diff --git a/test/fixtures/resistor-color-duo/402/resistor-color-duo.js b/test/fixtures/resistor-color-duo/402/resistor-color-duo.js index 327d0317..ff3f8a7a 100644 --- a/test/fixtures/resistor-color-duo/402/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/402/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (inputArr) => { +export const decodedValue = (inputArr) => { var colormapping = { black: 0, brown: 1, @@ -16,6 +16,6 @@ export const value = (inputArr) => { inputArr.forEach(color => { mappedColor += colormapping[color]; }); - + return parseInt(mappedColor); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/403/resistor-color-duo.js b/test/fixtures/resistor-color-duo/403/resistor-color-duo.js index ffed59a5..0ad5ee34 100644 --- a/test/fixtures/resistor-color-duo/403/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/403/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { let inputColorIndex = null; let colorIndex = null; let retval = ''; diff --git a/test/fixtures/resistor-color-duo/404/resistor-color-duo.js b/test/fixtures/resistor-color-duo/404/resistor-color-duo.js index 93db5934..0e13b080 100644 --- a/test/fixtures/resistor-color-duo/404/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/404/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -let value = (args) => Number(`${COLORS.indexOf(args[0])}${COLORS.indexOf(args[1])}`) +let decodedValue = (args) => Number(`${COLORS.indexOf(args[0])}${COLORS.indexOf(args[1])}`) -module.exports = { value } +module.exports = { decodedValue } diff --git a/test/fixtures/resistor-color-duo/405/resistor-color-duo.js b/test/fixtures/resistor-color-duo/405/resistor-color-duo.js index 2040bb72..a12fdcd8 100644 --- a/test/fixtures/resistor-color-duo/405/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/405/resistor-color-duo.js @@ -11,10 +11,10 @@ export const COLORS = [ 'white' ]; -export const value = (arrayOfColors) => { +export const decodedValue = (arrayOfColors) => { let sum = ''; arrayOfColors.forEach(color => { sum += String(COLORS.indexOf(color)); }); return parseInt(sum); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/407/resistor-color-duo.js b/test/fixtures/resistor-color-duo/407/resistor-color-duo.js index d0ad15e4..09c990d0 100644 --- a/test/fixtures/resistor-color-duo/407/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/407/resistor-color-duo.js @@ -1,14 +1,14 @@ -export const value = ([color1, color2]) => { - const colors = - {'black': '0', - 'brown': '1', - 'red': '2', - 'orange': '3', - 'yellow': '4', - 'green': '5', - 'blue': '6', - 'violet': '7', - 'grey': '8', +export const decodedValue = ([color1, color2]) => { + const colors = + {'black': '0', + 'brown': '1', + 'red': '2', + 'orange': '3', + 'yellow': '4', + 'green': '5', + 'blue': '6', + 'violet': '7', + 'grey': '8', 'white': '9' } diff --git a/test/fixtures/resistor-color-duo/408/resistor-color-duo.js b/test/fixtures/resistor-color-duo/408/resistor-color-duo.js index eb81ebbe..f80e29aa 100644 --- a/test/fixtures/resistor-color-duo/408/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/408/resistor-color-duo.js @@ -1,6 +1,6 @@ import { colorCode } from '../resistor-color/resistor-color'; -export const value = (colors) => { +export const decodedValue = (colors) => { var colorValues = colorValue(colors[0]) + colorValue(colors[1]); return parseInt(colorValues); } diff --git a/test/fixtures/resistor-color-duo/409/resistor-color-duo.js b/test/fixtures/resistor-color-duo/409/resistor-color-duo.js index ff807f57..28212dcd 100644 --- a/test/fixtures/resistor-color-duo/409/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/409/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (arr) => { return COLORS.indexOf(arr[0]) * 10 + COLORS.indexOf(arr[1]); } \ No newline at end of file +export const decodedValue = (arr) => { return COLORS.indexOf(arr[0]) * 10 + COLORS.indexOf(arr[1]); } diff --git a/test/fixtures/resistor-color-duo/41/resistor-color-duo.js b/test/fixtures/resistor-color-duo/41/resistor-color-duo.js index d2e2e1a4..a368cc40 100644 --- a/test/fixtures/resistor-color-duo/41/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/41/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = arr => { +export const decodedValue = arr => { const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; return Number(`${COLORS.indexOf(arr[0])}${COLORS.indexOf(arr[1])}`); - } \ No newline at end of file + } diff --git a/test/fixtures/resistor-color-duo/410/resistor-color-duo.js b/test/fixtures/resistor-color-duo/410/resistor-color-duo.js index 2f1f9117..e0e0d2a0 100644 --- a/test/fixtures/resistor-color-duo/410/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/410/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (colorArr) => { +export const decodedValue = (colorArr) => { let color1 = colorArr[0]; let color2 = colorArr[1]; const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; @@ -8,4 +8,4 @@ export const value = (colorArr) => { let combined = `${index1}${index2}`; let finalInt = parseInt(combined); return finalInt; -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/411/resistor-color-duo.js b/test/fixtures/resistor-color-duo/411/resistor-color-duo.js index da421d0f..ed33f0ec 100644 --- a/test/fixtures/resistor-color-duo/411/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/411/resistor-color-duo.js @@ -1,8 +1,8 @@ -export const value = () => { +export const decodedValue = () => { var cores = valorCores(); -var value = retornaValores(cores, cores.brown, cores.black); +var decodedValue = retornaValores(cores, cores.brown, cores.black); function valorCores() { @@ -24,11 +24,11 @@ function valorCores() { function retornaValores(cores, cor1, cor2) { - var value = "" + cor1 + cor2; + var decodedValue = "" + cor1 + cor2; - return value; + return decodedValue; } -return parseInt(value); +return parseInt(decodedValue); } diff --git a/test/fixtures/resistor-color-duo/412/resistor-color-duo.js b/test/fixtures/resistor-color-duo/412/resistor-color-duo.js index 4e10a164..e48207d9 100644 --- a/test/fixtures/resistor-color-duo/412/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/412/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = arr => { +export const decodedValue = arr => { const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; const indexVals = arr.map(color => COLORS.indexOf(color.toLowerCase())); const placeVals = indexVals.map((e, i, arr) => { @@ -14,8 +14,8 @@ export const value = arr => { // **** ALTERNATE **** // // it passes and is simpler, but less mathematical -// export const value = arr => { +// export const decodedValue = arr => { // const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; // const indexVals = arr.map(color => COLORS.indexOf(color.toLowerCase())); // return parseInt(indexVals.join('')); -// } \ No newline at end of file +// } diff --git a/test/fixtures/resistor-color-duo/413/resistor-color-duo.js b/test/fixtures/resistor-color-duo/413/resistor-color-duo.js index 6ccc967f..dbeb646b 100644 --- a/test/fixtures/resistor-color-duo/413/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/413/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = ([col1 , col2]) => { +export const decodedValue = ([col1 , col2]) => { let color1 = col1.toLowerCase(); let color2 = col2.toLowerCase(); @@ -9,4 +9,4 @@ export const value = ([col1 , col2]) => { const result = `${band1}${band2}`; return parseInt(result); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/414/resistor-color-duo.js b/test/fixtures/resistor-color-duo/414/resistor-color-duo.js index 888f09fd..46d9fc9a 100644 --- a/test/fixtures/resistor-color-duo/414/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/414/resistor-color-duo.js @@ -1,8 +1,8 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -function value ([color1, color2]){ +function decodedValue ([color1, color2]){ return parseInt(COLORS.indexOf(color1) + "" + COLORS.indexOf(color2)) } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/415/resistor-color-duo.js b/test/fixtures/resistor-color-duo/415/resistor-color-duo.js index 50a4edb7..9cd782bd 100644 --- a/test/fixtures/resistor-color-duo/415/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/415/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(color_array){ +export function decodedValue(color_array){ let sum = '' for (let count =0; count < color_array.length; count++){ sum = sum + COLORS.indexOf(color_array[count]) @@ -8,4 +8,4 @@ export function value(color_array){ return parseInt(sum) } -export const COLORS = ['black','brown',"red","orange","yellow","green","blue","violet","grey","white"] \ No newline at end of file +export const COLORS = ['black','brown',"red","orange","yellow","green","blue","violet","grey","white"] diff --git a/test/fixtures/resistor-color-duo/416/resistor-color-duo.js b/test/fixtures/resistor-color-duo/416/resistor-color-duo.js index 08f6c5c9..d4101a37 100644 --- a/test/fixtures/resistor-color-duo/416/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/416/resistor-color-duo.js @@ -4,10 +4,10 @@ export const colorCode = (color) => { return COLORS.indexOf(color); }; -export const value = (colors) => { +export const decodedValue = (colors) => { let output = ''; for (let color of colors) { output = output + COLORS.indexOf(color); } return parseInt(output); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/417/resistor-color-duo.js b/test/fixtures/resistor-color-duo/417/resistor-color-duo.js index 8be815f7..e1de7948 100644 --- a/test/fixtures/resistor-color-duo/417/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/417/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (array) => { +export const decodedValue = (array) => { let total = '' for (let color of array) { total = total + COLORS.indexOf(color).toString() @@ -6,4 +6,4 @@ export const value = (array) => { return parseInt(total) } -const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] \ No newline at end of file +const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] diff --git a/test/fixtures/resistor-color-duo/418/resistor-color-duo.js b/test/fixtures/resistor-color-duo/418/resistor-color-duo.js index 98823ac0..c820816d 100644 --- a/test/fixtures/resistor-color-duo/418/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/418/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = colors => +export const decodedValue = colors => colors .reverse() .reduce((acc, color, i) => acc + COLORS.indexOf(color) * 10 ** i, 0); diff --git a/test/fixtures/resistor-color-duo/419/resistor-color-duo.js b/test/fixtures/resistor-color-duo/419/resistor-color-duo.js index 921431fa..0257ac5b 100644 --- a/test/fixtures/resistor-color-duo/419/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/419/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(arr) { +export function decodedValue(arr) { const resistors = { 'black': '0', 'brown': '1', @@ -12,4 +12,4 @@ export function value(arr) { 'white': '9' } return parseInt(resistors[arr[0]] + resistors[arr[1]]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/42/resistor-color-duo.js b/test/fixtures/resistor-color-duo/42/resistor-color-duo.js index b2d1191c..2dbfe95c 100644 --- a/test/fixtures/resistor-color-duo/42/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/42/resistor-color-duo.js @@ -1,9 +1,9 @@ -export function value ( colorCode ) { +export function decodedValue ( colorCode ) { const colors = [ "black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white" ]; - let value = ''; + let decodedValue = ''; for ( const color of colorCode ) { - value += ( colors.indexOf( color )); + decodedValue += ( colors.indexOf( color )); } - return parseInt( value ); + return parseInt( decodedValue ); } diff --git a/test/fixtures/resistor-color-duo/420/resistor-color-duo.js b/test/fixtures/resistor-color-duo/420/resistor-color-duo.js index 6c02a985..82681d0e 100644 --- a/test/fixtures/resistor-color-duo/420/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/420/resistor-color-duo.js @@ -9,11 +9,11 @@ const COLORS = { "green": 5, "blue": 6, "violet": 7, - "grey": 8, + "grey": 8, "white": 9, } -export const value = (arrOfColors) => { +export const decodedValue = (arrOfColors) => { const i = arrOfColors .map(x => COLORS[x]) .map(i => i.toString()) diff --git a/test/fixtures/resistor-color-duo/421/resistor-color-duo.js b/test/fixtures/resistor-color-duo/421/resistor-color-duo.js index 27128233..301b69a9 100644 --- a/test/fixtures/resistor-color-duo/421/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/421/resistor-color-duo.js @@ -2,7 +2,7 @@ var COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; - export function value([color1,color2]){ + export function decodedValue([color1,color2]){ var resistors = arguments[0]; return Number(`${COLORS.indexOf(resistors[0])}${COLORS.indexOf(resistors[1])}`) } diff --git a/test/fixtures/resistor-color-duo/422/resistor-color-duo.js b/test/fixtures/resistor-color-duo/422/resistor-color-duo.js index b2ed1099..ca81ec9f 100644 --- a/test/fixtures/resistor-color-duo/422/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/422/resistor-color-duo.js @@ -1,10 +1,10 @@ const numArr = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export function value (arr) { +export function decodedValue (arr) { let result = []; for (let i = 0; i < arr.length; i++) { result.push(numArr.indexOf(arr[i])); } return parseInt(result.join('')); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/423/resistor-color-duo.js b/test/fixtures/resistor-color-duo/423/resistor-color-duo.js index d4ff696c..6f190754 100644 --- a/test/fixtures/resistor-color-duo/423/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/423/resistor-color-duo.js @@ -10,6 +10,6 @@ const COLORS = { 'grey' : 8, 'white' : 9 } -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { return(Number(String(COLORS[color1]) + String(COLORS[color2]))) } diff --git a/test/fixtures/resistor-color-duo/424/resistor-color.duo.js b/test/fixtures/resistor-color-duo/424/resistor-color.duo.js index d35c38c4..b443453c 100644 --- a/test/fixtures/resistor-color-duo/424/resistor-color.duo.js +++ b/test/fixtures/resistor-color-duo/424/resistor-color.duo.js @@ -1,6 +1,6 @@ const colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (bandArray) => { +export const decodedValue = (bandArray) => { return parseInt(colors.indexOf(bandArray[0]).toString() .concat(colors.indexOf(bandArray[1]).toString())); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/426/resistor-color-duo.js b/test/fixtures/resistor-color-duo/426/resistor-color-duo.js index 3478857c..535cacf4 100644 --- a/test/fixtures/resistor-color-duo/426/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/426/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (array) => { +export const decodedValue = (array) => { let firstNumber = null; let secondNumber = null; @@ -9,4 +9,4 @@ export const value = (array) => { }; -const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; \ No newline at end of file +const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; diff --git a/test/fixtures/resistor-color-duo/427/resistor-color-duo.js b/test/fixtures/resistor-color-duo/427/resistor-color-duo.js index 2d6b4d0e..2a99a9b9 100644 --- a/test/fixtures/resistor-color-duo/427/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/427/resistor-color-duo.js @@ -11,6 +11,6 @@ const COLORS = [ "white" ] -export function value (colors) { +export function decodedValue (colors) { return COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/428/resistor-color-duo.js b/test/fixtures/resistor-color-duo/428/resistor-color-duo.js index 33bdbe27..78206a91 100644 --- a/test/fixtures/resistor-color-duo/428/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/428/resistor-color-duo.js @@ -11,9 +11,9 @@ const COLORS = [ 'white' ] -export function value (colors) { - const value = colors.map(function(color) { +export function decodedValue (colors) { + const decodedValue = colors.map(function(color) { return COLORS.indexOf(color) }) - return Number(value.join('')); + return Number(decodedValue.join('')); } diff --git a/test/fixtures/resistor-color-duo/429/resistor-color-duo.js b/test/fixtures/resistor-color-duo/429/resistor-color-duo.js index 8f014f22..602f737a 100644 --- a/test/fixtures/resistor-color-duo/429/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/429/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ 'white' ]; -export const value = colors => { +export const decodedValue = colors => { if (!colors || !Array.isArray(colors)) return null; let resistance = 0; diff --git a/test/fixtures/resistor-color-duo/43/resistor-color-duo.js b/test/fixtures/resistor-color-duo/43/resistor-color-duo.js index 40244473..3c5b4896 100644 --- a/test/fixtures/resistor-color-duo/43/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/43/resistor-color-duo.js @@ -11,7 +11,7 @@ const colorMap = { white: 9, }; -export const value = input => { +export const decodedValue = input => { const resistance = input.reduce((total, color) => total + String(colorMap[color]), ''); return Number(resistance); }; diff --git a/test/fixtures/resistor-color-duo/430/resistor-color-duo.js b/test/fixtures/resistor-color-duo/430/resistor-color-duo.js index 108f8ab6..60e1b35f 100644 --- a/test/fixtures/resistor-color-duo/430/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/430/resistor-color-duo.js @@ -1,6 +1,6 @@ var COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] ; -export function value(colorArr) { +export function decodedValue(colorArr) { var val = ""; colorArr.forEach(function(element) { @@ -8,4 +8,4 @@ export function value(colorArr) { }); return parseInt(val, 10); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/431/resistor-color-duo.js b/test/fixtures/resistor-color-duo/431/resistor-color-duo.js index 6c02628a..ad54dd82 100644 --- a/test/fixtures/resistor-color-duo/431/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/431/resistor-color-duo.js @@ -11,6 +11,6 @@ export const COLORS = [ "white" ]; -export const value = ([first, second]) => { +export const decodedValue = ([first, second]) => { return parseInt(`${COLORS.indexOf(first)}${COLORS.indexOf(second)}`, 10); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/432/resistor-color-duo.js b/test/fixtures/resistor-color-duo/432/resistor-color-duo.js index 52ccd672..232dffe2 100644 --- a/test/fixtures/resistor-color-duo/432/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/432/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = ([i, n]) => { +export const decodedValue = ([i, n]) => { let COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; let vys = (COLORS.indexOf(i).toString() + COLORS.indexOf(n).toString()) return parseInt(vys) - } \ No newline at end of file + } diff --git a/test/fixtures/resistor-color-duo/433/resistor-color-duo.js b/test/fixtures/resistor-color-duo/433/resistor-color-duo.js index bb500a70..82f48814 100644 --- a/test/fixtures/resistor-color-duo/433/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/433/resistor-color-duo.js @@ -23,8 +23,8 @@ const codesValue = codes => Number(codes.join("")) // Transform colors into a number that represents the colors. // Example: -// value(["brown", "red", "orange", "yellow"]) // returns 1234 -export const value = colors => { +// decodedValue(["brown", "red", "orange", "yellow"]) // returns 1234 +export const decodedValue = colors => { const colorCodes = colors.map(colorCode) return codesValue(colorCodes) } diff --git a/test/fixtures/resistor-color-duo/434/resistor-color-duo.js b/test/fixtures/resistor-color-duo/434/resistor-color-duo.js index 8eba0263..63cdba47 100644 --- a/test/fixtures/resistor-color-duo/434/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/434/resistor-color-duo.js @@ -12,6 +12,6 @@ export const COLORS = [ ]; export const colorCode = (color) => COLORS.indexOf(color) -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(String(colorCode(colors[0])).concat(colorCode(colors[1]))) } diff --git a/test/fixtures/resistor-color-duo/435/resistor-color-duo.js b/test/fixtures/resistor-color-duo/435/resistor-color-duo.js index 093ac90d..a2690d70 100644 --- a/test/fixtures/resistor-color-duo/435/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/435/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = color => +export const decodedValue = color => parseInt( COLORS.indexOf(color[0]).toString() + COLORS.indexOf(color[1]).toString() ); diff --git a/test/fixtures/resistor-color-duo/436/resistor-color-duo.js b/test/fixtures/resistor-color-duo/436/resistor-color-duo.js index 195a1211..50df4a80 100644 --- a/test/fixtures/resistor-color-duo/436/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/436/resistor-color-duo.js @@ -1,4 +1,4 @@ -function value(color){ +function decodedValue(color){ var [color1,color2]=color const colors={ black: 0, @@ -12,8 +12,8 @@ function value(color){ grey: 8, white: 9 } - + return parseInt(colors[color1].toString() + colors[color2].toString()) } -export {value} +export {decodedValue} diff --git a/test/fixtures/resistor-color-duo/437/resistor-color-duo.js b/test/fixtures/resistor-color-duo/437/resistor-color-duo.js index 82a93e38..ba5238ef 100644 --- a/test/fixtures/resistor-color-duo/437/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/437/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = (colors) => { +export const decodedValue = (colors) => { let result = 0; while (colors.length > 0) { let color = colors.shift(); diff --git a/test/fixtures/resistor-color-duo/438/resistor-color-duo.js b/test/fixtures/resistor-color-duo/438/resistor-color-duo.js index 04ec875e..cfc6210b 100644 --- a/test/fixtures/resistor-color-duo/438/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/438/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = colors => colors.reverse().reduce( +export const decodedValue = colors => colors.reverse().reduce( (acc, color, i) => acc + COLORS.indexOf(color) * (10 ** i), 0 ) diff --git a/test/fixtures/resistor-color-duo/439/resistor-color-duo.js b/test/fixtures/resistor-color-duo/439/resistor-color-duo.js index d3bf1ec9..d2a631a2 100644 --- a/test/fixtures/resistor-color-duo/439/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/439/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = function([color1, color2]){ +export const decodedValue = function([color1, color2]){ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; return (parseInt(COLORS.indexOf(color1).toString() + COLORS.indexOf(color2).toString())) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/44/resistor-color-duo.js b/test/fixtures/resistor-color-duo/44/resistor-color-duo.js index a169527f..2e57cc66 100644 --- a/test/fixtures/resistor-color-duo/44/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/44/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = ([bandColorOne, bandColorTwo]) => { +export const decodedValue = ([bandColorOne, bandColorTwo]) => { const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; const resistanceValue = calcResistance(); @@ -10,4 +10,4 @@ export const value = ([bandColorOne, bandColorTwo]) => { } return resistanceValue; -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/440/resistor-color-duo.js b/test/fixtures/resistor-color-duo/440/resistor-color-duo.js index 882d7083..1e675b9b 100644 --- a/test/fixtures/resistor-color-duo/440/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/440/resistor-color-duo.js @@ -11,7 +11,7 @@ const RESISTOR_KEY = { white: '9', } -export const value = (colors) => { +export const decodedValue = (colors) => { const formatColor = colors.map(color => color.toLowerCase()); const resistorColor = parseInt(RESISTOR_KEY[`${formatColor[0]}`] + RESISTOR_KEY[`${formatColor[1]}`]); return resistorColor diff --git a/test/fixtures/resistor-color-duo/441/resistor-color-duo.js b/test/fixtures/resistor-color-duo/441/resistor-color-duo.js index f2c0919e..29b630e1 100644 --- a/test/fixtures/resistor-color-duo/441/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/441/resistor-color-duo.js @@ -1,8 +1,8 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (arr) => { +export const decodedValue = (arr) => { var concat = COLORS.indexOf(arr[0]) + "" + COLORS.indexOf(arr[1]); return parseInt(concat); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/442/resistor-color-duo.js b/test/fixtures/resistor-color-duo/442/resistor-color-duo.js index cf5d81df..f77fa1ff 100644 --- a/test/fixtures/resistor-color-duo/442/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/442/resistor-color-duo.js @@ -1,6 +1,6 @@ -export const value = (arr) => { - let colors = ["black" ,"brown" ,"red" ,"orange" ,"yellow" ,"green" ,"blue" ,"violet" ,"grey" ,"white"]; +export const decodedValue = (arr) => { + let colors = ["black" ,"brown" ,"red" ,"orange" ,"yellow" ,"green" ,"blue" ,"violet" ,"grey" ,"white"]; var x = colors.indexOf(arr[0]).toString(); var y = colors.indexOf(arr[1]).toString(); - return Number(x.concat(y)) -} \ No newline at end of file + return Number(x.concat(y)) +} diff --git a/test/fixtures/resistor-color-duo/443/resistor-color-duo.js b/test/fixtures/resistor-color-duo/443/resistor-color-duo.js index 839713fa..bdb7535c 100644 --- a/test/fixtures/resistor-color-duo/443/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/443/resistor-color-duo.js @@ -1,9 +1,9 @@ -export function value(resistors) { - // The value of each resistor color is equal to its index in the array +export function decodedValue(resistors) { + // The decodedValue of each resistor color is equal to its index in the array const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; - + return Number( COLORS.indexOf(resistors[0]).toString() + COLORS.indexOf(resistors[1]).toString() ); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/444/resistor-color-duo.js b/test/fixtures/resistor-color-duo/444/resistor-color-duo.js index b7b3f010..3b206a76 100644 --- a/test/fixtures/resistor-color-duo/444/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/444/resistor-color-duo.js @@ -11,4 +11,4 @@ const COLORS = [ 'white', ]; -export const value = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); \ No newline at end of file +export const decodedValue = (colors) => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/445/resistor-color-duo.js b/test/fixtures/resistor-color-duo/445/resistor-color-duo.js index bfbeb7d4..f284c7c9 100644 --- a/test/fixtures/resistor-color-duo/445/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/445/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colors.reduce((prev, next) => `${COLORS.indexOf(prev)}${COLORS.indexOf(next)}`), 10); } diff --git a/test/fixtures/resistor-color-duo/446/resistor-color-duo.js b/test/fixtures/resistor-color-duo/446/resistor-color-duo.js index 4db16777..f42ba077 100644 --- a/test/fixtures/resistor-color-duo/446/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/446/resistor-color-duo.js @@ -2,12 +2,12 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -function value(colorBands){ +function decodedValue(colorBands){ const res = colorBands.reduce((acc, ele) => acc + COLORS.indexOf(ele), ""); return Number(res) } -export {value}; +export {decodedValue}; diff --git a/test/fixtures/resistor-color-duo/447/resistor-color-duo.js b/test/fixtures/resistor-color-duo/447/resistor-color-duo.js index dd18ce80..594ad220 100644 --- a/test/fixtures/resistor-color-duo/447/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/447/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (colors) => - colors.reduce((total, color) => total * 10 + COLORS.indexOf(color), 0) \ No newline at end of file +export const decodedValue = (colors) => + colors.reduce((total, color) => total * 10 + COLORS.indexOf(color), 0) diff --git a/test/fixtures/resistor-color-duo/448/resistor-color-duo.js b/test/fixtures/resistor-color-duo/448/resistor-color-duo.js index e07643f1..e593d934 100644 --- a/test/fixtures/resistor-color-duo/448/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/448/resistor-color-duo.js @@ -1,4 +1,4 @@ -const value = colors => { +const decodedValue = colors => { const [decimalColor, unitColor] = colors const decimal = getColorNumber(decimalColor) const unit = getColorNumber(unitColor) @@ -21,4 +21,4 @@ const bandColors = [ 'white' ] -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/449/resistor-color-duo.js b/test/fixtures/resistor-color-duo/449/resistor-color-duo.js index 73c9db2e..02d21a00 100644 --- a/test/fixtures/resistor-color-duo/449/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/449/resistor-color-duo.js @@ -10,5 +10,5 @@ var COLORS = [ "grey", "white" ]; -export const value = ([color1, color2]) => +export const decodedValue = ([color1, color2]) => parseInt("" + COLORS.indexOf(color1) + COLORS.indexOf(color2)); diff --git a/test/fixtures/resistor-color-duo/45/resistor-color-duo.js b/test/fixtures/resistor-color-duo/45/resistor-color-duo.js index 105e8a7e..d3edc986 100644 --- a/test/fixtures/resistor-color-duo/45/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/45/resistor-color-duo.js @@ -11,6 +11,6 @@ const COLORS = [ "white" ]; -export function value(colors) { +export function decodedValue(colors) { return +colors.reduce((acc, c) => acc + COLORS.indexOf(c), ""); } diff --git a/test/fixtures/resistor-color-duo/450/resistor-color-duo.js b/test/fixtures/resistor-color-duo/450/resistor-color-duo.js index dae2537b..ef9ce8a3 100644 --- a/test/fixtures/resistor-color-duo/450/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/450/resistor-color-duo.js @@ -11,12 +11,12 @@ const colorEncoding = new Map([ ["white", "9"] ]) -function value(colors) { +function decodedValue(colors) { var color1, color2; [color1, color2] = colors; return Number(colorEncoding.get(color1) + colorEncoding.get(color2)) } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/451/resistor-color-duo.js b/test/fixtures/resistor-color-duo/451/resistor-color-duo.js index 1d399a99..c7f637df 100644 --- a/test/fixtures/resistor-color-duo/451/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/451/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colorsArray = []) => { +export const decodedValue = (colorsArray = []) => { return +colorsArray.reduce((prev, next) => { return prev + COLORS.indexOf(next); }, ''); @@ -15,4 +15,4 @@ export const COLORS = [ 'violet', 'grey', 'white' -]; \ No newline at end of file +]; diff --git a/test/fixtures/resistor-color-duo/452/resistor-color-duo.js b/test/fixtures/resistor-color-duo/452/resistor-color-duo.js index 26a4ef2d..daccd945 100644 --- a/test/fixtures/resistor-color-duo/452/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/452/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = colors => { - return Number(colors.reduce((value, color) => value += COLORS.indexOf(color), '')) +export const decodedValue = colors => { + return Number(colors.reduce((decodedValue, color) => decodedValue += COLORS.indexOf(color), '')) } diff --git a/test/fixtures/resistor-color-duo/453/resistor-color-duo.js b/test/fixtures/resistor-color-duo/453/resistor-color-duo.js index 2cbe6975..55d2b5ec 100644 --- a/test/fixtures/resistor-color-duo/453/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/453/resistor-color-duo.js @@ -11,10 +11,10 @@ export const COLORS = [ "white", ] -export const value = (colors) => { +export const decodedValue = (colors) => { let val = ''; colors.forEach(element => { val += COLORS.indexOf(element); }); return Number(val); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/454/resistor-color-duo.js b/test/fixtures/resistor-color-duo/454/resistor-color-duo.js index 05788896..ea0f72c8 100644 --- a/test/fixtures/resistor-color-duo/454/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/454/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; const colorCode = color => COLORS.indexOf(color); -export const value = (colorArray) => { +export const decodedValue = (colorArray) => { let code = colorCode(colorArray[0]).toString() + colorCode(colorArray[1]); return Number(code); }; diff --git a/test/fixtures/resistor-color-duo/455/resistor-color-duo.js b/test/fixtures/resistor-color-duo/455/resistor-color-duo.js index 8b9261ef..c7b13e6f 100644 --- a/test/fixtures/resistor-color-duo/455/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/455/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ 'white', ]; -export const value = array => Number(array +export const decodedValue = array => Number(array .map(color => COLORS.indexOf(color.toLowerCase())) .join('') ); diff --git a/test/fixtures/resistor-color-duo/456/resistor-color-duo.js b/test/fixtures/resistor-color-duo/456/resistor-color-duo.js index df503b3a..8f50aef9 100644 --- a/test/fixtures/resistor-color-duo/456/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/456/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { const colorValue = { 'black': 0, 'brown': 1, diff --git a/test/fixtures/resistor-color-duo/457/resistor-color-duo.js b/test/fixtures/resistor-color-duo/457/resistor-color-duo.js index 9b4a5861..2d978fa8 100644 --- a/test/fixtures/resistor-color-duo/457/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/457/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -function value(colors) { +function decodedValue(colors) { return colors.reverse().reduce( ([sum, factor], color) => { return [sum + COLORS.indexOf(color) * factor, factor * 10] @@ -9,4 +9,4 @@ function value(colors) { )[0] } -export { value } +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/458/resistor-color-duo.js b/test/fixtures/resistor-color-duo/458/resistor-color-duo.js index cafc189e..398dbd46 100644 --- a/test/fixtures/resistor-color-duo/458/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/458/resistor-color-duo.js @@ -1,3 +1,3 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = code => parseInt(`${COLORS.indexOf(code[0])}${COLORS.indexOf(code[1])}`) \ No newline at end of file +export const decodedValue = code => parseInt(`${COLORS.indexOf(code[0])}${COLORS.indexOf(code[1])}`) diff --git a/test/fixtures/resistor-color-duo/459/resistor-color-duo.js b/test/fixtures/resistor-color-duo/459/resistor-color-duo.js index 316130b7..7367a99e 100644 --- a/test/fixtures/resistor-color-duo/459/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/459/resistor-color-duo.js @@ -1,11 +1,11 @@ const colors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export function value(arrElem) { +export function decodedValue(arrElem) { let result = ''; - for (var i = 0; i < arrElem.length;i++) { - arrElem[i]; - result += colors.indexOf(arrElem[i]); - } + for (var i = 0; i < arrElem.length;i++) { + arrElem[i]; + result += colors.indexOf(arrElem[i]); + } return parseInt(result); } diff --git a/test/fixtures/resistor-color-duo/46/resistor-color-duo.js b/test/fixtures/resistor-color-duo/46/resistor-color-duo.js index e95d9557..5a7f20ac 100644 --- a/test/fixtures/resistor-color-duo/46/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/46/resistor-color-duo.js @@ -1,8 +1,8 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { var result = ""; for (var i = 0, l = colors.length; i < l; i++) { result += COLORS.indexOf(colors[i]); } return parseInt(result); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/460/resistor-color-duo.js b/test/fixtures/resistor-color-duo/460/resistor-color-duo.js index 2c5c9f21..083ac87d 100644 --- a/test/fixtures/resistor-color-duo/460/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/460/resistor-color-duo.js @@ -1,5 +1,5 @@ import {colorCode} from "../resistor-color/resistor-color"; -export const value = ([color1,color2]) =>{ +export const decodedValue = ([color1,color2]) =>{ return colorCode(color1)+colorCode(color2) -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/461/resistor-color-duo.js b/test/fixtures/resistor-color-duo/461/resistor-color-duo.js index b45ca8c9..479c5e7b 100644 --- a/test/fixtures/resistor-color-duo/461/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/461/resistor-color-duo.js @@ -1,7 +1,7 @@ -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { const c1 = colors.indexOf(color1) const c2 = colors.indexOf(color2) return parseInt(c1+''+c2) } -const colors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] \ No newline at end of file +const colors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] diff --git a/test/fixtures/resistor-color-duo/462/resistor-color-duo.js b/test/fixtures/resistor-color-duo/462/resistor-color-duo.js index 0fca8128..6b62f16c 100644 --- a/test/fixtures/resistor-color-duo/462/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/462/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (arr) => { +export const decodedValue = (arr) => { const colors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; let code = ''; @@ -9,4 +9,4 @@ export const value = (arr) => { } return Number(code); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/463/resistor-color-duo.js b/test/fixtures/resistor-color-duo/463/resistor-color-duo.js index 63a762ec..560bcb0d 100644 --- a/test/fixtures/resistor-color-duo/463/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/463/resistor-color-duo.js @@ -1,2 +1,2 @@ const colors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = ([color1, color2]) => parseInt(colors.indexOf(color1) + '' + colors.indexOf(color2)); \ No newline at end of file +export const decodedValue = ([color1, color2]) => parseInt(colors.indexOf(color1) + '' + colors.indexOf(color2)); diff --git a/test/fixtures/resistor-color-duo/464/resistor-color-duo.js b/test/fixtures/resistor-color-duo/464/resistor-color-duo.js index 4eaec2b2..8847dd76 100644 --- a/test/fixtures/resistor-color-duo/464/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/464/resistor-color-duo.js @@ -12,4 +12,4 @@ const colorCodes = white: 9, } -export const value = colors => Number(colors.map(color => colorCodes[color]).join('')); \ No newline at end of file +export const decodedValue = colors => Number(colors.map(color => colorCodes[color]).join('')); diff --git a/test/fixtures/resistor-color-duo/465/resistor-color-duo.js b/test/fixtures/resistor-color-duo/465/resistor-color-duo.js index 1385fcf8..d7a60df7 100644 --- a/test/fixtures/resistor-color-duo/465/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/465/resistor-color-duo.js @@ -1,7 +1,7 @@ -export function value(color1,color2){ - var resistionary = +export function decodedValue(color1,color2){ + var resistionary = {'black': 0, 'brown': 1, 'red': 2, diff --git a/test/fixtures/resistor-color-duo/466/resistor-color-duo.js b/test/fixtures/resistor-color-duo/466/resistor-color-duo.js index d4421c32..11b46ea2 100644 --- a/test/fixtures/resistor-color-duo/466/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/466/resistor-color-duo.js @@ -3,7 +3,7 @@ export const COLORS = ["black","brown","red", "blue","violet","grey", "white"] -export const value = (colors) => { +export const decodedValue = (colors) => { if (colors.length != 2) throw "Invalid input array length." return COLORS.indexOf(colors[0])*10 + COLORS.indexOf(colors[1]) } diff --git a/test/fixtures/resistor-color-duo/467/resistor-color-duo.js b/test/fixtures/resistor-color-duo/467/resistor-color-duo.js index 8b0c7669..76911cc5 100644 --- a/test/fixtures/resistor-color-duo/467/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/467/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = colors => { +export const decodedValue = colors => { return parseInt( colors.reduce((acc, cur) => acc + COLORS.indexOf(cur).toString(), ""), 10 diff --git a/test/fixtures/resistor-color-duo/468/resistor-color-duo.js b/test/fixtures/resistor-color-duo/468/resistor-color-duo.js index 5de2bd4c..27d8fbab 100644 --- a/test/fixtures/resistor-color-duo/468/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/468/resistor-color-duo.js @@ -11,12 +11,12 @@ const COLORS = [ "white" ]; -function value(colors) { +function decodedValue(colors) { return parseInt(colors.reduce((acc, color) => { return acc + COLORS.indexOf(color); }, ''), 10); } export { - value + decodedValue }; diff --git a/test/fixtures/resistor-color-duo/469/resistor-color-duo.js b/test/fixtures/resistor-color-duo/469/resistor-color-duo.js index 8f002711..bf2eabde 100644 --- a/test/fixtures/resistor-color-duo/469/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/469/resistor-color-duo.js @@ -2,6 +2,6 @@ export const COLORS = [ "black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white" ]; -export function value(colors_pair){ +export function decodedValue(colors_pair){ return COLORS.indexOf(colors_pair[0]) * 10 + COLORS.indexOf(colors_pair[1]); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/47/resistor-color-duo.js b/test/fixtures/resistor-color-duo/47/resistor-color-duo.js index 0a192d47..37c40619 100644 --- a/test/fixtures/resistor-color-duo/47/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/47/resistor-color-duo.js @@ -11,5 +11,5 @@ const COLORS = [ "white" ]; -export const value = colors => +export const decodedValue = colors => parseInt(`${COLORS.indexOf(colors[0])}${COLORS.indexOf(colors[1])}`); diff --git a/test/fixtures/resistor-color-duo/470/resistor-color-duo.js b/test/fixtures/resistor-color-duo/470/resistor-color-duo.js index 0aafbb53..42621f59 100644 --- a/test/fixtures/resistor-color-duo/470/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/470/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(colors) { +export function decodedValue(colors) { return COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]); } diff --git a/test/fixtures/resistor-color-duo/471/resistor-color-duo.js b/test/fixtures/resistor-color-duo/471/resistor-color-duo.js index 67351c78..a7ee05ba 100644 --- a/test/fixtures/resistor-color-duo/471/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/471/resistor-color-duo.js @@ -2,7 +2,7 @@ const COLORS = [ "black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = colors => +export const decodedValue = colors => Number.parseInt(colors .map(color => COLORS.indexOf(color)) .join('')); diff --git a/test/fixtures/resistor-color-duo/472/resistor-color-duo.js b/test/fixtures/resistor-color-duo/472/resistor-color-duo.js index 97224b4d..ee8dac0c 100644 --- a/test/fixtures/resistor-color-duo/472/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/472/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export function value(colors) { +export function decodedValue(colors) { let code = '' for (let color of colors) code += COLORS.indexOf(color); return Number(code); diff --git a/test/fixtures/resistor-color-duo/473/resistor-color-duo.js b/test/fixtures/resistor-color-duo/473/resistor-color-duo.js index dfffb41e..d75cd2cb 100644 --- a/test/fixtures/resistor-color-duo/473/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/473/resistor-color-duo.js @@ -1,4 +1,4 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = color => { +export const decodedValue = color => { return parseInt(COLORS.indexOf(color[0])+ '' + COLORS.indexOf(color[1])); } diff --git a/test/fixtures/resistor-color-duo/474/resistor-color-duo.js b/test/fixtures/resistor-color-duo/474/resistor-color-duo.js index 108930d1..ce09ab8f 100644 --- a/test/fixtures/resistor-color-duo/474/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/474/resistor-color-duo.js @@ -1,3 +1,3 @@ export const Colors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = args => parseInt(args.map(color => Colors.indexOf(color)).join('')) \ No newline at end of file +export const decodedValue = args => parseInt(args.map(color => Colors.indexOf(color)).join('')) diff --git a/test/fixtures/resistor-color-duo/475/resistor-color-duo.js b/test/fixtures/resistor-color-duo/475/resistor-color-duo.js index 1631105f..fd02bba7 100644 --- a/test/fixtures/resistor-color-duo/475/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/475/resistor-color-duo.js @@ -11,6 +11,6 @@ const VALUES = { white: 9, } -export const value = valuesArray => { +export const decodedValue = valuesArray => { return parseInt(`${VALUES[valuesArray[0]]}${VALUES[valuesArray[1]]}`); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/476/resistor-color-duo.js b/test/fixtures/resistor-color-duo/476/resistor-color-duo.js index 8ac18f9a..5e9e6b8d 100644 --- a/test/fixtures/resistor-color-duo/476/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/476/resistor-color-duo.js @@ -1,2 +1,2 @@ export const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = bands => Number(bands.reduce((acc, col) => acc + COLORS.indexOf(col), '')); +export const decodedValue = bands => Number(bands.reduce((acc, col) => acc + COLORS.indexOf(col), '')); diff --git a/test/fixtures/resistor-color-duo/477/resistor-color-duo.js b/test/fixtures/resistor-color-duo/477/resistor-color-duo.js index 18a714c9..4e8d8a96 100644 --- a/test/fixtures/resistor-color-duo/477/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/477/resistor-color-duo.js @@ -11,5 +11,5 @@ const BANDS = { white: '9', } -export const value = resistors => parseInt(BANDS[resistors[0]] + BANDS[resistors[1]]); +export const decodedValue = resistors => parseInt(BANDS[resistors[0]] + BANDS[resistors[1]]); diff --git a/test/fixtures/resistor-color-duo/478/resistor-color-duo.js b/test/fixtures/resistor-color-duo/478/resistor-color-duo.js index 27315ba2..cb7d76f4 100644 --- a/test/fixtures/resistor-color-duo/478/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/478/resistor-color-duo.js @@ -11,6 +11,6 @@ const COLORS = { white: 9 }; -export const value = (colors) => { +export const decodedValue = (colors) => { return COLORS[colors[0]] * 10 + COLORS[colors[1]]; } diff --git a/test/fixtures/resistor-color-duo/479/resistor-color-duo.js b/test/fixtures/resistor-color-duo/479/resistor-color-duo.js index a0a2b7f8..449daae5 100644 --- a/test/fixtures/resistor-color-duo/479/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/479/resistor-color-duo.js @@ -1,6 +1,6 @@ var COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -function value([colorOne, colorTwo]) { +function decodedValue([colorOne, colorTwo]) { var colorOneIndex = COLORS.indexOf(colorOne); var colorTwoIndex = COLORS.indexOf(colorTwo); var colorsValue = `${colorOneIndex}${colorTwoIndex}`; @@ -8,4 +8,4 @@ function value([colorOne, colorTwo]) { return finalValue; } -export { value } \ No newline at end of file +export { decodedValue } diff --git a/test/fixtures/resistor-color-duo/48/resistor-color-duo.js b/test/fixtures/resistor-color-duo/48/resistor-color-duo.js index 2dcfa288..588d373f 100644 --- a/test/fixtures/resistor-color-duo/48/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/48/resistor-color-duo.js @@ -1,5 +1,5 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (color) => { +export const decodedValue = (color) => { return parseInt(COLORS.indexOf(color[0]) + '' + COLORS.indexOf(color[1])); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/480/resistor-color-duo.js b/test/fixtures/resistor-color-duo/480/resistor-color-duo.js index 685eb87e..43b34f36 100644 --- a/test/fixtures/resistor-color-duo/480/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/480/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = colors => { +export const decodedValue = colors => { let colorNumbers = []; colors.forEach(color => { return colorNumbers.push(COLORS.indexOf(color)); diff --git a/test/fixtures/resistor-color-duo/481/resistor-color-duo.js b/test/fixtures/resistor-color-duo/481/resistor-color-duo.js index a2354379..147feabe 100644 --- a/test/fixtures/resistor-color-duo/481/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/481/resistor-color-duo.js @@ -11,7 +11,7 @@ const colourNumberMap = { white: 9 } -export const value = (colours)=> { +export const decodedValue = (colours)=> { let result = ''; colours.forEach(colour => { @@ -19,4 +19,4 @@ export const value = (colours)=> { }); return parseInt(result); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/482/resistor-color-duo.js b/test/fixtures/resistor-color-duo/482/resistor-color-duo.js index 79f4748d..29d348d0 100644 --- a/test/fixtures/resistor-color-duo/482/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/482/resistor-color-duo.js @@ -1,7 +1,7 @@ export let colors = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = function(array) { - +export const decodedValue = function(array) { + return + array.map(el => colors.indexOf(el)).join('') - + } diff --git a/test/fixtures/resistor-color-duo/483/resistor-color-duo.js b/test/fixtures/resistor-color-duo/483/resistor-color-duo.js index 90b3d017..7643084a 100644 --- a/test/fixtures/resistor-color-duo/483/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/483/resistor-color-duo.js @@ -15,7 +15,7 @@ export const colorCode = color => { return COLORS.findIndex(element => element === color); }; -export const value = (colsArr) => { +export const decodedValue = (colsArr) => { let code = ''; colsArr.forEach(element => { code += colorCode(element); diff --git a/test/fixtures/resistor-color-duo/484/resistor-color-duo.js b/test/fixtures/resistor-color-duo/484/resistor-color-duo.js index 0860ab8a..b2a19a56 100644 --- a/test/fixtures/resistor-color-duo/484/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/484/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (values) => { +export const decodedValue = (values) => { var v = ''; var colors = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; for (let i = 0; i <= colors.length; i++) { @@ -12,12 +12,12 @@ export const value = (values) => { v += colors.indexOf(colors[i]); } - + } - + if( parseInt(v) <= 9 ){ return parseInt(v) *11; } return parseInt(v); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/485/resistor-color-duo.js b/test/fixtures/resistor-color-duo/485/resistor-color-duo.js index adf8e7f0..84a8b4bf 100644 --- a/test/fixtures/resistor-color-duo/485/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/485/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ] -export const value = colors => { +export const decodedValue = colors => { return colors.reverse().reduce((acc, color, i) => { return acc += COLORS.indexOf(color) * ( 10**i ) }, 0) diff --git a/test/fixtures/resistor-color-duo/486/resistor-color-duo.js b/test/fixtures/resistor-color-duo/486/resistor-color-duo.js index 75a27102..5e33a5c9 100644 --- a/test/fixtures/resistor-color-duo/486/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/486/resistor-color-duo.js @@ -10,7 +10,7 @@ const colorCode = (color) => { return colorObject[color]; } -export const value = (colors) => { +export const decodedValue = (colors) => { const value1 = colorCode(colors[0]); const value2 = colorCode(colors[1]); diff --git a/test/fixtures/resistor-color-duo/487/resistor-color-duo.js b/test/fixtures/resistor-color-duo/487/resistor-color-duo.js index 0cff0521..4c5ae3c9 100644 --- a/test/fixtures/resistor-color-duo/487/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/487/resistor-color-duo.js @@ -1,6 +1,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = ([x,y]) => { +export const decodedValue = ([x,y]) => { let a = COLORS.indexOf(x); let b = COLORS.indexOf(y); diff --git a/test/fixtures/resistor-color-duo/488/resistor-color-duo.js b/test/fixtures/resistor-color-duo/488/resistor-color-duo.js index eefa8fe4..78dc138a 100644 --- a/test/fixtures/resistor-color-duo/488/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/488/resistor-color-duo.js @@ -16,15 +16,15 @@ const COLORS = [ ]; /** - * Calculate the value of the band from two resistor colors + * Calculate the decodedValue of the band from two resistor colors * * @param {string[]} colors - A list of resistor colors - * @returns {number} The value of the band + * @returns {number} The decodedValue of the band * * @example - * value(["brown", "black"]) #=> 10 + * decodedValue(["brown", "black"]) #=> 10 */ -export function value(colors) { +export function decodedValue(colors) { return Number.parseInt( colors.reduce((result, color) => result + COLORS.indexOf(color), ""), 10 diff --git a/test/fixtures/resistor-color-duo/489/resistor-color-duo.js b/test/fixtures/resistor-color-duo/489/resistor-color-duo.js index c0a95dbc..5dd6bfaa 100644 --- a/test/fixtures/resistor-color-duo/489/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/489/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white']; -const value = ([color1, color2]) => COLORS.indexOf(color1) * 10 + COLORS.indexOf(color2); +const decodedValue = ([color1, color2]) => COLORS.indexOf(color1) * 10 + COLORS.indexOf(color2); export { - value, + decodedValue, } diff --git a/test/fixtures/resistor-color-duo/49/resistor-color-duo.js b/test/fixtures/resistor-color-duo/49/resistor-color-duo.js index ae4847a3..c6e0d318 100644 --- a/test/fixtures/resistor-color-duo/49/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/49/resistor-color-duo.js @@ -1,4 +1,4 @@ -export function value(arr) { +export function decodedValue(arr) { let color = { 'black': '0', 'brown': '1', diff --git a/test/fixtures/resistor-color-duo/490/resistor-color-duo.js b/test/fixtures/resistor-color-duo/490/resistor-color-duo.js index 08110c67..928ab1a8 100644 --- a/test/fixtures/resistor-color-duo/490/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/490/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = ([color1, color2]) => { +export const decodedValue = ([color1, color2]) => { const tensDigit = COLORS.indexOf(color1) const onesDigit = COLORS.indexOf(color2) return 10*tensDigit + onesDigit diff --git a/test/fixtures/resistor-color-duo/491/resistor-colors.js b/test/fixtures/resistor-color-duo/491/resistor-colors.js index 63c9e78e..45749a6d 100644 --- a/test/fixtures/resistor-color-duo/491/resistor-colors.js +++ b/test/fixtures/resistor-color-duo/491/resistor-colors.js @@ -11,4 +11,4 @@ const MAPPING = { white: '9' }; -export const value = ([first, second]) => parseInt(MAPPING[first] + MAPPING[second]); \ No newline at end of file +export const decodedValue = ([first, second]) => parseInt(MAPPING[first] + MAPPING[second]); diff --git a/test/fixtures/resistor-color-duo/492/resistor-colors.js b/test/fixtures/resistor-color-duo/492/resistor-colors.js index 399f2e8e..f5ccfb63 100644 --- a/test/fixtures/resistor-color-duo/492/resistor-colors.js +++ b/test/fixtures/resistor-color-duo/492/resistor-colors.js @@ -10,7 +10,7 @@ export const COLORS = [ "grey", "white" ]; -export function value(asd) { +export function decodedValue(asd) { var num = ""; asd.forEach(function(ele) { num += (COLORS.indexOf(ele)).toString(); diff --git a/test/fixtures/resistor-color-duo/493/resistor-color-duo.js b/test/fixtures/resistor-color-duo/493/resistor-color-duo.js index 7e317654..7c67a866 100644 --- a/test/fixtures/resistor-color-duo/493/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/493/resistor-color-duo.js @@ -11,6 +11,6 @@ let valueColors = { white: 9, }; -export const value = (colors) => { +export const decodedValue = (colors) => { return colors.reduce((acc, cv) => (valueColors[acc] * 10) + valueColors[cv]); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/494/resistor-color-duo.js b/test/fixtures/resistor-color-duo/494/resistor-color-duo.js index e6f6a753..c41d2995 100644 --- a/test/fixtures/resistor-color-duo/494/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/494/resistor-color-duo.js @@ -1,9 +1,9 @@ -export const value = (resistorColors) => { - let value = "" +export const decodedValue = (resistorColors) => { + let decodedValue = "" let bandColor = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] for (let i = 0; i < resistorColors.length; i++) { - value += bandColor.indexOf(resistorColors[i]).toString(); + decodedValue += bandColor.indexOf(resistorColors[i]).toString(); } - return parseInt(value); -}; \ No newline at end of file + return parseInt(decodedValue); +}; diff --git a/test/fixtures/resistor-color-duo/495/resistor-colors.js b/test/fixtures/resistor-color-duo/495/resistor-colors.js index 5d2d4e08..475aab16 100644 --- a/test/fixtures/resistor-color-duo/495/resistor-colors.js +++ b/test/fixtures/resistor-color-duo/495/resistor-colors.js @@ -11,7 +11,7 @@ export const COLORS = [ "white" ]; -export const value = colors => { +export const decodedValue = colors => { var numbers = ""; colors.forEach(function(ele) { numbers += "" + COLORS.indexOf(ele); diff --git a/test/fixtures/resistor-color-duo/496/resistor-color-duo.js b/test/fixtures/resistor-color-duo/496/resistor-color-duo.js index e1faf59d..837e869c 100644 --- a/test/fixtures/resistor-color-duo/496/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/496/resistor-color-duo.js @@ -11,4 +11,4 @@ const values = { "white": 9, } -export let value = ([c1, c2]) => Number(`${values[c1]}${values[c2]}`); \ No newline at end of file +export let decodedValue = ([c1, c2]) => Number(`${values[c1]}${values[c2]}`); diff --git a/test/fixtures/resistor-color-duo/497/resistor-colors.js b/test/fixtures/resistor-color-duo/497/resistor-colors.js index 5f9e3fd5..94d3f8b8 100644 --- a/test/fixtures/resistor-color-duo/497/resistor-colors.js +++ b/test/fixtures/resistor-color-duo/497/resistor-colors.js @@ -11,7 +11,7 @@ export const COLORS = [ 'white' ]; -export function value(colors) { +export function decodedValue(colors) { return +colors .map(color => COLORS.indexOf(color)) .join(''); diff --git a/test/fixtures/resistor-color-duo/499/resistor-colors.spec.js b/test/fixtures/resistor-color-duo/499/resistor-colors.spec.js index fe5eee1d..46050795 100644 --- a/test/fixtures/resistor-color-duo/499/resistor-colors.spec.js +++ b/test/fixtures/resistor-color-duo/499/resistor-colors.spec.js @@ -1,4 +1,4 @@ -import { value } from './resistor-colors.js'; +import { decodedValue } from './resistor-colors.js'; const ColorArray = ["Black", "Brown", "Red", "Orange", "Yellow", "Green", "Blue", "Violet", "Grey", "White"] diff --git a/test/fixtures/resistor-color-duo/5/resistor-color-duo.js b/test/fixtures/resistor-color-duo/5/resistor-color-duo.js index c437e496..332526a2 100644 --- a/test/fixtures/resistor-color-duo/5/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/5/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] -export const value = (colors) => { +export const decodedValue = (colors) => { let tens = COLORS.indexOf(colors[0]) let ones = COLORS.indexOf(colors[1]) return tens * 10 + ones -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/50/resistor-color-duo.js b/test/fixtures/resistor-color-duo/50/resistor-color-duo.js index 02fd6cf9..6ed85c0c 100644 --- a/test/fixtures/resistor-color-duo/50/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/50/resistor-color-duo.js @@ -1,3 +1,3 @@ const COLORS = ['black','brown','red','orange','yellow','green','blue','violet','grey','white'] -export const value = colors => colors.reverse().reduce((accumulator, color, index) => accumulator + COLORS.indexOf(color) * Math.pow(10, index), 0) \ No newline at end of file +export const decodedValue = colors => colors.reverse().reduce((accumulator, color, index) => accumulator + COLORS.indexOf(color) * Math.pow(10, index), 0) diff --git a/test/fixtures/resistor-color-duo/51/resistor-color-duo.js b/test/fixtures/resistor-color-duo/51/resistor-color-duo.js index d4ca1aa7..9a3ffd47 100644 --- a/test/fixtures/resistor-color-duo/51/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/51/resistor-color-duo.js @@ -23,7 +23,7 @@ const colors = [ const colorToIndex = flip(indexOf)(colors) const toNumber = x => +x -export const value = pipe( +export const decodedValue = pipe( map(colorToIndex), map(toString), join(''), diff --git a/test/fixtures/resistor-color-duo/52/resistor-color-duo.js b/test/fixtures/resistor-color-duo/52/resistor-color-duo.js index e50c5cdf..781416d6 100644 --- a/test/fixtures/resistor-color-duo/52/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/52/resistor-color-duo.js @@ -2,6 +2,6 @@ const BAND_COLORS = [ 'black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white' ]; -export const value = (colors) => colors.reduce( (acc, color, index) => { +export const decodedValue = (colors) => colors.reduce( (acc, color, index) => { return Math.pow(10, colors.length-1-index) * BAND_COLORS.indexOf(color) + acc; }, 0); diff --git a/test/fixtures/resistor-color-duo/53/resistor-color-duo.js b/test/fixtures/resistor-color-duo/53/resistor-color-duo.js index fbb75025..dd1339cb 100644 --- a/test/fixtures/resistor-color-duo/53/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/53/resistor-color-duo.js @@ -1,2 +1,2 @@ -export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (color) => (COLORS.indexOf(color[0]) * 10) + COLORS.indexOf(color[1]); \ No newline at end of file +export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; +export const decodedValue = (color) => (COLORS.indexOf(color[0]) * 10) + COLORS.indexOf(color[1]); diff --git a/test/fixtures/resistor-color-duo/54/resistor-color-duo.js b/test/fixtures/resistor-color-duo/54/resistor-color-duo.js index 4ae146d7..bb5108ba 100644 --- a/test/fixtures/resistor-color-duo/54/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/54/resistor-color-duo.js @@ -1,8 +1,8 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (arr) => { +export const decodedValue = (arr) => { let a = COLORS.indexOf(arr[0]); let b = COLORS.indexOf(arr[1]); return Number(a.toString() + b.toString()); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/55/resistor-color-duo.js b/test/fixtures/resistor-color-duo/55/resistor-color-duo.js index 5f2b43d0..078abefd 100644 --- a/test/fixtures/resistor-color-duo/55/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/55/resistor-color-duo.js @@ -11,5 +11,5 @@ const COLORS = [ "white" ]; -export const value = ([color1, color2]) => +export const decodedValue = ([color1, color2]) => COLORS.indexOf(color1) * 10 + COLORS.indexOf(color2); diff --git a/test/fixtures/resistor-color-duo/56/resistor-color-duo.js b/test/fixtures/resistor-color-duo/56/resistor-color-duo.js index cc53e712..3f68ae12 100644 --- a/test/fixtures/resistor-color-duo/56/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/56/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (arr) => parseInt(arr.map(color => COLORS.indexOf(color)).join("")); +export const decodedValue = (arr) => parseInt(arr.map(color => COLORS.indexOf(color)).join("")); const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] diff --git a/test/fixtures/resistor-color-duo/57/resistor-color-duo.js b/test/fixtures/resistor-color-duo/57/resistor-color-duo.js index 77a1e7d2..f2e578a7 100644 --- a/test/fixtures/resistor-color-duo/57/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/57/resistor-color-duo.js @@ -2,4 +2,4 @@ const ENCODED_COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'b const resistanceCalculator = (resistanceValue, color, index) => resistanceValue + ENCODED_COLORS.indexOf(color)*Math.pow(10, index); -export const value = (colors) => colors.reverse().reduce(resistanceCalculator, 0); \ No newline at end of file +export const decodedValue = (colors) => colors.reverse().reduce(resistanceCalculator, 0); diff --git a/test/fixtures/resistor-color-duo/58/resistor-color-duo.js b/test/fixtures/resistor-color-duo/58/resistor-color-duo.js index 55c86bcb..70f329a2 100644 --- a/test/fixtures/resistor-color-duo/58/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/58/resistor-color-duo.js @@ -11,5 +11,5 @@ const colors = [ "white" ]; -export const value = ([first, second]) => +export const decodedValue = ([first, second]) => colors.indexOf(first) * 10 + colors.indexOf(second); diff --git a/test/fixtures/resistor-color-duo/59/resistor-color-duo.js b/test/fixtures/resistor-color-duo/59/resistor-color-duo.js index 7fd80046..53ebc481 100644 --- a/test/fixtures/resistor-color-duo/59/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/59/resistor-color-duo.js @@ -13,5 +13,5 @@ const COLORS = [ const colorCode = color => COLORS.indexOf(color); -export const value = ([firstColor, secondColor]) => +export const decodedValue = ([firstColor, secondColor]) => Number(`${colorCode(firstColor)}${colorCode(secondColor)}`); diff --git a/test/fixtures/resistor-color-duo/6/resistor-color-duo.js b/test/fixtures/resistor-color-duo/6/resistor-color-duo.js index 702faa3c..91ba234b 100644 --- a/test/fixtures/resistor-color-duo/6/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/6/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { let positions = ""; colors.forEach((color) => { @@ -12,4 +12,4 @@ export const value = (colors) => { return Number(positions); } -export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; \ No newline at end of file +export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; diff --git a/test/fixtures/resistor-color-duo/60/resistor-color-duo.js b/test/fixtures/resistor-color-duo/60/resistor-color-duo.js index 7b30211a..574384fe 100644 --- a/test/fixtures/resistor-color-duo/60/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/60/resistor-color-duo.js @@ -1,2 +1,2 @@ let c = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (i) => parseInt('' + c.indexOf(i[0]) + c.indexOf(i[1])); \ No newline at end of file +export const decodedValue = (i) => parseInt('' + c.indexOf(i[0]) + c.indexOf(i[1])); diff --git a/test/fixtures/resistor-color-duo/61/resistor-color-duo.js b/test/fixtures/resistor-color-duo/61/resistor-color-duo.js index 11fff737..6f3573ff 100644 --- a/test/fixtures/resistor-color-duo/61/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/61/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (color) => + `${COLORS.indexOf(color[0])}${COLORS.indexOf(color[1])}` +export const decodedValue = (color) => + `${COLORS.indexOf(color[0])}${COLORS.indexOf(color[1])}` diff --git a/test/fixtures/resistor-color-duo/62/resistor-color-duo.js b/test/fixtures/resistor-color-duo/62/resistor-color-duo.js index 266a53a4..ae404243 100644 --- a/test/fixtures/resistor-color-duo/62/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/62/resistor-color-duo.js @@ -13,7 +13,7 @@ export const COLORS = [ export const colorCode = color => COLORS.indexOf(color); -export const value = values => +export const decodedValue = values => Number( values.reduce( (accumulator, currentValue) => `${accumulator}${colorCode(currentValue)}`, diff --git a/test/fixtures/resistor-color-duo/63/resistor-color-duo.js b/test/fixtures/resistor-color-duo/63/resistor-color-duo.js index 34cdcd72..9befd7b6 100644 --- a/test/fixtures/resistor-color-duo/63/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/63/resistor-color-duo.js @@ -1,6 +1,6 @@ -export const value = (colors) => { +export const decodedValue = (colors) => { const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"] return Number(colors.reduce((pv,cv,ind)=>{ return `${ind===1?COLORS.indexOf(pv):pv}${COLORS.indexOf(cv)}` })) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/64/resistor-color-duo.js b/test/fixtures/resistor-color-duo/64/resistor-color-duo.js index 4a2c1f71..b93b883f 100644 --- a/test/fixtures/resistor-color-duo/64/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/64/resistor-color-duo.js @@ -11,6 +11,6 @@ const numberByColor = { "white": 9 } -export function value(colors) { +export function decodedValue(colors) { return Number(numberByColor[colors[0]].toString() + numberByColor[colors[1]].toString()) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/65/resistor-color-duo.js b/test/fixtures/resistor-color-duo/65/resistor-color-duo.js index 9d518a34..cbff3eb3 100644 --- a/test/fixtures/resistor-color-duo/65/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/65/resistor-color-duo.js @@ -4,8 +4,8 @@ function colorCode (color) { return COLORS.indexOf(color) } -export function value (colors) { +export function decodedValue (colors) { const values = colors.map(color => colorCode(color)) - const value = values.reduce((acc, value) => acc + String(value)) - return Number(value) + const decodedValue = values.reduce((acc, decodedValue) => acc + String(decodedValue)) + return Number(decodedValue) } diff --git a/test/fixtures/resistor-color-duo/66/resistor-color-duo.js b/test/fixtures/resistor-color-duo/66/resistor-color-duo.js index a9785622..11f08d35 100644 --- a/test/fixtures/resistor-color-duo/66/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/66/resistor-color-duo.js @@ -11,10 +11,10 @@ export const COLORS = { "white": 9 } -export const value = (resistors) => { +export const decodedValue = (resistors) => { let sum = '' resistors.forEach(resistor => { sum += COLORS[resistor].toString() }); return parseInt(sum) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/67/resistor-color-duo.js b/test/fixtures/resistor-color-duo/67/resistor-color-duo.js index 39159dc2..8034de9c 100644 --- a/test/fixtures/resistor-color-duo/67/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/67/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (bands) => { +export const decodedValue = (bands) => { let numberString = ""; const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; for (let color of bands) { diff --git a/test/fixtures/resistor-color-duo/68/resistor-color-duo.js b/test/fixtures/resistor-color-duo/68/resistor-color-duo.js index a5de77a4..cdfd4be9 100644 --- a/test/fixtures/resistor-color-duo/68/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/68/resistor-color-duo.js @@ -1,4 +1,4 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => - parseInt(colors.map(color => COLORS.indexOf(color)).join(''), 10); \ No newline at end of file +export const decodedValue = (colors) => + parseInt(colors.map(color => COLORS.indexOf(color)).join(''), 10); diff --git a/test/fixtures/resistor-color-duo/69/resistor-color-duo.js b/test/fixtures/resistor-color-duo/69/resistor-color-duo.js index 39ebbe5f..968057e2 100644 --- a/test/fixtures/resistor-color-duo/69/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/69/resistor-color-duo.js @@ -14,7 +14,7 @@ const COLORS = { const capitalizeFirstLetter = string => string.slice(0, 1).toUpperCase() + string.slice(1).toLowerCase(); -export const value = colors => { +export const decodedValue = colors => { return Number( colors.reduce((resistanceValue, color) => { const colorValue = COLORS[capitalizeFirstLetter(color)]; @@ -31,7 +31,7 @@ export const value = colors => { // Shorter version // Does not work if there are ever more than 2 colors // Does not handle case where an invalid color is passed in -// export const value = colors => { +// export const decodedValue = colors => { // return Number( // `${COLORS[capitalizeFirstLetter(colors[0])]}${ // COLORS[capitalizeFirstLetter(colors[1])] diff --git a/test/fixtures/resistor-color-duo/7/resistor-color-duo.js b/test/fixtures/resistor-color-duo/7/resistor-color-duo.js index 0e956f42..5273fee4 100644 --- a/test/fixtures/resistor-color-duo/7/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/7/resistor-color-duo.js @@ -1,8 +1,8 @@ const colorMapping = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colors.map(color => colorMapping.indexOf(color) ).join('') ); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/70/resistor-color-duo.js b/test/fixtures/resistor-color-duo/70/resistor-color-duo.js index 715358c8..31f8d250 100644 --- a/test/fixtures/resistor-color-duo/70/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/70/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = (arr) => { +export const decodedValue = (arr) => { if (arr.length !== 2) { return -1; } diff --git a/test/fixtures/resistor-color-duo/71/resistor-color-duo.js b/test/fixtures/resistor-color-duo/71/resistor-color-duo.js index 80cca613..ad501257 100644 --- a/test/fixtures/resistor-color-duo/71/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/71/resistor-color-duo.js @@ -1,9 +1,9 @@ -export const value = (bands) => { +export const decodedValue = (bands) => { var colors = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white']; - var value = 0; + var decodedValue = 0; - value += colors.indexOf(bands[0]) * 10; - value += colors.indexOf(bands[1]); + decodedValue += colors.indexOf(bands[0]) * 10; + decodedValue += colors.indexOf(bands[1]); - return value; + return decodedValue; }; diff --git a/test/fixtures/resistor-color-duo/72/rcd.js b/test/fixtures/resistor-color-duo/72/rcd.js index 7853ffaa..60063ef5 100644 --- a/test/fixtures/resistor-color-duo/72/rcd.js +++ b/test/fixtures/resistor-color-duo/72/rcd.js @@ -1,4 +1,4 @@ -export const value = function(colorNames) { +export const decodedValue = function(colorNames) { if(!(colorNames instanceof Array) || colorNames.length === 0) { return -1; @@ -21,10 +21,10 @@ export const value = function(colorNames) { var bandNumber = colorNames.reduce( function(bandNumber, elem) { - return bandNumber + codes[elem]; + return bandNumber + codes[elem]; }, ''); - + return Number(bandNumber); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/73/resistor-color-duo.js b/test/fixtures/resistor-color-duo/73/resistor-color-duo.js index ee9cf268..ff2b10cc 100644 --- a/test/fixtures/resistor-color-duo/73/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/73/resistor-color-duo.js @@ -7,4 +7,4 @@ export const COLORS = [ const reducer = (accumulator, color, iValue) => accumulator + COLORS.indexOf(color) * (10 ** iValue) -export const value = colors => colors.reverse().reduce(reducer, 0) \ No newline at end of file +export const decodedValue = colors => colors.reverse().reduce(reducer, 0) diff --git a/test/fixtures/resistor-color-duo/74/resistor-color-duo.js b/test/fixtures/resistor-color-duo/74/resistor-color-duo.js index bb94f05f..2b30099f 100644 --- a/test/fixtures/resistor-color-duo/74/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/74/resistor-color-duo.js @@ -1,3 +1,3 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = colors => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]) +export const decodedValue = colors => COLORS.indexOf(colors[0]) * 10 + COLORS.indexOf(colors[1]) diff --git a/test/fixtures/resistor-color-duo/75/resistor-color-duo.js b/test/fixtures/resistor-color-duo/75/resistor-color-duo.js index e0df6ee9..fb376a5a 100644 --- a/test/fixtures/resistor-color-duo/75/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/75/resistor-color-duo.js @@ -11,7 +11,7 @@ export const COLORS = { White: '9' } -export function value(color1, color2) { +export function decodedValue(color1, color2) { let colorsSum = COLORS[color1] + COLORS[color2]; return Number.parseInt(colorsSum); } diff --git a/test/fixtures/resistor-color-duo/76/resistor-color-duo.js b/test/fixtures/resistor-color-duo/76/resistor-color-duo.js index dcec2420..2a525823 100644 --- a/test/fixtures/resistor-color-duo/76/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/76/resistor-color-duo.js @@ -2,6 +2,6 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","v export const colorCode = ( color ) => COLORS.indexOf(color); -export function value(input) { +export function decodedValue(input) { return parseInt(input.map(el => colorCode(el)).join(''), 10); } diff --git a/test/fixtures/resistor-color-duo/77/resistor-color-duo.js b/test/fixtures/resistor-color-duo/77/resistor-color-duo.js index 1b82390a..181b51b6 100644 --- a/test/fixtures/resistor-color-duo/77/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/77/resistor-color-duo.js @@ -1,9 +1,9 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = (colors) => { +export const decodedValue = (colors) => { var numbers = [] for (var i = 0; i < colors.length; i++) numbers.push(COLORS.indexOf(colors[i]).toString()) return Number(numbers.join('')) -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/78/resistor-color-duo.js b/test/fixtures/resistor-color-duo/78/resistor-color-duo.js index e6b1784c..4dc7afc8 100644 --- a/test/fixtures/resistor-color-duo/78/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/78/resistor-color-duo.js @@ -1,11 +1,11 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -// const value = function(colors) { +// const decodedValue = function(colors) { // return Number(colors.map(function(color) { // return COLORS.indexOf(color) // }).join('')); // } -const value = colors => Number(colors.map(color => COLORS.indexOf(color)).join('')); +const decodedValue = colors => Number(colors.map(color => COLORS.indexOf(color)).join('')); -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/79/resistor-color-duo.js b/test/fixtures/resistor-color-duo/79/resistor-color-duo.js index c92c4ffe..3459a0b1 100644 --- a/test/fixtures/resistor-color-duo/79/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/79/resistor-color-duo.js @@ -22,6 +22,6 @@ const COLORS = new Map() * @param {string[]} inputColors - Array of band colors to be input * @return {number} The concatenation of string numbers representing resistor band values **/ -export const value = (inputColors) => { +export const decodedValue = (inputColors) => { return parseInt(inputColors.reduce((colorA, colorB) => COLORS.get(colorA.toLowerCase()) + COLORS.get(colorB.toLowerCase()))); -}; \ No newline at end of file +}; diff --git a/test/fixtures/resistor-color-duo/8/resistor-color-duo.js b/test/fixtures/resistor-color-duo/8/resistor-color-duo.js index 4b5be61d..840a3bc7 100644 --- a/test/fixtures/resistor-color-duo/8/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/8/resistor-color-duo.js @@ -11,7 +11,7 @@ const RESISTOR_MAP = new Map([ ["white", 9] ]); -export const value = arr => { +export const decodedValue = arr => { let str = ""; arr.forEach(element => { str += RESISTOR_MAP.get(element); diff --git a/test/fixtures/resistor-color-duo/80/resistor-color-duo.js b/test/fixtures/resistor-color-duo/80/resistor-color-duo.js index 1cd2e19f..63af3b97 100644 --- a/test/fixtures/resistor-color-duo/80/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/80/resistor-color-duo.js @@ -1,2 +1,2 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (list) => list.reduce((acc, value) => parseInt(acc + COLORS.indexOf(value).toString()), '') \ No newline at end of file +export const decodedValue = (list) => list.reduce((acc, decodedValue) => parseInt(acc + COLORS.indexOf(decodedValue).toString()), '') diff --git a/test/fixtures/resistor-color-duo/81/resistor-color-duo.js b/test/fixtures/resistor-color-duo/81/resistor-color-duo.js index 27e6d459..d02daf5a 100644 --- a/test/fixtures/resistor-color-duo/81/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/81/resistor-color-duo.js @@ -1,3 +1,3 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; export const colorCode = ColorStr => COLORS.indexOf(ColorStr); -export const value = ColorsStrArray => 10*colorCode(ColorsStrArray[0])+colorCode(ColorsStrArray[1]); \ No newline at end of file +export const decodedValue = ColorsStrArray => 10*colorCode(ColorsStrArray[0])+colorCode(ColorsStrArray[1]); diff --git a/test/fixtures/resistor-color-duo/82/resistor-color-duo.js b/test/fixtures/resistor-color-duo/82/resistor-color-duo.js index da0044e9..cbe5632d 100644 --- a/test/fixtures/resistor-color-duo/82/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/82/resistor-color-duo.js @@ -1,15 +1,15 @@ -export const value = (tab)=>{ - +export const decodedValue = (tab)=>{ + var COLORS = [ "black","brown","red","orange","yellow","green","blue","violet","grey","white" - ] - + ] + var index1 = COLORS.indexOf(tab[0]).toString(); var index2 = COLORS.indexOf(tab[1]).toString(); - - var index = index1 + index2 + + var index = index1 + index2 return parseInt(index); } diff --git a/test/fixtures/resistor-color-duo/83/resistor-color-duo.js b/test/fixtures/resistor-color-duo/83/resistor-color-duo.js index ab6a2570..5c2c54eb 100644 --- a/test/fixtures/resistor-color-duo/83/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/83/resistor-color-duo.js @@ -1,6 +1,6 @@ const COLORS = ['black', 'brown', 'red', 'orange', 'yellow', 'green', 'blue', 'violet', 'grey', 'white'] -export const value = (colors) => { +export const decodedValue = (colors) => { return +( `${COLORS.indexOf(colors[0])}` + `${COLORS.indexOf(colors[1])}` ); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/84/resistor-color-duo.js b/test/fixtures/resistor-color-duo/84/resistor-color-duo.js index 790b5ad8..5ff588be 100644 --- a/test/fixtures/resistor-color-duo/84/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/84/resistor-color-duo.js @@ -1,4 +1,4 @@ -export const value = colours => { +export const decodedValue = colours => { const arr = [ "black", "brown", diff --git a/test/fixtures/resistor-color-duo/85/resistor-color-duo.js b/test/fixtures/resistor-color-duo/85/resistor-color-duo.js index 06ff2459..78dd6811 100644 --- a/test/fixtures/resistor-color-duo/85/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/85/resistor-color-duo.js @@ -1,8 +1,8 @@ const colorValues = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -const value => color => colorValues.indexOf(color) +const decodedValue => color => colorValues.indexOf(color) -export const value = (colors) => - colors.reduce((sum, color, index) => sum + value(color) * Math.pow(10, colors.length - index - 1), 0) +export const decodedValue = (colors) => + colors.reduce((sum, color, index) => sum + decodedValue(color) * Math.pow(10, colors.length - index - 1), 0) diff --git a/test/fixtures/resistor-color-duo/86/resistor-color-duo.js b/test/fixtures/resistor-color-duo/86/resistor-color-duo.js index 5f80c067..6a567be7 100644 --- a/test/fixtures/resistor-color-duo/86/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/86/resistor-color-duo.js @@ -15,6 +15,6 @@ function colorToValue(color) { return COLORS.indexOf(color); } -export function value(band_colors) { +export function decodedValue(band_colors) { return Number(band_colors.map(colorToValue).join("")); } diff --git a/test/fixtures/resistor-color-duo/87/resistor-color-duo.js b/test/fixtures/resistor-color-duo/87/resistor-color-duo.js index bcec457c..d55fcf6d 100644 --- a/test/fixtures/resistor-color-duo/87/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/87/resistor-color-duo.js @@ -1,3 +1,3 @@ export const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => COLORS.indexOf(colors[0])*10 + COLORS.indexOf(colors[1]); \ No newline at end of file +export const decodedValue = (colors) => COLORS.indexOf(colors[0])*10 + COLORS.indexOf(colors[1]); diff --git a/test/fixtures/resistor-color-duo/88/resistor-color-duo.js b/test/fixtures/resistor-color-duo/88/resistor-color-duo.js index 695da9c8..f3b88b02 100644 --- a/test/fixtures/resistor-color-duo/88/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/88/resistor-color-duo.js @@ -11,8 +11,8 @@ const COLORS = { white: '9' }; -const value = ([digit1, digit2]) => { +const decodedValue = ([digit1, digit2]) => { return Number(`${COLORS[digit1]}${COLORS[digit2]}`) }; -export { COLORS, value }; +export { COLORS, decodedValue }; diff --git a/test/fixtures/resistor-color-duo/89/resistor-color-duo.js b/test/fixtures/resistor-color-duo/89/resistor-color-duo.js index d2a72ba1..387fa76a 100644 --- a/test/fixtures/resistor-color-duo/89/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/89/resistor-color-duo.js @@ -1,5 +1,5 @@ -export const value = (param) => { +export const decodedValue = (param) => { const colorsArray = []; for(let i =0; i { return COLORS.indexOf(color); } -export const value = (array) => { +export const decodedValue = (array) => { const concatenate = "" + colorCode(array[0]) + colorCode(array[1]) return parseInt(concatenate, 10) } diff --git a/test/fixtures/resistor-color-duo/91/resistor-color-duo.js b/test/fixtures/resistor-color-duo/91/resistor-color-duo.js index 9d0d8dcf..617cce9e 100644 --- a/test/fixtures/resistor-color-duo/91/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/91/resistor-color-duo.js @@ -11,4 +11,4 @@ const COLORS = [ 'white', ]; -export const value = colors => parseInt(colors.map(color => COLORS.indexOf(color)).join(''), 10); +export const decodedValue = colors => parseInt(colors.map(color => COLORS.indexOf(color)).join(''), 10); diff --git a/test/fixtures/resistor-color-duo/92/resistor-color-duo.js b/test/fixtures/resistor-color-duo/92/resistor-color-duo.js index 4bbce428..9f62ce48 100644 --- a/test/fixtures/resistor-color-duo/92/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/92/resistor-color-duo.js @@ -11,7 +11,7 @@ const COLORS = [ "white" ]; -export const value = colors => +export const decodedValue = colors => colors.reduce((prev, curr) => { return parseInt(COLORS.indexOf(prev) + "" + COLORS.indexOf(curr)); }); diff --git a/test/fixtures/resistor-color-duo/93/resistor-color-duo.js b/test/fixtures/resistor-color-duo/93/resistor-color-duo.js index 07e7d9b8..2f84c672 100644 --- a/test/fixtures/resistor-color-duo/93/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/93/resistor-color-duo.js @@ -11,8 +11,8 @@ const bandColorsValues = { white: 9 }; -const value = arr => { +const decodedValue = arr => { return Number(`${bandColorsValues[arr[0]]}${bandColorsValues[arr[1]]}`); }; -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/94/resistor-color-duo.js b/test/fixtures/resistor-color-duo/94/resistor-color-duo.js index 2668b88a..21d2e081 100644 --- a/test/fixtures/resistor-color-duo/94/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/94/resistor-color-duo.js @@ -1,4 +1,4 @@ -const resistorColors = { +const resistorColors = { black: 0, brown: 1, red: 2, @@ -6,13 +6,13 @@ const resistorColors = { yellow: 4, green: 5, blue: 6, - violet: 7, + violet: 7, grey: 8, white: 9 } - export const value = (colors) => { + export const decodedValue = (colors) => { let resistorValue = ''; colors.forEach(c => resistorValue += resistorColors[c]); return parseInt(resistorValue); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/95/resistor-color-duo.js b/test/fixtures/resistor-color-duo/95/resistor-color-duo.js index 13ab23fd..63ff41ab 100644 --- a/test/fixtures/resistor-color-duo/95/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/95/resistor-color-duo.js @@ -1,11 +1,11 @@ const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"]; -export const value = (arr) => { +export const decodedValue = (arr) => { let result = ''; arr.forEach(color => { result = result + COLORS.indexOf(color.toLowerCase()); }); - + return Number.parseInt(result); -} \ No newline at end of file +} diff --git a/test/fixtures/resistor-color-duo/96/resistor-color-duo.js b/test/fixtures/resistor-color-duo/96/resistor-color-duo.js index 17fa8ed8..0d080d93 100644 --- a/test/fixtures/resistor-color-duo/96/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/96/resistor-color-duo.js @@ -11,7 +11,7 @@ const m = { white: 9 } -function value(arr){ +function decodedValue(arr){ return +arr.map(v=>m[v]).join(''); } -export {value} \ No newline at end of file +export {decodedValue} diff --git a/test/fixtures/resistor-color-duo/97/resistor-color-duo.js b/test/fixtures/resistor-color-duo/97/resistor-color-duo.js index d8cead8d..fa6a2207 100644 --- a/test/fixtures/resistor-color-duo/97/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/97/resistor-color-duo.js @@ -11,10 +11,10 @@ const COLORS = [ "white" ]; -const value = colors => +const decodedValue = colors => parseInt( colors.reduce((acc, curr) => acc + COLORS.indexOf(curr).toString(10), ""), 10 ); -export { value }; +export { decodedValue }; diff --git a/test/fixtures/resistor-color-duo/98/resistor-color-duo.js b/test/fixtures/resistor-color-duo/98/resistor-color-duo.js index 7478f85e..957c2d10 100644 --- a/test/fixtures/resistor-color-duo/98/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/98/resistor-color-duo.js @@ -1,5 +1,5 @@ export const COLORS = ["black", "brown", "red", "orange", "yellow", "green", "blue", "violet", "grey", "white"] -export const value = ([a, b]) => { +export const decodedValue = ([a, b]) => { return parseInt(String(COLORS.indexOf(a.toLowerCase())) + String(COLORS.indexOf(b.toLowerCase()))) } diff --git a/test/fixtures/resistor-color-duo/99/resistor-color-duo.js b/test/fixtures/resistor-color-duo/99/resistor-color-duo.js index 382a67e2..935aa7de 100644 --- a/test/fixtures/resistor-color-duo/99/resistor-color-duo.js +++ b/test/fixtures/resistor-color-duo/99/resistor-color-duo.js @@ -1,7 +1,7 @@ const COLORS = ["black","brown","red","orange","yellow","green","blue","violet","grey","white"]; -export const value = (colors) => { +export const decodedValue = (colors) => { return parseInt(colorCode(colors[0]) + "" + colorCode(colors[1])); }; -const colorCode = (code) => COLORS.indexOf(code); \ No newline at end of file +const colorCode = (code) => COLORS.indexOf(code); diff --git a/test/helpers/snapshot.ts b/test/helpers/snapshot.ts index dd7c1673..02ec9776 100644 --- a/test/helpers/snapshot.ts +++ b/test/helpers/snapshot.ts @@ -3,6 +3,7 @@ import { FixtureInput } from "~test/helpers/input/FixtureInput"; type AnalyzerFactory = () => Analyzer type generateAll = (status: Output['status'], fixtures: readonly number[]) => void +// eslint-disable-next-line jest/no-export export function makeTestGenerator(slug: string, AnalyzerFactory: AnalyzerFactory): generateAll { function analyze(fixture: number): Promise { const analyzer = AnalyzerFactory() diff --git a/yarn.lock b/yarn.lock index 85ac446e..2ab610a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,53 +2,26 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/code-frame@^7.5.5": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw== dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.1.0": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a" - integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.4.4" - "@babel/helpers" "^7.4.4" - "@babel/parser" "^7.4.5" - "@babel/template" "^7.4.4" - "@babel/traverse" "^7.4.5" - "@babel/types" "^7.4.4" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.11" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48" - integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw== +"@babel/core@^7.1.0", "@babel/core@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e" + integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.0" - "@babel/helpers" "^7.6.0" - "@babel/parser" "^7.6.0" - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" - convert-source-map "^1.1.0" + "@babel/generator" "^7.7.4" + "@babel/helpers" "^7.7.4" + "@babel/parser" "^7.7.5" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + convert-source-map "^1.7.0" debug "^4.1.0" json5 "^2.1.0" lodash "^4.17.13" @@ -56,136 +29,132 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041" - integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ== +"@babel/generator@^7.4.0", "@babel/generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369" + integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg== dependencies: - "@babel/types" "^7.4.4" - jsesc "^2.5.1" - lodash "^4.17.11" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.0.tgz#e2c21efbfd3293ad819a2359b448f002bfdfda56" - integrity sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA== - dependencies: - "@babel/types" "^7.6.0" + "@babel/types" "^7.7.4" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" - trim-right "^1.0.1" -"@babel/helper-annotate-as-pure@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" - integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q== +"@babel/helper-annotate-as-pure@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce" + integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" - integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f" + integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ== dependencies: - "@babel/helper-explode-assignable-expression" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-explode-assignable-expression" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-call-delegate@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43" - integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ== +"@babel/helper-call-delegate@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801" + integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" - "@babel/traverse" "^7.4.4" - "@babel/types" "^7.4.4" + "@babel/helper-hoist-variables" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-create-class-features-plugin@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f" - integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng== +"@babel/helper-create-class-features-plugin@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d" + integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-member-expression-to-functions" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" -"@babel/helper-define-map@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" - integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== +"@babel/helper-create-regexp-features-plugin@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59" + integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.5.5" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + +"@babel/helper-define-map@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176" + integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg== + dependencies: + "@babel/helper-function-name" "^7.7.4" + "@babel/types" "^7.7.4" lodash "^4.17.13" -"@babel/helper-explode-assignable-expression@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6" - integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== +"@babel/helper-explode-assignable-expression@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84" + integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg== dependencies: - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== +"@babel/helper-function-name@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e" + integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ== dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-get-function-arity" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== +"@babel/helper-get-function-arity@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0" + integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-hoist-variables@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" - integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w== +"@babel/helper-hoist-variables@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12" + integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ== dependencies: - "@babel/types" "^7.4.4" + "@babel/types" "^7.7.4" -"@babel/helper-member-expression-to-functions@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" - integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA== +"@babel/helper-member-expression-to-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74" + integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw== dependencies: - "@babel/types" "^7.5.5" + "@babel/types" "^7.7.4" -"@babel/helper-module-imports@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" - integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== +"@babel/helper-module-imports@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91" + integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8" - integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w== +"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835" + integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw== dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/template" "^7.4.4" - "@babel/types" "^7.4.4" - lodash "^4.17.11" + "@babel/helper-module-imports" "^7.7.4" + "@babel/helper-simple-access" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" + lodash "^4.17.13" -"@babel/helper-optimise-call-expression@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" - integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== +"@babel/helper-optimise-call-expression@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2" + integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" @@ -193,567 +162,525 @@ integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2" - integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q== - dependencies: - lodash "^4.17.11" - -"@babel/helper-remap-async-to-generator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" - integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-wrap-function" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-replace-supers@^7.5.5": version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" - integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg== + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351" + integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/traverse" "^7.5.5" - "@babel/types" "^7.5.5" - -"@babel/helper-simple-access@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" - integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== - dependencies: - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-split-export-declaration@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" - integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== - dependencies: - "@babel/types" "^7.4.4" - -"@babel/helper-wrap-function@^7.1.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" - integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== - dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.2.0" - -"@babel/helpers@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5" - integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A== - dependencies: - "@babel/template" "^7.4.4" - "@babel/traverse" "^7.4.4" - "@babel/types" "^7.4.4" + lodash "^4.17.13" -"@babel/helpers@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e" - integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ== - dependencies: - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" +"@babel/helper-remap-async-to-generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234" + integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.7.4" + "@babel/helper-wrap-function" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-replace-supers@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2" + integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-simple-access@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294" + integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A== + dependencies: + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-split-export-declaration@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8" + integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug== + dependencies: + "@babel/types" "^7.7.4" + +"@babel/helper-wrap-function@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace" + integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg== + dependencies: + "@babel/helper-function-name" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helpers@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302" + integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg== + dependencies: + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" "@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540" + integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ== dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872" - integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew== +"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71" + integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig== -"@babel/parser@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b" - integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ== +"@babel/plugin-proposal-async-generator-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d" + integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-remap-async-to-generator" "^7.7.4" + "@babel/plugin-syntax-async-generators" "^7.7.4" -"@babel/plugin-proposal-async-generator-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" - integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== +"@babel/plugin-proposal-dynamic-import@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d" + integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" - "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.7.4" -"@babel/plugin-proposal-dynamic-import@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506" - integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw== +"@babel/plugin-proposal-json-strings@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d" + integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.7.4" -"@babel/plugin-proposal-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317" - integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== +"@babel/plugin-proposal-object-rest-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" + integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.7.4" -"@babel/plugin-proposal-object-rest-spread@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58" - integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw== +"@babel/plugin-proposal-optional-catch-binding@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379" + integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" -"@babel/plugin-proposal-optional-catch-binding@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5" - integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g== +"@babel/plugin-proposal-unicode-property-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" + integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" - integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA== +"@babel/plugin-syntax-async-generators@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889" + integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/plugin-syntax-async-generators@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" - integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== +"@babel/plugin-syntax-dynamic-import@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec" + integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-dynamic-import@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" - integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== +"@babel/plugin-syntax-json-strings@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc" + integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" - integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== +"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46" + integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" - integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== +"@babel/plugin-syntax-optional-catch-binding@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6" + integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-optional-catch-binding@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c" - integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w== +"@babel/plugin-syntax-top-level-await@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da" + integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-typescript@^7.2.0": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991" - integrity sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag== +"@babel/plugin-syntax-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b" + integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-arrow-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" - integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg== +"@babel/plugin-transform-arrow-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12" + integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-async-to-generator@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" - integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== +"@babel/plugin-transform-async-to-generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba" + integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" + "@babel/helper-remap-async-to-generator" "^7.7.4" -"@babel/plugin-transform-block-scoped-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" - integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== +"@babel/plugin-transform-block-scoped-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b" + integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc" - integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA== +"@babel/plugin-transform-block-scoping@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224" + integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" - integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== +"@babel/plugin-transform-classes@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec" + integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-define-map" "^7.5.5" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.4" + "@babel/helper-define-map" "^7.7.4" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da" - integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== +"@babel/plugin-transform-computed-properties@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d" + integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" - integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== +"@babel/plugin-transform-destructuring@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267" + integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3" - integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg== +"@babel/plugin-transform-dotall-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" + integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/plugin-transform-duplicate-keys@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" - integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== +"@babel/plugin-transform-duplicate-keys@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91" + integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-exponentiation-operator@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008" - integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== +"@babel/plugin-transform-exponentiation-operator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9" + integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-for-of@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556" - integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ== +"@babel/plugin-transform-for-of@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc" + integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-function-name@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" - integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== +"@babel/plugin-transform-function-name@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1" + integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g== dependencies: - "@babel/helper-function-name" "^7.1.0" + "@babel/helper-function-name" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1" - integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== +"@babel/plugin-transform-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e" + integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-member-expression-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" - integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== +"@babel/plugin-transform-member-expression-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a" + integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-amd@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" - integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== +"@babel/plugin-transform-modules-amd@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c" + integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ== dependencies: - "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-module-transforms" "^7.7.5" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" - integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== +"@babel/plugin-transform-modules-commonjs@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345" + integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q== dependencies: - "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-module-transforms" "^7.7.5" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" + "@babel/helper-simple-access" "^7.7.4" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" - integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== +"@babel/plugin-transform-modules-systemjs@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30" + integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" + "@babel/helper-hoist-variables" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" - integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== +"@babel/plugin-transform-modules-umd@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f" + integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw== dependencies: - "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-module-transforms" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1" - integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew== +"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220" + integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw== dependencies: - regexp-tree "^0.1.13" + "@babel/helper-create-regexp-features-plugin" "^7.7.4" -"@babel/plugin-transform-new-target@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5" - integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA== +"@babel/plugin-transform-new-target@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167" + integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-object-super@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" - integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== +"@babel/plugin-transform-object-super@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262" + integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-replace-supers" "^7.7.4" -"@babel/plugin-transform-parameters@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16" - integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw== +"@babel/plugin-transform-parameters@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" + integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw== dependencies: - "@babel/helper-call-delegate" "^7.4.4" - "@babel/helper-get-function-arity" "^7.0.0" + "@babel/helper-call-delegate" "^7.7.4" + "@babel/helper-get-function-arity" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-property-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" - integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== +"@babel/plugin-transform-property-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2" + integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-regenerator@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" - integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA== +"@babel/plugin-transform-regenerator@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9" + integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw== dependencies: regenerator-transform "^0.14.0" -"@babel/plugin-transform-reserved-words@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634" - integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw== +"@babel/plugin-transform-reserved-words@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb" + integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-shorthand-properties@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" - integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg== +"@babel/plugin-transform-shorthand-properties@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e" + integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-spread@^7.2.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406" - integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== +"@babel/plugin-transform-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578" + integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-sticky-regex@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" - integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== +"@babel/plugin-transform-sticky-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c" + integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-regex" "^7.0.0" -"@babel/plugin-transform-template-literals@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0" - integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g== +"@babel/plugin-transform-template-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604" + integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typeof-symbol@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2" - integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== +"@babel/plugin-transform-typeof-symbol@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e" + integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typescript@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.0.tgz#48d78405f1aa856ebeea7288a48a19ed8da377a6" - integrity sha512-yzw7EopOOr6saONZ3KA3lpizKnWRTe+rfBqg4AmQbSow7ik7fqmzrfIqt053osLwLE2AaTqGinLM2tl6+M/uog== +"@babel/plugin-transform-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636" + integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.6.0" + "@babel/helper-create-class-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-typescript" "^7.2.0" + "@babel/plugin-syntax-typescript" "^7.7.4" -"@babel/plugin-transform-unicode-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" - integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA== +"@babel/plugin-transform-unicode-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae" + integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/preset-env@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50" - integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg== +"@babel/preset-env@^7.7.6": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2" + integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-async-generator-functions" "^7.2.0" - "@babel/plugin-proposal-dynamic-import" "^7.5.0" - "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-object-rest-spread" "^7.5.5" - "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-syntax-async-generators" "^7.2.0" - "@babel/plugin-syntax-dynamic-import" "^7.2.0" - "@babel/plugin-syntax-json-strings" "^7.2.0" - "@babel/plugin-syntax-object-rest-spread" "^7.2.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" - "@babel/plugin-transform-arrow-functions" "^7.2.0" - "@babel/plugin-transform-async-to-generator" "^7.5.0" - "@babel/plugin-transform-block-scoped-functions" "^7.2.0" - "@babel/plugin-transform-block-scoping" "^7.6.0" - "@babel/plugin-transform-classes" "^7.5.5" - "@babel/plugin-transform-computed-properties" "^7.2.0" - "@babel/plugin-transform-destructuring" "^7.6.0" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/plugin-transform-duplicate-keys" "^7.5.0" - "@babel/plugin-transform-exponentiation-operator" "^7.2.0" - "@babel/plugin-transform-for-of" "^7.4.4" - "@babel/plugin-transform-function-name" "^7.4.4" - "@babel/plugin-transform-literals" "^7.2.0" - "@babel/plugin-transform-member-expression-literals" "^7.2.0" - "@babel/plugin-transform-modules-amd" "^7.5.0" - "@babel/plugin-transform-modules-commonjs" "^7.6.0" - "@babel/plugin-transform-modules-systemjs" "^7.5.0" - "@babel/plugin-transform-modules-umd" "^7.2.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0" - "@babel/plugin-transform-new-target" "^7.4.4" - "@babel/plugin-transform-object-super" "^7.5.5" - "@babel/plugin-transform-parameters" "^7.4.4" - "@babel/plugin-transform-property-literals" "^7.2.0" - "@babel/plugin-transform-regenerator" "^7.4.5" - "@babel/plugin-transform-reserved-words" "^7.2.0" - "@babel/plugin-transform-shorthand-properties" "^7.2.0" - "@babel/plugin-transform-spread" "^7.2.0" - "@babel/plugin-transform-sticky-regex" "^7.2.0" - "@babel/plugin-transform-template-literals" "^7.4.4" - "@babel/plugin-transform-typeof-symbol" "^7.2.0" - "@babel/plugin-transform-unicode-regex" "^7.4.4" - "@babel/types" "^7.6.0" + "@babel/plugin-proposal-async-generator-functions" "^7.7.4" + "@babel/plugin-proposal-dynamic-import" "^7.7.4" + "@babel/plugin-proposal-json-strings" "^7.7.4" + "@babel/plugin-proposal-object-rest-spread" "^7.7.4" + "@babel/plugin-proposal-optional-catch-binding" "^7.7.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.7.4" + "@babel/plugin-syntax-async-generators" "^7.7.4" + "@babel/plugin-syntax-dynamic-import" "^7.7.4" + "@babel/plugin-syntax-json-strings" "^7.7.4" + "@babel/plugin-syntax-object-rest-spread" "^7.7.4" + "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" + "@babel/plugin-syntax-top-level-await" "^7.7.4" + "@babel/plugin-transform-arrow-functions" "^7.7.4" + "@babel/plugin-transform-async-to-generator" "^7.7.4" + "@babel/plugin-transform-block-scoped-functions" "^7.7.4" + "@babel/plugin-transform-block-scoping" "^7.7.4" + "@babel/plugin-transform-classes" "^7.7.4" + "@babel/plugin-transform-computed-properties" "^7.7.4" + "@babel/plugin-transform-destructuring" "^7.7.4" + "@babel/plugin-transform-dotall-regex" "^7.7.4" + "@babel/plugin-transform-duplicate-keys" "^7.7.4" + "@babel/plugin-transform-exponentiation-operator" "^7.7.4" + "@babel/plugin-transform-for-of" "^7.7.4" + "@babel/plugin-transform-function-name" "^7.7.4" + "@babel/plugin-transform-literals" "^7.7.4" + "@babel/plugin-transform-member-expression-literals" "^7.7.4" + "@babel/plugin-transform-modules-amd" "^7.7.5" + "@babel/plugin-transform-modules-commonjs" "^7.7.5" + "@babel/plugin-transform-modules-systemjs" "^7.7.4" + "@babel/plugin-transform-modules-umd" "^7.7.4" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4" + "@babel/plugin-transform-new-target" "^7.7.4" + "@babel/plugin-transform-object-super" "^7.7.4" + "@babel/plugin-transform-parameters" "^7.7.4" + "@babel/plugin-transform-property-literals" "^7.7.4" + "@babel/plugin-transform-regenerator" "^7.7.5" + "@babel/plugin-transform-reserved-words" "^7.7.4" + "@babel/plugin-transform-shorthand-properties" "^7.7.4" + "@babel/plugin-transform-spread" "^7.7.4" + "@babel/plugin-transform-sticky-regex" "^7.7.4" + "@babel/plugin-transform-template-literals" "^7.7.4" + "@babel/plugin-transform-typeof-symbol" "^7.7.4" + "@babel/plugin-transform-unicode-regex" "^7.7.4" + "@babel/types" "^7.7.4" browserslist "^4.6.0" - core-js-compat "^3.1.1" + core-js-compat "^3.4.7" invariant "^2.2.2" js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/preset-typescript@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz#25768cb8830280baf47c45ab1a519a9977498c98" - integrity sha512-4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww== +"@babel/preset-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a" + integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.6.0" - -"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237" - integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.4.4" - "@babel/types" "^7.4.4" - -"@babel/template@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" - integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.6.0" - "@babel/types" "^7.6.0" + "@babel/plugin-transform-typescript" "^7.7.4" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216" - integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A== +"@babel/template@^7.4.0", "@babel/template@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b" + integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.4.4" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/parser" "^7.4.5" - "@babel/types" "^7.4.4" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.11" + "@babel/parser" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.0.tgz#389391d510f79be7ce2ddd6717be66d3fed4b516" - integrity sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558" + integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/parser" "^7.6.0" - "@babel/types" "^7.6.0" + "@babel/generator" "^7.7.4" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" + "@babel/parser" "^7.7.4" + "@babel/types" "^7.7.4" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0" - integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ== - dependencies: - esutils "^2.0.2" - lodash "^4.17.11" - to-fast-properties "^2.0.0" - -"@babel/types@^7.5.5", "@babel/types@^7.6.0": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648" - integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" + integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -767,16 +694,7 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@jest/console@^24.7.1": - version "24.7.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" - integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg== - dependencies: - "@jest/source-map" "^24.3.0" - chalk "^2.0.1" - slash "^2.0.0" - -"@jest/console@^24.9.0": +"@jest/console@^24.7.1", "@jest/console@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== @@ -865,16 +783,7 @@ source-map "^0.6.0" string-length "^2.0.0" -"@jest/source-map@^24.3.0": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28" - integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" - -"@jest/source-map@^24.9.0": +"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== @@ -934,9 +843,9 @@ "@types/yargs" "^13.0.0" "@types/babel__core@^7.1.0": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f" - integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg== + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30" + integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -945,9 +854,9 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" - integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ== + version "7.6.1" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04" + integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew== dependencies: "@babel/types" "^7.0.0" @@ -960,12 +869,17 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2" - integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw== + version "7.0.8" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012" + integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw== dependencies: "@babel/types" "^7.3.0" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/eslint-visitor-keys@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" @@ -991,27 +905,22 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/jest-diff@*": - version "20.0.1" - resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89" - integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA== - -"@types/jest@^24.0.18": - version "24.0.18" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.18.tgz#9c7858d450c59e2164a8a9df0905fc5091944498" - integrity sha512-jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ== +"@types/jest@^24.0.23": + version "24.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.23.tgz#046f8e2ade026fe831623e361a36b6fb9a4463e4" + integrity sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg== dependencies: - "@types/jest-diff" "*" + jest-diff "^24.3.0" "@types/json-schema@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== -"@types/node@^12.7.5": - version "12.7.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f" - integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w== +"@types/node@^12.12.17": + version "12.12.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.17.tgz#191b71e7f4c325ee0fb23bc4a996477d92b8c39b" + integrity sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA== "@types/stack-utils@^1.0.1": version "1.0.1" @@ -1019,104 +928,64 @@ integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== "@types/yargs-parser@*": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" - integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw== - -"@types/yargs@^13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4" - integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA== - dependencies: - "@types/yargs-parser" "*" + version "13.1.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" + integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg== -"@types/yargs@^13.0.2": - version "13.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz#a64674fc0149574ecd90ba746e932b5a5f7b3653" - integrity sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ== +"@types/yargs@^13.0.0", "@types/yargs@^13.0.3": + version "13.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380" + integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ== dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.3.0.tgz#6ead12c6b15a9b930430931e396e01a1fe181fcc" - integrity sha512-QgO/qmNye+rKsU7dan6pkBTSfpbyrHJidsw9bR3gZCrQNTB9eWQ5+UDkrrev/fu9xg6Qh7ebbx03IVuGnGRmEw== +"@typescript-eslint/eslint-plugin@^2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.11.0.tgz#4477c33491ccf0a9a3f4a30ef84978fa0ea0cad2" + integrity sha512-G2HHA1vpMN0EEbUuWubiCCfd0R3a30BB+UdvnFkxwZIxYEGOrWEXDv8tBFO9f44CWc47Xv9lLM3VSn4ORLI2bA== dependencies: - "@typescript-eslint/experimental-utils" "2.3.0" - eslint-utils "^1.4.2" + "@typescript-eslint/experimental-utils" "2.11.0" + eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" - regexpp "^2.0.1" + regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.0.tgz#19a8e1b8fcee7d7469f3b44691d91830568de140" - integrity sha512-ry+fgd0Hh33LyzS30bIhX/a1HJpvtnecjQjWxxsZTavrRa1ymdmX7tz+7lPrPAxB018jnNzwNtog6s3OhxPTAg== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.3.0" - eslint-scope "^5.0.0" - -"@typescript-eslint/experimental-utils@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.1.tgz#92f2531d3e7c22e64a2cc10cfe89935deaf00f7c" - integrity sha512-FaZEj73o4h6Wd0Lg+R4pZiJGdR0ZYbJr+O2+RbQ1aZjX8bZcfkVDtD+qm74Dv77rfSKkDKE64UTziLBo9UYHQA== +"@typescript-eslint/experimental-utils@2.11.0", "@typescript-eslint/experimental-utils@^2.5.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.11.0.tgz#cef18e6b122706c65248a5d8984a9779ed1e52ac" + integrity sha512-YxcA/y0ZJaCc/fB/MClhcDxHI0nOBB7v2/WxBju2cOTanX7jO9ttQq6Fy4yW9UaY5bPd9xL3cun3lDVqk67sPQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.3.1" + "@typescript-eslint/typescript-estree" "2.11.0" eslint-scope "^5.0.0" -"@typescript-eslint/experimental-utils@^1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" - integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "1.13.0" - eslint-scope "^4.0.0" - -"@typescript-eslint/parser@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.3.1.tgz#f2b93b614d9b338825c44e75552a433e2ebf8c33" - integrity sha512-ZlWdzhCJ2iZnSp/VBAJ/sowFbyHycIux8t0UEH0JsKgQvfSf7949hLYFMwTXdCMeEnpP1zRTHimrR+YHzs8LIw== +"@typescript-eslint/parser@^2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.11.0.tgz#cdcc3be73ee31cbef089af5ff97ccaa380ef6e8b" + integrity sha512-DyGXeqhb3moMioEFZIHIp7oXBBh7dEfPTzGrlyP0Mi9ScCra4SWEGs3kPd18mG7Sy9Wy8z88zmrw5tSGL6r/6A== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.3.1" - "@typescript-eslint/typescript-estree" "2.3.1" + "@typescript-eslint/experimental-utils" "2.11.0" + "@typescript-eslint/typescript-estree" "2.11.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e" - integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw== - dependencies: - lodash.unescape "4.0.1" - semver "5.5.0" - -"@typescript-eslint/typescript-estree@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.0.tgz#fd8faff7e4c73795c65e5817c52f9038e33ef29d" - integrity sha512-WBxfwsTeCOsmQ7cLjow7lgysviBKUW34npShu7dxJYUQCbSG5nfZWZTgmQPKEc+3flpbSM7tjXjQOgETYp+njQ== - dependencies: - glob "^7.1.4" - is-glob "^4.0.1" - lodash.unescape "4.0.1" - semver "^6.3.0" - -"@typescript-eslint/typescript-estree@2.3.1", "@typescript-eslint/typescript-estree@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.1.tgz#62c64f149948473d06a129dc33b4fc76e6c051f9" - integrity sha512-9SFhUgFuePJBB6jlLkOPPhMkZNiDCr+S8Ft7yAkkP2c5x5bxPhG3pe/exMiQaF8IGyVMDW6Ul0q4/cZ+uF3uog== +"@typescript-eslint/typescript-estree@2.11.0", "@typescript-eslint/typescript-estree@^2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.11.0.tgz#21ada6504274cd1644855926312c798fc697e9fb" + integrity sha512-HGY4+d4MagO6cKMcKfIKaTMxcAv7dEVnji2Zi+vi5VV8uWAM631KjAB5GxFcexMYrwKT0EekRiiGK1/Sd7VFGA== dependencies: - glob "^7.1.4" + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" is-glob "^4.0.1" lodash.unescape "4.0.1" semver "^6.3.0" + tsutils "^3.17.1" abab@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" - integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w== + version "2.0.3" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" + integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== abbrev@1: version "1.1.1" @@ -1124,22 +993,22 @@ abbrev@1: integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== acorn-globals@^4.1.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006" - integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ== + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== dependencies: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" - integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== +acorn-jsx@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" + integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== acorn-walk@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" - integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== + version "6.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" + integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: version "5.7.3" @@ -1147,16 +1016,16 @@ acorn@^5.5.3: integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== acorn@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" - integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== -acorn@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" - integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== +acorn@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" + integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== -ajv@^6.10.0: +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: version "6.10.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== @@ -1166,21 +1035,18 @@ ajv@^6.10.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.5.5, ajv@^6.9.1: - version "6.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" - integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: +ansi-escapes@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-escapes@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" + integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== + dependencies: + type-fest "^0.8.1" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1196,6 +1062,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1203,6 +1074,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" + integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1279,9 +1158,9 @@ astral-regex@^1.0.0: integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== async-limiter@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" - integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== asynckit@^0.4.0: version "0.4.0" @@ -1299,9 +1178,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c" + integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A== babel-jest@^24.9.0: version "24.9.0" @@ -1324,10 +1203,11 @@ babel-plugin-dynamic-import-node@^2.3.0: object.assign "^4.1.0" babel-plugin-istanbul@^5.1.0: - version "5.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba" - integrity sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854" + integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw== dependencies: + "@babel/helper-plugin-utils" "^7.0.0" find-up "^3.0.0" istanbul-lib-instrument "^3.3.0" test-exclude "^5.2.3" @@ -1408,19 +1288,19 @@ browser-resolve@^1.11.3: dependencies: resolve "1.1.7" -browserslist@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b" - integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ== +browserslist@^4.6.0, browserslist@^4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" + integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== dependencies: - caniuse-lite "^1.0.30000971" - electron-to-chromium "^1.3.137" - node-releases "^1.1.21" + caniuse-lite "^1.0.30001015" + electron-to-chromium "^1.3.322" + node-releases "^1.1.42" -bser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" - integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== dependencies: node-int64 "^0.4.0" @@ -1445,24 +1325,19 @@ cache-base@^1.0.1: unset-value "^1.0.0" callsites@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" - integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== - -camelcase@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45" - integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ== + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase@^5.3.1: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30000971: - version "1.0.30000971" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13" - integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g== +caniuse-lite@^1.0.30001015: + version "1.0.30001015" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" + integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== capture-exit@^2.0.0: version "2.0.0" @@ -1491,9 +1366,9 @@ chardet@^0.7.0: integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== chownr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== + version "1.1.3" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" + integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== ci-info@^2.0.0: version "2.0.0" @@ -1510,12 +1385,12 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== dependencies: - restore-cursor "^2.0.0" + restore-cursor "^3.1.0" cli-width@^2.0.0: version "2.2.0" @@ -1531,6 +1406,15 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1556,11 +1440,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -1568,10 +1464,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@~2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== +commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== component-emitter@^1.2.1: version "1.3.0" @@ -1588,10 +1484,10 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -convert-source-map@^1.1.0, convert-source-map@^1.4.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" - integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== +convert-source-map@^1.4.0, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== dependencies: safe-buffer "~5.1.1" @@ -1600,19 +1496,13 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14" - integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA== +core-js-compat@^3.4.7: + version "3.5.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.5.0.tgz#5a11a619a9e9dd2dcf1c742b2060bc4a2143e5b6" + integrity sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg== dependencies: - browserslist "^4.6.0" - core-js-pure "3.1.3" - semver "^6.1.0" - -core-js-pure@3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5" - integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA== + browserslist "^4.8.2" + semver "^6.3.0" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1631,14 +1521,14 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: which "^1.2.9" cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": - version "0.3.6" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad" - integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A== + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== cssstyle@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077" - integrity sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow== + version "1.4.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" + integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA== dependencies: cssom "0.3.x" @@ -1699,7 +1589,7 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -define-properties@^1.1.2: +define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -1775,20 +1665,25 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.137: - version "1.3.137" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944" - integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw== +electron-to-chromium@^1.3.322: + version "1.3.322" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" + integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" @@ -1800,21 +1695,25 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.5.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== + version "1.16.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" + integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== dependencies: - es-to-primitive "^1.2.0" + es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" + has-symbols "^1.0.1" is-callable "^1.1.4" is-regex "^1.0.4" - object-keys "^1.0.12" + object-inspect "^1.7.0" + object-keys "^1.1.1" + string.prototype.trimleft "^2.1.0" + string.prototype.trimright "^2.1.0" -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" @@ -1826,9 +1725,9 @@ escape-string-regexp@^1.0.5: integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= escodegen@^1.9.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" - integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw== + version "1.12.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541" + integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg== dependencies: esprima "^3.1.3" estraverse "^4.2.0" @@ -1837,20 +1736,12 @@ escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-plugin-jest@^22.17.0: - version "22.17.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz#dc170ec8369cd1bff9c5dd8589344e3f73c88cf6" - integrity sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q== - dependencies: - "@typescript-eslint/experimental-utils" "^1.13.0" - -eslint-scope@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== +eslint-plugin-jest@^23.1.1: + version "23.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.1.1.tgz#1220ab53d5a4bf5c3c4cd07c0dabc6199d4064dd" + integrity sha512-2oPxHKNh4j1zmJ6GaCBuGcb8FVZU7YjFUOJzGOPnl9ic7VA/MGAskArLJiRIlnFUmi1EUxY+UiATAy8dv8s5JA== dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" + "@typescript-eslint/experimental-utils" "^2.5.0" eslint-scope@^5.0.0: version "5.0.0" @@ -1860,22 +1751,22 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" - integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== +eslint-utils@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== dependencies: - eslint-visitor-keys "^1.0.0" + eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: +eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.4.0.tgz#5aa9227c3fbe921982b2eda94ba0d7fae858611a" - integrity sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA== +eslint@^6.7.2: + version "6.7.2" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1" + integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -1884,19 +1775,19 @@ eslint@^6.4.0: debug "^4.0.1" doctrine "^3.0.0" eslint-scope "^5.0.0" - eslint-utils "^1.4.2" + eslint-utils "^1.4.3" eslint-visitor-keys "^1.1.0" - espree "^6.1.1" + espree "^6.1.2" esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^11.7.0" + globals "^12.1.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.4.1" + inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" @@ -1905,7 +1796,7 @@ eslint@^6.4.0: minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.2" + optionator "^0.8.3" progress "^2.0.0" regexpp "^2.0.1" semver "^6.1.2" @@ -1920,13 +1811,13 @@ esm@^3.2.25: resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== -espree@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" - integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ== +espree@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" + integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== dependencies: - acorn "^7.0.0" - acorn-jsx "^5.0.2" + acorn "^7.1.0" + acorn-jsx "^5.1.0" eslint-visitor-keys "^1.1.0" esprima@^3.1.3: @@ -1954,19 +1845,19 @@ esrecurse@^4.1.0: estraverse "^4.1.0" estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== exec-sh@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" - integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== + version "0.3.4" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" + integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== execa@^1.0.0: version "1.0.0" @@ -2032,9 +1923,9 @@ extend@~3.0.2: integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== external-editor@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" - integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: chardet "^0.7.0" iconv-lite "^0.4.24" @@ -2074,22 +1965,22 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= -fast-levenshtein@~2.0.4: +fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== dependencies: - bser "^2.0.0" + bser "2.1.1" -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= +figures@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec" + integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg== dependencies: escape-string-regexp "^1.0.5" @@ -2117,6 +2008,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -2127,9 +2026,9 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916" - integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== + version "2.0.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" + integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== for-in@^1.0.2: version "1.0.2" @@ -2158,11 +2057,11 @@ fragment-cache@^0.2.1: map-cache "^0.2.2" fs-minipass@^1.2.5: - version "1.2.6" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07" - integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ== + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== dependencies: - minipass "^2.2.1" + minipass "^2.6.0" fs.realpath@^1.0.0: version "1.0.0" @@ -2232,22 +2131,10 @@ glob-parent@^5.0.0: dependencies: is-glob "^4.0.1" -glob@^7.1.1, glob@^7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.2, glob@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2261,15 +2148,17 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^11.7.0: - version "11.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e" - integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw== +globals@^12.1.0: + version "12.3.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" + integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + dependencies: + type-fest "^0.8.1" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== growly@^1.3.0: version "1.3.0" @@ -2277,9 +2166,9 @@ growly@^1.3.0: integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= handlebars@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" - integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== + version "4.5.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" + integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -2305,10 +2194,10 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== has-unicode@^2.0.0: version "2.0.1" @@ -2354,9 +2243,9 @@ has@^1.0.1, has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.7.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" - integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== + version "2.8.5" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" + integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== html-encoding-sniffer@^1.0.2: version "1.0.2" @@ -2382,9 +2271,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: safer-buffer ">= 2.1.2 < 3" ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== dependencies: minimatch "^3.0.4" @@ -2394,9 +2283,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== import-fresh@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390" - integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -2423,31 +2312,31 @@ inflight@^1.0.4: wrappy "1" inherits@2, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inquirer@^6.4.1: - version "6.5.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" - integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== +inquirer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a" + integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ== dependencies: - ansi-escapes "^3.2.0" + ansi-escapes "^4.2.1" chalk "^2.4.2" - cli-cursor "^2.1.0" + cli-cursor "^3.1.0" cli-width "^2.0.0" external-editor "^3.0.3" - figures "^2.0.0" - lodash "^4.17.12" - mute-stream "0.0.7" + figures "^3.0.0" + lodash "^4.17.15" + mute-stream "0.0.8" run-async "^2.2.0" rxjs "^6.4.0" - string-width "^2.1.0" + string-width "^4.1.0" strip-ansi "^5.1.0" through "^2.3.6" @@ -2560,6 +2449,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-generator-fn@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" @@ -2579,7 +2473,7 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -2604,11 +2498,11 @@ is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-typedarray@~1.0.0: version "1.0.0" @@ -2748,7 +2642,7 @@ jest-config@^24.9.0: pretty-format "^24.9.0" realpath-native "^1.1.0" -jest-diff@^24.9.0: +jest-diff@^24.3.0, jest-diff@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== @@ -2759,9 +2653,9 @@ jest-diff@^24.9.0: pretty-format "^24.9.0" jest-docblock@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd" - integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg== + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2" + integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA== dependencies: detect-newline "^2.1.0" @@ -2889,12 +2783,7 @@ jest-pnp-resolver@^1.2.1: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36" - integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg== - -jest-regex-util@^24.9.0: +jest-regex-util@^24.3.0, jest-regex-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== @@ -3040,15 +2929,7 @@ jest-watcher@^24.9.0: jest-util "^24.9.0" string-length "^2.0.0" -jest-worker@^24.6.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" - integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== - dependencies: - merge-stream "^1.0.1" - supports-color "^6.1.0" - -jest-worker@^24.9.0: +jest-worker@^24.6.0, jest-worker@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== @@ -3155,9 +3036,9 @@ json-stringify-safe@~5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= json5@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== + version "2.1.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6" + integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ== dependencies: minimist "^1.2.0" @@ -3195,7 +3076,7 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -kleur@^3.0.2: +kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== @@ -3236,6 +3117,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -3246,7 +3134,7 @@ lodash.unescape@4.0.1: resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14: +lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -3285,13 +3173,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -merge-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= - dependencies: - readable-stream "^2.0.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -3316,22 +3197,22 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== +mime-db@1.42.0: + version "1.42.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" + integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + version "2.1.25" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" + integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== dependencies: - mime-db "1.40.0" + mime-db "1.42.0" -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== minimatch@^3.0.4: version "3.0.4" @@ -3355,20 +3236,20 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.4: - version "2.3.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" - integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== dependencies: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" - integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== dependencies: - minipass "^2.2.1" + minipass "^2.9.0" mixin-deep@^1.2.0: version "1.3.2" @@ -3385,10 +3266,10 @@ mkdirp@^0.5.0, mkdirp@^0.5.1: dependencies: minimist "0.0.8" -module-alias@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.1.tgz#553aea9dc7f99cd45fd75e34a574960dc46550da" - integrity sha512-LTez0Eo+YtfUhgzhu/LqxkUzOpD+k5C0wXBLun0L1qE2BhHf6l09dqam8e7BnoMYA6mAlP0vSsGFQ8QHhGN/aQ== +module-alias@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" + integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== ms@2.0.0: version "2.0.0" @@ -3396,14 +3277,14 @@ ms@2.0.0: integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== nan@^2.12.1: version "2.14.0" @@ -3488,12 +3369,12 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.21: - version "1.1.21" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3" - integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q== +node-releases@^1.1.42: + version "1.1.42" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" + integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA== dependencies: - semver "^5.3.0" + semver "^6.3.0" nopt@^4.0.1: version "4.0.1" @@ -3521,14 +3402,21 @@ normalize-path@^2.1.1: remove-trailing-separator "^1.0.1" npm-bundled@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" - integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== npm-packlist@^1.1.6: - version "1.4.1" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc" - integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw== + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" @@ -3556,9 +3444,9 @@ number-is-nan@^1.0.0: integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= nwsapi@^2.0.7: - version "2.1.4" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f" - integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== oauth-sign@~0.9.0: version "0.9.0" @@ -3579,7 +3467,12 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.11, object-keys@^1.0.12: +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -3623,12 +3516,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= +onetime@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" + integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== dependencies: - mimic-fn "^1.0.0" + mimic-fn "^2.1.0" optimist@^0.6.1: version "0.6.1" @@ -3638,17 +3531,17 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.1, optionator@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" - integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= +optionator@^0.8.1, optionator@^0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== dependencies: deep-is "~0.1.3" - fast-levenshtein "~2.0.4" + fast-levenshtein "~2.0.6" levn "~0.3.0" prelude-ls "~1.1.2" type-check "~0.3.2" - wordwrap "~1.0.0" + word-wrap "~1.2.3" os-homedir@^1.0.0: version "1.0.2" @@ -3680,10 +3573,10 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-limit@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" - integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== dependencies: p-try "^2.0.0" @@ -3694,20 +3587,27 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= p-try@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505" - integrity sha512-H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== parent-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5" - integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" @@ -3734,6 +3634,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -3816,9 +3721,9 @@ private@^0.1.6: integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== progress@^2.0.0: version "2.0.3" @@ -3826,17 +3731,17 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db" - integrity sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4" + integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg== dependencies: - kleur "^3.0.2" - sisteransi "^1.0.0" + kleur "^3.0.3" + sisteransi "^1.0.3" psl@^1.1.24, psl@^1.1.28: - version "1.1.32" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db" - integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g== + version "1.6.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110" + integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA== pump@^3.0.0: version "3.0.0" @@ -3872,9 +3777,9 @@ rc@^1.2.7: strip-json-comments "~2.0.1" react-is@^16.8.4: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" - integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== read-pkg-up@^4.0.0: version "4.0.0" @@ -3893,7 +3798,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -readable-stream@^2.0.1, readable-stream@^2.0.6: +readable-stream@^2.0.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -3913,7 +3818,7 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" -regenerate-unicode-properties@^8.0.2: +regenerate-unicode-properties@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== @@ -3926,9 +3831,9 @@ regenerate@^1.4.0: integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== regenerator-transform@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf" - integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w== + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" + integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ== dependencies: private "^0.1.6" @@ -3940,32 +3845,32 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp-tree@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f" - integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw== - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^4.5.4: - version "4.5.4" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae" - integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ== +regexpp@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" + integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== + +regexpu-core@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" + integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== dependencies: regenerate "^1.4.0" - regenerate-unicode-properties "^8.0.2" + regenerate-unicode-properties "^8.1.0" regjsgen "^0.5.0" regjsparser "^0.6.0" unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.1.0" regjsgen@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" - integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== + version "0.5.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" + integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== regjsparser@^0.6.0: version "0.6.0" @@ -3989,19 +3894,19 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -request-promise-core@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" - integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag== +request-promise-core@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" + integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ== dependencies: - lodash "^4.17.11" + lodash "^4.17.15" request-promise-native@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59" - integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w== + version "1.0.8" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" + integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== dependencies: - request-promise-core "1.1.2" + request-promise-core "1.1.3" stealthy-require "^1.1.1" tough-cookie "^2.3.3" @@ -4069,18 +3974,18 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.10.0, resolve@^1.3.2: - version "1.11.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" - integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== + version "1.13.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" + integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== dependencies: path-parse "^1.0.6" -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== dependencies: - onetime "^2.0.0" + onetime "^5.1.0" signal-exit "^3.0.2" ret@~0.1.10: @@ -4088,17 +3993,24 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: glob "^7.1.3" +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + rsvp@^4.8.4: - version "4.8.4" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911" - integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA== + version "4.8.5" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" + integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== run-async@^2.2.0: version "2.3.0" @@ -4108,13 +4020,18 @@ run-async@^2.2.0: is-promise "^2.1.0" rxjs@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" - integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== + version "6.5.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" + integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== dependencies: tslib "^1.9.0" -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@^5.0.1, safe-buffer@^5.1.2: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -4151,27 +4068,12 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.6.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" - integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== - -semver@5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== - -semver@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" - integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ== - -semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -4181,20 +4083,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" @@ -4223,10 +4115,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= -sisteransi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" - integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ== +sisteransi@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" + integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig== slash@^2.0.0: version "2.0.0" @@ -4284,9 +4176,9 @@ source-map-resolve@^0.5.0: urix "^0.1.0" source-map-support@^0.5.6: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -4328,9 +4220,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1" - integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -4394,7 +4286,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.1.0: +"string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -4411,6 +4303,31 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string.prototype.trimleft@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" + integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + +string.prototype.trimright@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" + integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -4432,20 +4349,20 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.1.0.tgz#55aaa54e33b4c0649a7338a43437b1887d153ec4" - integrity sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^5.2.0: +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -4481,32 +4398,32 @@ supports-color@^6.1.0: has-flag "^3.0.0" symbol-tree@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" - integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY= + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2" - integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ== + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== dependencies: - ajv "^6.9.1" - lodash "^4.17.11" + ajv "^6.10.2" + lodash "^4.17.14" slice-ansi "^2.1.0" string-width "^3.0.0" tar@^4: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== dependencies: chownr "^1.1.1" fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" + minipass "^2.8.6" + minizlib "^1.2.1" mkdirp "^0.5.0" safe-buffer "^5.1.2" - yallist "^3.0.2" + yallist "^3.0.3" test-exclude@^5.2.3: version "5.2.3" @@ -4598,21 +4515,11 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -tslib@^1.8.1: +tslib@^1.8.1, tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== - tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" @@ -4639,17 +4546,22 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -typescript@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" - integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +typescript@^3.7.3: + version "3.7.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69" + integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw== uglify-js@^3.1.4: - version "3.5.15" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.15.tgz#fe2b5378fd0b09e116864041437bff889105ce24" - integrity sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg== + version "3.7.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9" + integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA== dependencies: - commander "~2.20.0" + commander "~2.20.3" source-map "~0.6.1" unicode-canonical-property-names-ecmascript@^1.0.4: @@ -4676,14 +4588,14 @@ unicode-property-aliases-ecmascript@^1.0.4: integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" + set-value "^2.0.1" unset-value@^1.0.0: version "1.0.0" @@ -4724,9 +4636,9 @@ util.promisify@^1.0.0: object.getownpropertydescriptors "^2.0.3" uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== + version "3.3.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" + integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== v8-compile-cache@^2.0.3: version "2.1.0" @@ -4791,9 +4703,9 @@ whatwg-url@^6.4.1: webidl-conversions "^4.0.2" whatwg-url@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" - integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ== + version "7.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== dependencies: lodash.sortby "^4.7.0" tr46 "^1.0.1" @@ -4818,16 +4730,16 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= -wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -4837,6 +4749,15 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -4875,10 +4796,10 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" - integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== +yallist@^3.0.0, yallist@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yargs-parser@^13.1.1: version "13.1.1" @@ -4888,6 +4809,14 @@ yargs-parser@^13.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" + integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs@^13.3.0: version "13.3.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" @@ -4904,19 +4833,19 @@ yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066" - integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow== +yargs@^15.0.2: + version "15.0.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3" + integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q== dependencies: - cliui "^5.0.0" + cliui "^6.0.0" decamelize "^1.2.0" - find-up "^3.0.0" + find-up "^4.1.0" get-caller-file "^2.0.1" require-directory "^2.1.1" require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^3.0.0" + string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" + yargs-parser "^16.1.0"