From 1204136deca27f7363287151a589d988f7e6cf41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=BChnlein?= Date: Tue, 23 Jan 2024 11:17:42 +0100 Subject: [PATCH 01/13] chore: handle cancellations --- app/temporal/src/workflows/importer.workflow.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/temporal/src/workflows/importer.workflow.ts b/app/temporal/src/workflows/importer.workflow.ts index d455be9..ec7252f 100644 --- a/app/temporal/src/workflows/importer.workflow.ts +++ b/app/temporal/src/workflows/importer.workflow.ts @@ -1,9 +1,11 @@ import { ApplicationFailure, + CancellationScope, condition, defineQuery, defineSignal, defineUpdate, + isCancellation, proxyActivities, setHandler, } from "@temporalio/workflow"; @@ -172,10 +174,17 @@ export async function importer(params: ImporterWorkflowParams) { ); } } catch (err) { - for (const compensation of compensations) { - await compensation(); + const doCompensations = async () => { + for (const compensation of compensations) { + await compensation(); + } + }; + if (isCancellation(err)) { + await CancellationScope.nonCancellable(() => doCompensations()); + } else { + await doCompensations(); } - throw err; + throw err; // <-- Fail the workflow } finally { await acts.deleteBucket({ bucket: sourceFile!.bucket }); } From 1d38e21ba5a73682b85ab3a7fa2fca4e788a50b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=BChnlein?= Date: Tue, 23 Jan 2024 17:09:15 +0100 Subject: [PATCH 02/13] feat: add hooks and empty response apis --- .../app/api/importer/[slug]/ImporterDto.ts | 31 +++++++++++++ .../app/api/importer/[slug]/patches/route.ts | 14 ++++++ .../api/importer/[slug]/source-data/route.ts | 22 +++++++++ .../api/importer/[slug]/validations/route.ts | 22 +++++++++ .../app/importer/[id]/validate/Validation.tsx | 38 ++++++++++++++- .../[id]/validate/ValidationTable.tsx | 2 + app/src/app/importer/[id]/validate/page.tsx | 46 +++++++++++++++++-- app/src/components/hooks/useGetPatches.tsx | 22 +++++++++ app/src/components/hooks/useGetSourceData.tsx | 20 ++++++++ .../components/hooks/useGetValidations.tsx | 22 +++++++++ app/src/lib/minioClient.ts | 12 +++++ app/temporal/src/domain/DataSet.ts | 7 ++- .../src/workflows/importer.workflow.ts | 8 ++++ 13 files changed, 258 insertions(+), 8 deletions(-) create mode 100644 app/src/app/api/importer/[slug]/patches/route.ts create mode 100644 app/src/app/api/importer/[slug]/source-data/route.ts create mode 100644 app/src/app/api/importer/[slug]/validations/route.ts create mode 100644 app/src/components/hooks/useGetPatches.tsx create mode 100644 app/src/components/hooks/useGetSourceData.tsx create mode 100644 app/src/components/hooks/useGetValidations.tsx create mode 100644 app/src/lib/minioClient.ts diff --git a/app/src/app/api/importer/[slug]/ImporterDto.ts b/app/src/app/api/importer/[slug]/ImporterDto.ts index 4d974e4..832f829 100644 --- a/app/src/app/api/importer/[slug]/ImporterDto.ts +++ b/app/src/app/api/importer/[slug]/ImporterDto.ts @@ -29,6 +29,13 @@ export interface ImporterStatus { isImporting: boolean; dataMappingRecommendations: DataMappingRecommendation[] | null; dataMapping: DataMapping[] | null; + + sourceData: { + bucket: string; + file: string; + } | null; + + validations: { bucket: string; file: string } | null; } export interface DataMappingRecommendation { @@ -51,3 +58,27 @@ export interface DataMapping { targetColumn: string | null; sourceColumn: string; } + +export interface DataSetPatch { + rowId: number; + /** + * target column + */ + column: string; + newValue: string | number | null; +} + +export interface DataValidation { + rowId: number; + column: string; + errors: ValidationError[]; +} + +export interface ValidationError { + type: "required" | "unique"; + message: string; +} + +export type SourceData = { + rowId: number; +} & Record; diff --git a/app/src/app/api/importer/[slug]/patches/route.ts b/app/src/app/api/importer/[slug]/patches/route.ts new file mode 100644 index 0000000..26194c1 --- /dev/null +++ b/app/src/app/api/importer/[slug]/patches/route.ts @@ -0,0 +1,14 @@ +import { getTemporalWorkflowClient } from "@/lib/temporalClient"; +import { NextRequest, NextResponse } from "next/server"; +import { DataSetPatch } from "../ImporterDto"; + +export async function GET( + _req: NextRequest, + { params }: { params: { slug: string } } +) { + const { slug: importerId } = params; + const client = getTemporalWorkflowClient(); + const handle = client.getHandle(importerId); + const result = await handle.query("importer:patches"); + return NextResponse.json(result); +} diff --git a/app/src/app/api/importer/[slug]/source-data/route.ts b/app/src/app/api/importer/[slug]/source-data/route.ts new file mode 100644 index 0000000..7012ba0 --- /dev/null +++ b/app/src/app/api/importer/[slug]/source-data/route.ts @@ -0,0 +1,22 @@ +import { getTemporalWorkflowClient } from "@/lib/temporalClient"; +import { NextRequest, NextResponse } from "next/server"; +import { ImporterStatus } from "../ImporterDto"; + +export async function GET( + _req: NextRequest, + { params }: { params: { slug: string } } +) { + const { slug: importerId } = params; + const client = getTemporalWorkflowClient(); + const handle = client.getHandle(importerId); + const result = await handle.query("importer:status"); + // if (!result.sourceData) { + // return new NextResponse(undefined, { status: 404 }); + // } + // const stream = await minioClient.getObject( + // result.sourceData.bucket, + // result.sourceData.file + // ); + // return stream; + return NextResponse.json([]); +} diff --git a/app/src/app/api/importer/[slug]/validations/route.ts b/app/src/app/api/importer/[slug]/validations/route.ts new file mode 100644 index 0000000..0c6ea75 --- /dev/null +++ b/app/src/app/api/importer/[slug]/validations/route.ts @@ -0,0 +1,22 @@ +import { getTemporalWorkflowClient } from "@/lib/temporalClient"; +import { NextRequest, NextResponse } from "next/server"; +import { ImporterStatus } from "../ImporterDto"; + +export async function GET( + _req: NextRequest, + { params }: { params: { slug: string } } +) { + const { slug: importerId } = params; + const client = getTemporalWorkflowClient(); + const handle = client.getHandle(importerId); + const result = await handle.query("importer:status"); + // if (!result.validations) { + // return new NextResponse(undefined, { status: 404 }); + // } + // const stream = await minioClient.getObject( + // result.validations.bucket, + // result.validations.file + // ); + // return stream; + return NextResponse.json([]); +} diff --git a/app/src/app/importer/[id]/validate/Validation.tsx b/app/src/app/importer/[id]/validate/Validation.tsx index 7ea6e3d..efa860a 100644 --- a/app/src/app/importer/[id]/validate/Validation.tsx +++ b/app/src/app/importer/[id]/validate/Validation.tsx @@ -1,13 +1,47 @@ -import { ImporterDto } from "@/app/api/importer/[slug]/ImporterDto"; +"use client"; +import { + DataSetPatch, + DataValidation, + ImporterDto, + SourceData, +} from "@/app/api/importer/[slug]/ImporterDto"; +import { useGetImporter } from "@/components/hooks/useGetImporter"; +import { useGetPatches } from "@/components/hooks/useGetPatches"; +import { useGetSourceData } from "@/components/hooks/useGetSourceData"; +import { useGetValidations } from "@/components/hooks/useGetValidations"; import { Button } from "@/components/ui/button"; import { ChevronRightCircleIcon } from "lucide-react"; import ValidationTable from "./ValidationTable"; type Props = { initialImporterDto: ImporterDto; + initialSourceData: SourceData[]; + initialPatches: DataSetPatch[]; + initialValidation: DataValidation[]; }; -const Validation = ({ initialImporterDto }: Props) => { +const Validation = ({ + initialImporterDto, + initialSourceData, + initialPatches, + initialValidation, +}: Props) => { + const { importer } = useGetImporter( + initialImporterDto.importerId, + undefined, + initialImporterDto + ); + const { data: sourceData } = useGetSourceData(initialImporterDto.importerId); + const { patches } = useGetPatches( + initialImporterDto.importerId, + undefined, + initialPatches + ); + const { validations } = useGetValidations( + initialImporterDto.importerId, + undefined, + initialValidation + ); return (

Validate your data

diff --git a/app/src/app/importer/[id]/validate/ValidationTable.tsx b/app/src/app/importer/[id]/validate/ValidationTable.tsx index 2c406db..ade5ab4 100644 --- a/app/src/app/importer/[id]/validate/ValidationTable.tsx +++ b/app/src/app/importer/[id]/validate/ValidationTable.tsx @@ -19,6 +19,8 @@ import { useVirtualizer } from "@tanstack/react-virtual"; import React from "react"; import { makeData } from "./makeData"; +// TODO get patches and source data + type Props = { importerDto: ImporterDto; }; diff --git a/app/src/app/importer/[id]/validate/page.tsx b/app/src/app/importer/[id]/validate/page.tsx index 4c3692e..e71df1b 100644 --- a/app/src/app/importer/[id]/validate/page.tsx +++ b/app/src/app/importer/[id]/validate/page.tsx @@ -1,18 +1,56 @@ -import { ImporterDto } from "@/app/api/importer/[slug]/ImporterDto"; +import { + DataSetPatch, + DataValidation, + ImporterDto, + SourceData, +} from "@/app/api/importer/[slug]/ImporterDto"; import { getHost } from "@/lib/utils"; import Validation from "./Validation"; export default async function page(props: { params: { id: string } }) { const importerId = props.params.id; - const initialImporterDto = (await fetch( + const initialImporterDtoPromise = fetch( `${getHost()}/api/importer/${importerId}`, { cache: "no-cache", } - ).then((res) => res.json())) as ImporterDto; + ).then((res) => res.json() as Promise); + const initialPatchesPromise = fetch( + `${getHost()}/api/importer/${importerId}/patches`, + { + cache: "no-cache", + } + ).then((res) => res.json() as Promise); + const initialValidationPromise = fetch( + `${getHost()}/api/importer/${importerId}/validations`, + { + cache: "no-cache", + } + ).then((res) => res.json() as Promise); + const initialSourceDataPromise = fetch( + //! cached + `${getHost()}/api/importer/${importerId}/source-data` + ).then((res) => res.json() as Promise); + const [ + initialImporterDto, + initialPatches, + initialValidation, + initialSourceData, + ] = await Promise.all([ + initialImporterDtoPromise, + initialPatchesPromise, + initialValidationPromise, + initialSourceDataPromise, + ]); + return (
- +
); } diff --git a/app/src/components/hooks/useGetPatches.tsx b/app/src/components/hooks/useGetPatches.tsx new file mode 100644 index 0000000..8c333bc --- /dev/null +++ b/app/src/components/hooks/useGetPatches.tsx @@ -0,0 +1,22 @@ +import { DataSetPatch } from "@/app/api/importer/[slug]/ImporterDto"; +import useSWR from "swr"; + +export function useGetPatches( + importerId: string | null, + pollInterval?: number, + fallbackData?: DataSetPatch[] +) { + const { data, error, isLoading } = useSWR( + importerId ? [`/api/importer/${importerId}/patches`] : null, + ([url]) => fetch(url).then((res) => res.json()), + { + refreshInterval: pollInterval, + fallbackData, + } + ); + return { + patches: data as DataSetPatch[], + error, + isLoading, + }; +} diff --git a/app/src/components/hooks/useGetSourceData.tsx b/app/src/components/hooks/useGetSourceData.tsx new file mode 100644 index 0000000..14291ef --- /dev/null +++ b/app/src/components/hooks/useGetSourceData.tsx @@ -0,0 +1,20 @@ +import { SourceData } from "@/app/api/importer/[slug]/ImporterDto"; +import useSWR from "swr"; + +export function useGetSourceData( + importerId: string | null, + fallbackData?: SourceData[] +) { + const { data, error, isLoading } = useSWR( + importerId ? [`/api/importer/${importerId}/validations`] : null, + ([url]) => fetch(url).then((res) => res.json()), + { + fallbackData, + } + ); + return { + data: data as SourceData[], + error, + isLoading, + }; +} diff --git a/app/src/components/hooks/useGetValidations.tsx b/app/src/components/hooks/useGetValidations.tsx new file mode 100644 index 0000000..218db4f --- /dev/null +++ b/app/src/components/hooks/useGetValidations.tsx @@ -0,0 +1,22 @@ +import { DataValidation } from "@/app/api/importer/[slug]/ImporterDto"; +import useSWR from "swr"; + +export function useGetValidations( + importerId: string | null, + pollInterval?: number, + fallbackData?: DataValidation[] +) { + const { data, error, isLoading } = useSWR( + importerId ? [`/api/importer/${importerId}/validations`] : null, + ([url]) => fetch(url).then((res) => res.json()), + { + refreshInterval: pollInterval, + fallbackData, + } + ); + return { + validations: data as DataValidation[], + error, + isLoading, + }; +} diff --git a/app/src/lib/minioClient.ts b/app/src/lib/minioClient.ts new file mode 100644 index 0000000..99aae3a --- /dev/null +++ b/app/src/lib/minioClient.ts @@ -0,0 +1,12 @@ +import env from "env-var"; +import * as Minio from "minio"; + +const minioClient = new Minio.Client({ + endPoint: env.get("MINIO_HOST").required().asString(), + port: 9000, + useSSL: false, + accessKey: env.get("MINIO_ACCESS_KEY").required().asString(), + secretKey: env.get("MINIO_SECRET_KEY").required().asString(), +}); + +export default minioClient; diff --git a/app/temporal/src/domain/DataSet.ts b/app/temporal/src/domain/DataSet.ts index 1263d07..c72c666 100644 --- a/app/temporal/src/domain/DataSet.ts +++ b/app/temporal/src/domain/DataSet.ts @@ -1,5 +1,8 @@ export interface DataSetPatch { - row: number; - col: number; + rowId: number; + /** + * target column + */ + column: string; newValue: string | number | null; } diff --git a/app/temporal/src/workflows/importer.workflow.ts b/app/temporal/src/workflows/importer.workflow.ts index ec7252f..c49e7a5 100644 --- a/app/temporal/src/workflows/importer.workflow.ts +++ b/app/temporal/src/workflows/importer.workflow.ts @@ -37,6 +37,8 @@ export interface ImporterStatus { isWaitingForImport: boolean; isImporting: boolean; dataMappingRecommendations: DataMappingRecommendation[] | null; + sourceData: { bucket: string; file: string } | null; + validations: { bucket: string; file: string } | null; } export interface Mapping { @@ -68,6 +70,7 @@ const mappingUpdate = defineUpdate< } ] >("importer:update-mapping"); +const importPatchesQuery = defineQuery("importer:patches"); const acts = proxyActivities>({ startToCloseTimeout: "5 minute", @@ -134,8 +137,13 @@ export async function importer(params: ImporterWorkflowParams) { isImporting: importStartRequested === true, dataMappingRecommendations, dataMapping: configuredMappings, + sourceData: null, // TODO return merged and mapped source data {bucket,file} + validations: null, // TODO return current validations {bucket,file} }; }); + setHandler(importPatchesQuery, () => { + return patches; + }); try { const hasSourceFile = await condition( From 43e470760b75d758903e784efc4edecfed385800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=BChnlein?= Date: Wed, 24 Jan 2024 08:07:38 +0100 Subject: [PATCH 03/13] fix: update mapping api handler --- app/src/app/api/importer/[slug]/mappings/route.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/app/api/importer/[slug]/mappings/route.ts b/app/src/app/api/importer/[slug]/mappings/route.ts index 6bfc3db..896ce36 100644 --- a/app/src/app/api/importer/[slug]/mappings/route.ts +++ b/app/src/app/api/importer/[slug]/mappings/route.ts @@ -1,15 +1,14 @@ import { getTemporalWorkflowClient } from "@/lib/temporalClient"; import { NextRequest, NextResponse } from "next/server"; -import { DataMapping } from "../ImporterDto"; export async function PUT( - _req: NextRequest, - { params, body }: { params: { slug: string }; body: DataMapping[] } + req: NextRequest, + { params }: { params: { slug: string } } ) { const { slug: importerId } = params; const client = getTemporalWorkflowClient(); const handle = client.getHandle(importerId); - const mappings = body; + const mappings = await req.json(); await handle.executeUpdate("importer:update-mapping", { args: [{ mappings }], }); From ff9bf8ca6ade755b3707e73ba33ba3b51a196ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=BChnlein?= Date: Wed, 24 Jan 2024 09:38:35 +0100 Subject: [PATCH 04/13] chore: re-add await for mappings --- app/temporal/src/workflows/importer.workflow.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/temporal/src/workflows/importer.workflow.ts b/app/temporal/src/workflows/importer.workflow.ts index 1836fac..62c3d3c 100644 --- a/app/temporal/src/workflows/importer.workflow.ts +++ b/app/temporal/src/workflows/importer.workflow.ts @@ -177,7 +177,7 @@ export async function importer(params: ImporterWorkflowParams) { columnConfig: params.columnConfig, }); - // await condition(() => configuredMappings !== null, startImportTimeout); + await condition(() => configuredMappings !== null, startImportTimeout); const chunkedFileReferences = await acts.applyMappings({ bucket: sourceFile!.bucket, From c7b325ffb5c776bcf8a9691dc5b6062e79a4aa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=BChnlein?= Date: Wed, 24 Jan 2024 14:10:26 +0100 Subject: [PATCH 05/13] feat: get data from backend --- app/package-lock.json | 400 ++++++++++-------- .../app/api/importer/[slug]/ImporterDto.ts | 4 +- .../api/importer/[slug]/source-data/route.ts | 33 +- .../api/importer/[slug]/validations/route.ts | 30 +- .../importer/[id]/mapping/ShowMappings.tsx | 15 +- .../app/importer/[id]/validate/Validation.tsx | 13 +- .../[id]/validate/ValidationTable.tsx | 18 +- app/src/app/importer/[id]/validate/page.tsx | 6 +- app/src/components/hooks/useGetSourceData.tsx | 2 +- .../src/workflows/importer.workflow.ts | 49 ++- 10 files changed, 356 insertions(+), 214 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 7dd57de..52ec471 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -66,6 +66,7 @@ }, "node_modules/@alloc/quick-lru": { "version": "5.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -875,6 +876,7 @@ }, "node_modules/@isaacs/cliui": { "version": "8.0.2", + "dev": true, "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -890,6 +892,7 @@ }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { "version": "6.0.1", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -900,6 +903,7 @@ }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { "version": "7.1.0", + "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -1393,10 +1397,131 @@ "node": ">= 10" } }, + "node_modules/@next/swc-darwin-x64": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz", + "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz", + "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz", + "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz", + "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz", + "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz", + "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz", + "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz", + "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -1409,6 +1534,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, "engines": { "node": ">= 8" } @@ -1417,6 +1543,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -1429,6 +1556,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, "optional": true, "engines": { "node": ">=14" @@ -2401,13 +2529,13 @@ "version": "15.7.11", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==", - "devOptional": true + "dev": true }, "node_modules/@types/react": { "version": "18.2.48", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz", "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==", - "devOptional": true, + "dev": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2418,7 +2546,7 @@ "version": "18.2.18", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz", "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==", - "devOptional": true, + "dev": true, "dependencies": { "@types/react": "*" } @@ -2427,7 +2555,7 @@ "version": "0.16.8", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "devOptional": true + "dev": true }, "node_modules/@types/stack-utils": { "version": "2.0.3", @@ -2858,12 +2986,14 @@ "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -3238,12 +3368,14 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, "engines": { "node": ">=8" } @@ -3270,6 +3402,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -3393,6 +3526,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "dev": true, "engines": { "node": ">= 6" } @@ -3465,6 +3599,7 @@ "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, "funding": [ { "type": "individual", @@ -3491,6 +3626,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -3650,6 +3786,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true, "engines": { "node": ">= 6" } @@ -3702,6 +3839,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3715,6 +3853,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, "bin": { "cssesc": "bin/cssesc" }, @@ -3726,7 +3865,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "devOptional": true + "dev": true }, "node_modules/csv": { "version": "6.3.6", @@ -3873,7 +4012,8 @@ "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true }, "node_modules/diff-sequences": { "version": "29.6.3", @@ -3899,7 +4039,8 @@ "node_modules/dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true }, "node_modules/doctrine": { "version": "3.0.0", @@ -3927,7 +4068,8 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true }, "node_modules/electron-to-chromium": { "version": "1.4.639", @@ -3949,7 +4091,8 @@ "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "node_modules/enhanced-resolve": { "version": "5.15.0", @@ -4616,15 +4759,11 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, - "node_modules/fast-diff": { - "version": "1.3.0", - "license": "Apache-2.0", - "peer": true - }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -4640,6 +4779,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -4683,6 +4823,7 @@ "version": "1.16.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", + "dev": true, "dependencies": { "reusify": "^1.0.4" } @@ -4712,6 +4853,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -4775,6 +4917,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -4822,6 +4965,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -4966,6 +5110,7 @@ "version": "10.3.10", "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.5", @@ -4987,6 +5132,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -5003,6 +5149,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -5011,6 +5158,7 @@ "version": "9.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -5395,6 +5543,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -5433,6 +5582,7 @@ "version": "2.13.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, "dependencies": { "hasown": "^2.0.0" }, @@ -5459,6 +5609,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5510,6 +5661,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -5542,6 +5694,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -5706,7 +5859,8 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", @@ -5800,6 +5954,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -6515,6 +6670,7 @@ "version": "1.21.0", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "dev": true, "bin": { "jiti": "bin/jiti.js" } @@ -6704,6 +6860,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "dev": true, "engines": { "node": ">=10" } @@ -6711,7 +6868,8 @@ "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true }, "node_modules/load-json-file": { "version": "4.0.0", @@ -6770,16 +6928,6 @@ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "license": "MIT", - "peer": true - }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "license": "MIT", - "peer": true - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -6812,6 +6960,7 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "dev": true, "engines": { "node": "14 || >=16.14" } @@ -6891,6 +7040,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, "engines": { "node": ">= 8" } @@ -6899,6 +7049,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -6984,6 +7135,7 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -6998,6 +7150,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -7210,6 +7363,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7402,6 +7556,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7410,6 +7565,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "dev": true, "engines": { "node": ">= 6" } @@ -7649,6 +7805,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -7656,12 +7813,14 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true }, "node_modules/path-scurry": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, "dependencies": { "lru-cache": "^9.1.1 || ^10.0.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -7691,6 +7850,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -7714,6 +7874,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7722,6 +7883,7 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, "engines": { "node": ">= 6" } @@ -7794,6 +7956,7 @@ "version": "8.4.33", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "dev": true, "funding": [ { "type": "opencollective", @@ -7821,6 +7984,7 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "dev": true, "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", @@ -7837,6 +8001,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "dev": true, "dependencies": { "camelcase-css": "^2.0.1" }, @@ -7855,6 +8020,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "dev": true, "funding": [ { "type": "opencollective", @@ -7889,6 +8055,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true, "engines": { "node": ">=14" } @@ -7897,6 +8064,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", + "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.11" }, @@ -7915,6 +8083,7 @@ "version": "6.0.15", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz", "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==", + "dev": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -7926,7 +8095,8 @@ "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true }, "node_modules/prelude-ls": { "version": "1.2.1", @@ -8078,6 +8248,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, "funding": [ { "type": "github", @@ -8093,19 +8264,6 @@ } ] }, - "node_modules/quill-delta": { - "version": "5.1.0", - "license": "MIT", - "peer": true, - "dependencies": { - "fast-diff": "^1.3.0", - "lodash.clonedeep": "^4.5.0", - "lodash.isequal": "^4.5.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -8214,6 +8372,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dev": true, "dependencies": { "pify": "^2.3.0" } @@ -8270,6 +8429,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -8331,6 +8491,7 @@ "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -8395,6 +8556,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -8439,6 +8601,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -8622,6 +8785,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -8633,6 +8797,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "engines": { "node": ">=8" } @@ -8664,6 +8829,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, "engines": { "node": ">=14" }, @@ -8874,6 +9040,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -8891,6 +9058,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -8903,12 +9071,14 @@ "node_modules/string-width-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/string-width/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, "engines": { "node": ">=12" }, @@ -8920,6 +9090,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -9028,6 +9199,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -9096,6 +9268,7 @@ "version": "3.35.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", @@ -9129,6 +9302,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -9173,6 +9347,7 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz", "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==", + "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -9320,6 +9495,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, "dependencies": { "any-promise": "^1.0.0" } @@ -9328,6 +9504,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, "dependencies": { "thenify": ">= 3.1.0 < 4" }, @@ -9373,6 +9550,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -9407,7 +9585,8 @@ "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "dev": true }, "node_modules/ts-jest": { "version": "29.1.1", @@ -9875,6 +10054,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -9980,6 +10160,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -9997,6 +10178,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -10012,12 +10194,14 @@ "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/wrap-ansi-cjs/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10031,6 +10215,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, "engines": { "node": ">=12" }, @@ -10042,6 +10227,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, "engines": { "node": ">=12" }, @@ -10053,6 +10239,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -10151,6 +10338,7 @@ "version": "2.3.4", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "dev": true, "engines": { "node": ">= 14" } @@ -10208,126 +10396,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/@next/swc-darwin-x64": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz", - "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz", - "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz", - "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz", - "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-x64-musl": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz", - "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz", - "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz", - "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz", - "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } } } } diff --git a/app/src/app/api/importer/[slug]/ImporterDto.ts b/app/src/app/api/importer/[slug]/ImporterDto.ts index 832f829..f7cbc60 100644 --- a/app/src/app/api/importer/[slug]/ImporterDto.ts +++ b/app/src/app/api/importer/[slug]/ImporterDto.ts @@ -32,10 +32,10 @@ export interface ImporterStatus { sourceData: { bucket: string; - file: string; + fileReference: string; } | null; - validations: { bucket: string; file: string } | null; + validations: { bucket: string; fileReference: string } | null; } export interface DataMappingRecommendation { diff --git a/app/src/app/api/importer/[slug]/source-data/route.ts b/app/src/app/api/importer/[slug]/source-data/route.ts index 7012ba0..72767bd 100644 --- a/app/src/app/api/importer/[slug]/source-data/route.ts +++ b/app/src/app/api/importer/[slug]/source-data/route.ts @@ -1,22 +1,35 @@ +import minioClient from "@/lib/minioClient"; import { getTemporalWorkflowClient } from "@/lib/temporalClient"; import { NextRequest, NextResponse } from "next/server"; import { ImporterStatus } from "../ImporterDto"; export async function GET( _req: NextRequest, - { params }: { params: { slug: string } } + { params }: { params: { slug: string } }, + res: NextResponse ) { const { slug: importerId } = params; const client = getTemporalWorkflowClient(); const handle = client.getHandle(importerId); const result = await handle.query("importer:status"); - // if (!result.sourceData) { - // return new NextResponse(undefined, { status: 404 }); - // } - // const stream = await minioClient.getObject( - // result.sourceData.bucket, - // result.sourceData.file - // ); - // return stream; - return NextResponse.json([]); + if (!result.sourceData) { + return new NextResponse(undefined, { status: 404 }); + } + const stream = await minioClient.getObject( + result.sourceData.bucket, + result.sourceData.fileReference + ); + // TODO find better to directly return stream... + const buffers = []; + // node.js readable streams implement the async iterator protocol + for await (const data of stream) { + buffers.push(data); + } + const fileAsBuffer = Buffer.concat(buffers); + return new Response(fileAsBuffer, { + status: 200, + headers: { + "Content-Type": "application/json", + }, + }); } diff --git a/app/src/app/api/importer/[slug]/validations/route.ts b/app/src/app/api/importer/[slug]/validations/route.ts index 0c6ea75..87f9f2a 100644 --- a/app/src/app/api/importer/[slug]/validations/route.ts +++ b/app/src/app/api/importer/[slug]/validations/route.ts @@ -1,3 +1,4 @@ +import minioClient from "@/lib/minioClient"; import { getTemporalWorkflowClient } from "@/lib/temporalClient"; import { NextRequest, NextResponse } from "next/server"; import { ImporterStatus } from "../ImporterDto"; @@ -10,13 +11,24 @@ export async function GET( const client = getTemporalWorkflowClient(); const handle = client.getHandle(importerId); const result = await handle.query("importer:status"); - // if (!result.validations) { - // return new NextResponse(undefined, { status: 404 }); - // } - // const stream = await minioClient.getObject( - // result.validations.bucket, - // result.validations.file - // ); - // return stream; - return NextResponse.json([]); + if (!result.validations) { + return new NextResponse("not found", { status: 404 }); + } + const stream = await minioClient.getObject( + result.validations.bucket, + result.validations.fileReference + ); + // TODO find better to directly return stream... + const buffers = []; + // node.js readable streams implement the async iterator protocol + for await (const data of stream) { + buffers.push(data); + } + const fileAsBuffer = Buffer.concat(buffers); + return new Response(fileAsBuffer, { + status: 200, + headers: { + "Content-Type": "application/json", + }, + }); } diff --git a/app/src/app/importer/[id]/mapping/ShowMappings.tsx b/app/src/app/importer/[id]/mapping/ShowMappings.tsx index 87c215c..1cbeb59 100644 --- a/app/src/app/importer/[id]/mapping/ShowMappings.tsx +++ b/app/src/app/importer/[id]/mapping/ShowMappings.tsx @@ -34,14 +34,27 @@ interface Mapping { const ShowMappings = ({ importerDto: initialImporterDto }: Props) => { const { push } = useRouter(); + const [enablePolling, setEnablePolling] = React.useState(false); const { importer } = useGetImporter( initialImporterDto.importerId, - undefined, + enablePolling ? 1000 : undefined, initialImporterDto ); const { status: { dataMappingRecommendations }, } = importer; + + React.useEffect(() => { + if ( + !dataMappingRecommendations || + dataMappingRecommendations.length === 0 + ) { + setEnablePolling(true); + } else { + setEnablePolling(false); + } + }, [dataMappingRecommendations]); + const [currentMappings, setCurrentMappings] = React.useState([]); React.useEffect(() => { const newMapping = diff --git a/app/src/app/importer/[id]/validate/Validation.tsx b/app/src/app/importer/[id]/validate/Validation.tsx index efa860a..32632d6 100644 --- a/app/src/app/importer/[id]/validate/Validation.tsx +++ b/app/src/app/importer/[id]/validate/Validation.tsx @@ -31,7 +31,10 @@ const Validation = ({ undefined, initialImporterDto ); - const { data: sourceData } = useGetSourceData(initialImporterDto.importerId); + const { data: sourceData } = useGetSourceData( + initialImporterDto.importerId, + initialSourceData + ); const { patches } = useGetPatches( initialImporterDto.importerId, undefined, @@ -42,11 +45,17 @@ const Validation = ({ undefined, initialValidation ); + console.log(sourceData, patches, validations); return (

Validate your data

- +