Wroclaw/WorkshopTasker
2
1
Fork 1
Code Issues Pull requests Activity Actions

Don't import Decimal from internal libraries

Browse source 
This was causing the project build to not work properly.
This commit is contained in:
Wroclaw 2023-11-09 04:34:25 +01:00
parent 95137acbed
commit 5602c22861
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/api/orders/[id]/work.post.ts
View file

@ -1,5 +1,5 @@
import { defineEventHandler, readBody, setResponseStatus } from "h3"; import { defineEventHandler, readBody, setResponseStatus } from "h3";
import { Decimal } from "@prisma/client/runtime/library"; import { Prisma } from "@prisma/client";
import { checkIsWork } from "../../orders.post"; import { checkIsWork } from "../../orders.post";
import { orderExists } from "../[id].get"; import { orderExists } from "../[id].get";
@ -24,7 +24,7 @@ export default defineEventHandler(async (e) => {
notes: body.notes, notes: body.notes,
offerId: BigInt(body.offerId), offerId: BigInt(body.offerId),
orderId: BigInt(body.orderId), orderId: BigInt(body.orderId),
price: new Decimal(body.price), price: new Prisma.Decimal(body.price),
}, },
}); });

6
server/utils/prismaToWeb.ts
View file

@ -1,4 +1,4 @@
import { Decimal } from "@prisma/client/runtime/library"; import { Prisma } from "@prisma/client";
type func = (...args: any[]) => any | Function; type func = (...args: any[]) => any | Function;
@ -8,7 +8,7 @@ export type replaceJsonUnparsableToString<T> =
[K in keyof T]: [K in keyof T]:
T[K] extends null ? null T[K] extends null ? null
: T[K] extends func ? never : T[K] extends func ? never
: T[K] extends Decimal ? `${number}` : T[K] extends Prisma.Decimal ? `${number}`
: T[K] extends Array<infer E> ? Array<replaceJsonUnparsableToString<E>> : T[K] extends Array<infer E> ? Array<replaceJsonUnparsableToString<E>>
: T[K] extends object ? replaceJsonUnparsableToString<T[K]> : T[K] extends object ? replaceJsonUnparsableToString<T[K]>
: T[K] extends bigint ? `${bigint}` : T[K] extends bigint ? `${bigint}`
@ -34,7 +34,7 @@ export function prismaToWeb<T>(ivalue: T): replaceJsonUnparsableToString<T> {
const current = ivalue[i]; const current = ivalue[i];
if (current === null) rvalue[i] = null; if (current === null) rvalue[i] = null;
else if (typeof current === 'function') continue; else if (typeof current === 'function') continue;
else if (current instanceof Decimal) rvalue[i] = current.toString(); else if (current instanceof Prisma.Decimal) rvalue[i] = current.toString();
else if (current instanceof Array) rvalue[i] = arrayPrismaToWeb(current); else if (current instanceof Array) rvalue[i] = arrayPrismaToWeb(current);
else if (typeof current === 'object') rvalue[i] = prismaToWeb(current); else if (typeof current === 'object') rvalue[i] = prismaToWeb(current);
else if (typeof current === 'bigint') rvalue[i] = current.toString(); else if (typeof current === 'bigint') rvalue[i] = current.toString();