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
2 changes: 1 addition & 1 deletion lessons/module2/1_TypescriptPart2/homework/easy1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Нужно заменить FIXME на тип который вычисляется на освове OrderState

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type FIXME = any;
type FIXME = Array<Exclude<OrderState, "producing" | "buyingSupplies">>;

const orderStates = [
"initial",
Expand Down
2 changes: 1 addition & 1 deletion lessons/module2/1_TypescriptPart2/homework/easy2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Нужно заменить FIXME на тип который достанет из Order все возможные состояния (state)

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type FIXME = any;
type FIXME = Order["state"];

type Order =
| {
Expand Down
10 changes: 8 additions & 2 deletions lessons/module2/1_TypescriptPart2/homework/easy3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
// Нужно заменить FIXME на соответствующий тип

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type FIXME = any;
type FIXME<T extends Record<any, any>, K extends keyof T> = Pick<
T,
Exclude<keyof T, K>
>;

//или второе решение
type FIXME2<T extends Record<any, any>, K extends keyof T> = Omit<T, K>;

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const omit = <T extends Record<any, any>, K extends keyof T>(
obj: T,
keyToOmit: K
): FIXME => {
): FIXME2<T, K> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { [keyToOmit]: _, ...withoutKey } = obj;
return withoutKey;
Expand Down
78 changes: 46 additions & 32 deletions lessons/module2/1_TypescriptPart2/homework/medium1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,53 @@
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type FIXME = any;

type InitialOrder = {
Copy link
Collaborator

Choose a reason for hiding this comment

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

тут можно вот так

type FIXME = Extract<Order, { state: "initial" | "inWork" }>;

state: "initial";
sum: number;
};

type InWorkOrder = {
state: "inWork";
sum: number;
workerId: number;
};

type BuyingSuppliesOrder = {
state: "buyingSupplies";
sum: number;
workerId: number;
suppliesSum: number;
};

type ProducingOrder = {
state: "producing";
sum: number;
workerId: number;
suppliesSum: number;
produceEstimate: Date;
};

type FullfilledOrder = {
state: "fullfilled";
sum: number;
workerId: number;
suppliesSum: number;
produceEstimate: Date;
fullfillmentDate: Date;
};

type Order =
| {
state: "initial";
sum: number;
}
| {
state: "inWork";
sum: number;
workerId: number;
}
| {
state: "buyingSupplies";
sum: number;
workerId: number;
suppliesSum: number;
}
| {
state: "producing";
sum: number;
workerId: number;
suppliesSum: number;
produceEstimate: Date;
}
| {
state: "fullfilled";
sum: number;
workerId: number;
suppliesSum: number;
produceEstimate: Date;
fullfillmentDate: Date;
};

export const filterOnlyInitialAndInWorkOrder = (order: Order): FIXME => {
| InitialOrder
| InWorkOrder
| BuyingSuppliesOrder
| ProducingOrder
| FullfilledOrder;

type InitialOrInWorkOrder = InitialOrder | InWorkOrder;

export const filterOnlyInitialAndInWorkOrder = (
order: Order
): InitialOrInWorkOrder | null => {
if (order.state === "initial" || order.state === "inWork") {
return order;
}
Expand Down