Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 0 additions & 65 deletions src/homeworks/ts1/1_base.js

This file was deleted.

45 changes: 20 additions & 25 deletions src/homeworks/ts1/1_base.test.js
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 },
});
});
});
91 changes: 91 additions & 0 deletions src/homeworks/ts1/1_base.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/**
* Нужно превратить файл в ts и указать типы аргументов и типы возвращаемого значения
* */
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, separator = ' '): string =>
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+)?)\)/;

//Пробую через type
type Point = {
x: number;
y: number;
};

export const getTransformFromCss = (transformCssString: string): Point => {
const data = transformCssString.match(transformRegexp);
if (!data) return { x: 0, y: 0 };
return {
x: parseInt(data[6], 10),
y: parseInt(data[8], 10),
};
};

//Пробую через interface
interface RgbColor {
red: number;
green: number;
blue: number;
}

export const getColorContrastValue = (color: RgbColor): number =>
// http://www.w3.org/TR/AERT#color-contrast
Math.round((color.red * 299 + color.green * 587 + color.blue * 114) / 1000);

type BlackOrWhite = 'black' | 'white';
export const getContrastType = (contrastValue: number): BlackOrWhite => (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) => {
if (!longColorRegExp.test(color) && !shortColorRegExp.test(color)) throw new Error(`invalid hex color: ${color}`);
};

export const hex2rgb = (color: string) => {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тип возвращаемого значения

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];
};

type ValueNumber = {
value: number;
number: number;
};
export const getNumberedArray = (arr: number[]): ValueNumber[] => arr.map((value, number) => ({ value, number }));
export const toStringArray = (arr: ValueNumber[]): string[] => arr.map(({ value, number }) => `${value}_${number}`);

interface Person {
name: string;
age: number;
isSubscribed: boolean;
}
interface Customer extends Person {
id: string;
}
export const transformCustomers = (customers: Customer[]): Record<string, Person> => {
return customers.reduce((acc, customer) => {
acc[customer.id] = { name: customer.name, age: customer.age, isSubscribed: customer.isSubscribed };
return acc;
}, {} as Record<string, Person>);
};
95 changes: 52 additions & 43 deletions src/homeworks/ts1/2_repair.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,55 @@
* Здесь код с ошибками типов. Нужно их устранить
* */

// // Мы это не проходили, но по тексту ошибки можно понять, как это починить
// 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 const getFakeApi = async (): Promise<void> => {
const result = await fetch('https://jsonplaceholder.typicode.com/todos/1').then((response) => response.json());
console.log(result);
};

// Мы это не проходили, но по тексту ошибки можно понять, как это починить
export class SomeClass {
set: Set<number>;
channel: BroadcastChannel;
constructor() {
this.set = new Set([1]);
this.channel = new BroadcastChannel('test-broadcast-channel');
}
}

export enum DataType {
Money,
Percent,
}

export type Data = {
type: DataType;
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 DataType.Money:
return (data.value as Money).amount;
case DataType.Percent:
return (data.value as Percent).percent;

default: {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// const unhandled: never = data; // здесь, возможно, нужно использовать нечто другое. :never должен остаться
throw new Error(`unknown type: ${data.type}`);
}
}
};
63 changes: 29 additions & 34 deletions src/homeworks/ts1/3_write.test.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
// Этот блок кода удалить и раскомментировать код ниже
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');
});

// 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');
// });
// });
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');
});
});
Loading