exchange JsonSchema with JSONSchema7

slub · Jun 20, 2024 · 306f8c3 · 306f8c3
1 parent aff5423
commit 306f8c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/ui-utils/src/mapping/mapMatchBasedByConfig.ts b/packages/ui-utils/src/mapping/mapMatchBasedByConfig.ts
@@ -1,8 +1,8 @@
 import { AnyFlatStrategy, DeclarativeFlatMapping } from "./mappingStrategies";
 import flatten from "lodash/flatten";
 import uniq from "lodash/uniq";
-import { JsonSchema } from "@jsonforms/core";
 import dot from "dot";
+import { JSONSchema7 } from "json-schema";
 
 type OwnColumnDesc = {
   index: number;
@@ -92,7 +92,7 @@ const columnMatcher = (
 
 export type FlatSourceMatchBased = {
   columns: FlexibleColumnMatchingDefinition;
-  expectedSchema?: JsonSchema;
+  expectedSchema?: JSONSchema7;
 };
 export type DeclarativeMatchBasedFlatMapping = {
   id: string;

diff --git a/packages/ui-utils/src/mapping/mappingStrategies.ts b/packages/ui-utils/src/mapping/mappingStrategies.ts
@@ -1,4 +1,3 @@
-import { JsonSchema } from "@jsonforms/core";
 import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 
@@ -9,6 +8,7 @@ import set from "lodash-es/set";
 import get from "lodash-es/get";
 import { getPaddedDate } from "@slub/edb-core-utils";
 import { IRIToStringFn, PrimaryFieldDeclaration } from "@slub/edb-core-types";
+import { JSONSchema7 } from "json-schema";
 
 dayjs.extend(customParseFormat);
 
@@ -658,7 +658,7 @@ export type AnyFlatStrategy =
 
 type SourceElement = {
   path: string;
-  expectedSchema?: JsonSchema;
+  expectedSchema?: JSONSchema7;
 };
 
 export type DeclarativeSimpleMapping = {
@@ -673,7 +673,7 @@ export type DeclarativeSimpleMapping = {
 
 export type FlatSourceElement = {
   columns: string[] | number[];
-  expectedSchema?: JsonSchema;
+  expectedSchema?: JSONSchema7;
 };
 
 export type DeclarativeFlatMapping = {

diff --git a/packages/ui-utils/src/mapping/simpleFieldExtractor.ts b/packages/ui-utils/src/mapping/simpleFieldExtractor.ts
@@ -1,4 +1,4 @@
-import get from "lodash/get";
+import get from "lodash-es/get";
 import {
   FieldExtractDeclaration,
   PrimaryFieldExtract,