-
Notifications
You must be signed in to change notification settings - Fork 63
Completed tasks #43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Completed tasks #43
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,21 @@ | ||
| // Этот блок кода удалить и раскомментировать код ниже | ||
| it('remove it', () => { | ||
| expect(true).toBe(true); | ||
| }); | ||
| import { transformCustomers } from './1_base'; | ||
|
|
||
| describe('all', () => { | ||
| it('transformCustomers', () => { | ||
| const customers = [ | ||
| { id: 1, name: 'John', age: 25, isSubscribed: true }, | ||
| { id: 2, name: 'Mary', age: 40, isSubscribed: false }, | ||
| { id: 3, name: 'Bob', age: 32, isSubscribed: true }, | ||
| { id: 4, name: 'Alice', age: 22, isSubscribed: true }, | ||
| { id: 5, name: 'David', age: 48, isSubscribed: false }, | ||
| ]; | ||
|
|
||
| // import { transformCustomers } from './1_base'; | ||
| // | ||
| // describe('all', () => { | ||
| // it('transformCustomers', () => { | ||
| // const customers = [ | ||
| // { id: 1, name: 'John', age: 25, isSubscribed: true }, | ||
| // { id: 2, name: 'Mary', age: 40, isSubscribed: false }, | ||
| // { id: 3, name: 'Bob', age: 32, isSubscribed: true }, | ||
| // { id: 4, name: 'Alice', age: 22, isSubscribed: true }, | ||
| // { id: 5, name: 'David', age: 48, isSubscribed: false }, | ||
| // ]; | ||
| // | ||
| // expect(transformCustomers(customers)).toEqual({ | ||
| // 1: { name: 'John', age: 25, isSubscribed: true }, | ||
| // 2: { name: 'Mary', age: 40, isSubscribed: false }, | ||
| // 3: { name: 'Bob', age: 32, isSubscribed: true }, | ||
| // 4: { name: 'Alice', age: 22, isSubscribed: true }, | ||
| // 5: { name: 'David', age: 48, isSubscribed: false }, | ||
| // }); | ||
| // }); | ||
| // }); | ||
| expect(transformCustomers(customers)).toEqual({ | ||
| 1: { name: 'John', age: 25, isSubscribed: true }, | ||
| 2: { name: 'Mary', age: 40, isSubscribed: false }, | ||
| 3: { name: 'Bob', age: 32, isSubscribed: true }, | ||
| 4: { name: 'Alice', age: 22, isSubscribed: true }, | ||
| 5: { name: 'David', age: 48, isSubscribed: false }, | ||
| }); | ||
| }); | ||
| }); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| export const removePlus = (string: string): string => string.replace(/^\+/, ''); | ||
| export const addPlus = (string: string): string => `+${string}`; | ||
| export const removeFirstZeros = (value: string): string => value.replace(/^(-)?[0]+(-?\d+.*)$/, '$1$2'); | ||
| export const getBeautifulNumber = (value: number | undefined, separator = ' ') => | ||
| value?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, separator); | ||
|
|
||
| export const round = (value: number, accuracy = 2): number => { | ||
| const d = 10 ** accuracy; | ||
| return Math.round(value * d) / d; | ||
| }; | ||
|
|
||
| const transformRegexp = | ||
| /(matrix\(-?\d+(\.\d+)?, -?\d+(\.\d+)?, -?\d+(\.\d+)?, -?\d+(\.\d+)?, )(-?\d+(\.\d+)?), (-?\d+(\.\d+)?)\)/; | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. отдельный тип { x: number; y: number } |
||
| export const getTransformFromCss = (transformCssString: string): { x: number; y: number } => { | ||
| const data = transformCssString.match(transformRegexp); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. отдельный тип { x: number; y: number } |
||
| if (!data) return { x: 0, y: 0 }; | ||
| return { | ||
| x: parseInt(data[6], 10), | ||
| y: parseInt(data[8], 10), | ||
| }; | ||
| }; | ||
|
|
||
| export const getColorContrastValue = ([red, green, blue]: [number, number, number]): number => | ||
| // http://www.w3.org/TR/AERT#color-contrast | ||
| Math.round((red * 299 + green * 587 + blue * 114) / 1000); | ||
|
|
||
| export const getContrastType = (contrastValue: number): string => (contrastValue > 125 ? 'black' : 'white'); | ||
|
||
|
|
||
| export const shortColorRegExp = /^#[0-9a-f]{3}$/i; | ||
| export const longColorRegExp = /^#[0-9a-f]{6}$/i; | ||
|
|
||
| export const checkColor = (color: string): void => { | ||
|
||
| if (!longColorRegExp.test(color) && !shortColorRegExp.test(color)) throw new Error(`invalid hex color: ${color}`); | ||
| }; | ||
|
|
||
| export const hex2rgb = (color: string): [number, number, number] => { | ||
| checkColor(color); | ||
| if (shortColorRegExp.test(color)) { | ||
| const red = parseInt(color.substring(1, 2), 16); | ||
| const green = parseInt(color.substring(2, 3), 16); | ||
| const blue = parseInt(color.substring(3, 4), 16); | ||
| return [red, green, blue]; | ||
| } | ||
| const red = parseInt(color.substring(1, 3), 16); | ||
| const green = parseInt(color.substring(3, 5), 16); | ||
| const blue = parseInt(color.substring(5, 8), 16); | ||
| return [red, green, blue]; | ||
| }; | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Array<{ value: number; number: number } отдельный тип |
||
| export const getNumberedArray = (arr: Array<number>): Array<{ value: number; number: number }> => | ||
| arr.map((value, number) => ({ value, number })); | ||
| export const toStringArray = (arr: Array<{ value: number, number: number}>): Array<string> => | ||
|
||
| arr.map(({ value, number }) => `${value}_${number}`); | ||
| type Customer = { | ||
| id: number; | ||
| name: string; | ||
| age: number; | ||
| isSubscribed: boolean; | ||
| }; | ||
| type ObjectCustomer = { | ||
| [key: string]: Omit<Customer, 'id'>; | ||
| }; | ||
| export const transformCustomers = (customers: Array<Customer>): ObjectCustomer => { | ||
| return customers.reduce((acc: ObjectCustomer, customer: Customer) => { | ||
| acc[customer.id] = { name: customer.name, age: customer.age, isSubscribed: customer.isSubscribed }; | ||
| return acc; | ||
| }, {}); | ||
| }; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,41 @@ | ||
| /** | ||
| * Здесь код с ошибками типов. Нужно их устранить | ||
| * */ | ||
| // Мы это не проходили, но по тексту ошибки можно понять, как это починить | ||
| export const getFakeApi = async (): Promise<void> => { | ||
| const result = await fetch('https://jsonplaceholder.typicode.com/todos/1').then((response) => response.json()); | ||
| console.log(result); | ||
| }; | ||
|
|
||
| // // Мы это не проходили, но по тексту ошибки можно понять, как это починить | ||
| // export const getFakeApi = async (): void => { | ||
| // const result = await fetch('https://jsonplaceholder.typicode.com/todos/1').then((response) => response.json()); | ||
| // console.log(result); | ||
| // }; | ||
| // | ||
| // // Мы это не проходили, но по тексту ошибки можно понять, как это починить | ||
| // export class SomeClass { | ||
| // constructor() { | ||
| // this.set = new Set([1]); | ||
| // this.channel = new BroadcastChannel('test-broadcast-channel'); | ||
| // } | ||
| // } | ||
| // | ||
| // export type Data = { | ||
| // type: 'Money' | 'Percent'; | ||
| // value: DataValue; | ||
| // }; | ||
| // | ||
| // export type DataValue = Money | Percent; | ||
| // | ||
| // export type Money = { | ||
| // currency: string; | ||
| // amount: number; | ||
| // }; | ||
| // | ||
| // export type Percent = { | ||
| // percent: number; | ||
| // }; | ||
| // | ||
| // // Здесь, возможно, нужно использовать as, возможно в switch передавать немного по-другому | ||
| // const getDataAmount = (data: Data): number => { | ||
| // switch (data.type) { | ||
| // case 'Money': | ||
| // return data.value.amount; | ||
| // | ||
| // default: { | ||
| // // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| // const unhandled: never = data; // здесь, возможно, нужно использовать нечто другое. :never должен остаться | ||
| // throw new Error(`unknown type: ${data.type}`); | ||
| // } | ||
| // } | ||
| // }; | ||
| // Мы это не проходили, но по тексту ошибки можно понять, как это починить | ||
| export class SomeClass { | ||
| set; | ||
| channel; | ||
| constructor() { | ||
| this.set = new Set([1]); | ||
| this.channel = new BroadcastChannel('test-broadcast-channel'); | ||
| } | ||
| } | ||
|
|
||
| export type Data = { | ||
| type: 'Money' | 'Percent'; | ||
| value: DataValue; | ||
| }; | ||
|
|
||
| export type DataValue = Money | Percent; | ||
| export type Money = { currency: string; amount: number }; | ||
|
|
||
| export type Percent = { | ||
| percent: number; | ||
| }; | ||
|
|
||
| // Здесь, возможно, нужно использовать as, возможно в switch передавать немного по-другому | ||
| const getDataAmount = (data: Data): number => { | ||
| switch (data.type) { | ||
| case 'Money': | ||
| return (data.value as Money).amount; | ||
|
|
||
| default: { | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| const unhandled: never = data as never; // здесь, возможно, нужно использовать нечто другое. :never должен остаться | ||
| throw new Error(`unknown type: ${data.type}`); | ||
| } | ||
| } | ||
| }; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,28 @@ | ||
| // Этот блок кода удалить и раскомментировать код ниже | ||
| it('remove it', () => { | ||
| expect(true).toBe(true); | ||
| import { createRandomOperation, createRandomProduct } from './3_write'; | ||
| describe('all', () => { | ||
| it('operation', () => { | ||
| const createdAt = '2023-06-06T12:06:56.957Z'; | ||
| const operation = createRandomOperation(createdAt); | ||
| expect(operation).toHaveProperty('createdAt', createdAt); | ||
| expect(operation).toHaveProperty('id'); | ||
| expect(operation).toHaveProperty('name'); | ||
| expect(operation).toHaveProperty('desc'); | ||
| expect(operation).toHaveProperty('createdAt'); | ||
| expect(operation).toHaveProperty('amount'); | ||
| expect(operation).toHaveProperty('category'); | ||
| expect(operation).toHaveProperty('type'); | ||
| }); | ||
| it('product', () => { | ||
| const createdAt = '2023-06-06T12:06:56.957Z'; | ||
| const product = createRandomProduct(createdAt); | ||
| expect(product).toHaveProperty('createdAt', createdAt); | ||
| expect(product).toHaveProperty('id'); | ||
| expect(product).toHaveProperty('name'); | ||
| expect(product).toHaveProperty('photo'); | ||
| expect(product).toHaveProperty('desc'); | ||
| expect(product).toHaveProperty('createdAt'); | ||
| expect(product).toHaveProperty('oldPrice'); | ||
| expect(product).toHaveProperty('price'); | ||
| expect(product).toHaveProperty('category'); | ||
| }); | ||
| }); | ||
|
|
||
| // import { createRandomOperation, createRandomProduct } from './3_write'; | ||
| // | ||
| // describe('all', () => { | ||
| // it('operation', () => { | ||
| // const createdAt = '2023-06-06T12:06:56.957Z'; | ||
| // const operation = createRandomOperation(createdAt); | ||
| // expect(operation).toHaveProperty('createdAt', createdAt); | ||
| // expect(operation).toHaveProperty('id'); | ||
| // expect(operation).toHaveProperty('name'); | ||
| // expect(operation).toHaveProperty('desc'); | ||
| // expect(operation).toHaveProperty('createdAt'); | ||
| // expect(operation).toHaveProperty('amount'); | ||
| // expect(operation).toHaveProperty('category'); | ||
| // expect(operation).toHaveProperty('type'); | ||
| // }); | ||
| // | ||
| // it('product', () => { | ||
| // const createdAt = '2023-06-06T12:06:56.957Z'; | ||
| // const product = createRandomProduct(createdAt); | ||
| // expect(product).toHaveProperty('createdAt', createdAt); | ||
| // expect(product).toHaveProperty('id'); | ||
| // expect(product).toHaveProperty('name'); | ||
| // expect(product).toHaveProperty('photo'); | ||
| // expect(product).toHaveProperty('desc'); | ||
| // expect(product).toHaveProperty('createdAt'); | ||
| // expect(product).toHaveProperty('oldPrice'); | ||
| // expect(product).toHaveProperty('price'); | ||
| // expect(product).toHaveProperty('category'); | ||
| // }); | ||
| // }); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
undefined по логике не совсем ясно. number тоже имеет метод toString