Merge pull request #282 from balena-io-modules/remove-json-schema

flowzone-app[bot] · web-flow · commit f8300399c079 · 2026-01-15T00:32:46.000Z
Remove unnecessary `json-schema` lib
diff --git a/src/components/RJST/Actions/Tags.tsx b/src/components/RJST/Actions/Tags.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import type { RJSTContext, RJSTBaseResource } from '../schemaOps';
 import { parseDescriptionProperty } from '../schemaOps';
 import { get } from '../../../utils/objects';
diff --git a/src/components/RJST/DataTypes/array.tsx b/src/components/RJST/DataTypes/array.tsx
@@ -1,4 +1,4 @@
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import {
 	FULL_TEXT_SLUG,
 	createModelFilter,
diff --git a/src/components/RJST/DataTypes/boolean.tsx b/src/components/RJST/DataTypes/boolean.tsx
@@ -1,6 +1,6 @@
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema } from './utils';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 
 export const operators = () => ({
 	is: 'is',
diff --git a/src/components/RJST/DataTypes/date-time.tsx b/src/components/RJST/DataTypes/date-time.tsx
@@ -1,6 +1,6 @@
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema, normalizeDateTime } from './utils';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 
 export const operators = () => ({
 	is: 'is',
diff --git a/src/components/RJST/DataTypes/enum.tsx b/src/components/RJST/DataTypes/enum.tsx
@@ -2,7 +2,7 @@ import { isEqual } from 'es-toolkit';
 import { FULL_TEXT_SLUG } from '../components/Filters/SchemaSieve';
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema, regexEscape } from './utils';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 
 export const operators = () => ({
 	is: 'is',
diff --git a/src/components/RJST/DataTypes/index.ts b/src/components/RJST/DataTypes/index.ts
@@ -7,17 +7,13 @@ import * as enumType from './enum';
 import * as oneOfType from './oneOf';
 import * as dateTimeType from './date-time';
 
-import {
-	type JSONSchema7 as JSONSchema,
-	type JSONSchema7Definition as JSONSchemaDefinition,
-	type JSONSchema7TypeName as JSONSchemaTypeName,
-} from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { getPropertySchema } from '../components/Filters/SchemaSieve';
 import { getRefSchema } from '../schemaOps';
-
-type ExcludeLiteral<T, U> = T extends U ? never : T;
-
-type PartialJSONSchemaTypeName = ExcludeLiteral<JSONSchemaTypeName, 'null'>;
+import type {
+	JSONSchemaDefinition,
+	PartialJSONSchemaTypeName,
+} from '../../../typings/shared';
 
 type DataTypeModule =
 	| typeof arrayType
@@ -89,7 +85,7 @@ export const getDataModel = (
 			}
 			const typeSet = Array.isArray(type) ? type : [type];
 			const dataTypeKey = Object.keys(dataTypeMap).find((t) =>
-				typeSet.includes(t as JSONSchemaTypeName),
+				typeSet.includes(t as PartialJSONSchemaTypeName),
 			);
 			if (!dataTypeKey) {
 				return null;
diff --git a/src/components/RJST/DataTypes/number.tsx b/src/components/RJST/DataTypes/number.tsx
@@ -1,7 +1,7 @@
 import { FULL_TEXT_SLUG } from '../components/Filters/SchemaSieve';
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema } from './utils';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 
 // This is the max safe integer supported DB: 2**31-1
 const MAX_SAFE_DB_INT4 = 2147483647;
diff --git a/src/components/RJST/DataTypes/object.tsx b/src/components/RJST/DataTypes/object.tsx
@@ -1,4 +1,4 @@
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import type { CreateFilter, KeysOfUnion } from './utils';
 import { getDataTypeSchema, regexEscape } from './utils';
 import type { FormData } from '../components/Filters/SchemaSieve';
diff --git a/src/components/RJST/DataTypes/oneOf.tsx b/src/components/RJST/DataTypes/oneOf.tsx
@@ -2,7 +2,7 @@ import { isJSONSchema } from '../schemaOps';
 import { FULL_TEXT_SLUG } from '../components/Filters/SchemaSieve';
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema } from './utils';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 export const operators = () => ({
 	is: 'is',
 	is_not: 'is not',
diff --git a/src/components/RJST/DataTypes/string.tsx b/src/components/RJST/DataTypes/string.tsx
@@ -1,7 +1,7 @@
 import type { CreateFilter } from './utils';
 import { getDataTypeSchema, regexEscape } from './utils';
 import { FULL_TEXT_SLUG } from '../components/Filters/SchemaSieve';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 
 // TODO: we should make it an object as soon as we will be able to remove custom Tags logic in DataTypes/object.tsx.
 export const operators = () => ({
diff --git a/src/components/RJST/DataTypes/utils.ts b/src/components/RJST/DataTypes/utils.ts
@@ -1,5 +1,5 @@
 import type { Schema } from 'ajv';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { memoize } from 'es-toolkit';
 
 const matchOperatorsRe = /[|\\{}()[\]^$+*?]/g;
diff --git a/src/components/RJST/Filters/Filters.tsx b/src/components/RJST/Filters/Filters.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { PersistentFilters } from './PersistentFilters';
 import type { FiltersView } from '../components/Filters';
 import {
diff --git a/src/components/RJST/Filters/PersistentFilters.tsx b/src/components/RJST/Filters/PersistentFilters.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import qs from 'qs';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import type { FiltersProps } from '../components/Filters';
 import { Filters } from '../components/Filters';
 import type { FilterDescription } from '../components/Filters/SchemaSieve';
diff --git a/src/components/RJST/Filters/utils.ts b/src/components/RJST/Filters/utils.ts
@@ -1,7 +1,4 @@
-import type {
-	JSONSchema7 as JSONSchema,
-	JSONSchema7Definition as JSONSchemaDefinition,
-} from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import {
 	convertRefSchemeToSchemaPath,
 	getRefSchemeTitle,
@@ -11,6 +8,7 @@ import {
 	parseDescriptionProperty,
 } from '../schemaOps';
 import { get, isObjectEmpty } from '../../../utils/objects';
+import type { JSONSchemaDefinition } from '../../../typings/shared';
 
 const X_FOREIGN_KEY_SCHEMA_SEPARATOR = '___ref_scheme_separator_';
 
diff --git a/src/components/RJST/components/Filters/FilterDescription.tsx b/src/components/RJST/components/Filters/FilterDescription.tsx
@@ -1,4 +1,4 @@
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import * as React from 'react';
 import {
 	FULL_TEXT_SLUG,
diff --git a/src/components/RJST/components/Filters/FiltersDialog.tsx b/src/components/RJST/components/Filters/FiltersDialog.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
 import { useTranslation } from '../../../../hooks/useTranslations';
-import type {
-	JSONSchema7 as JSONSchema,
-	JSONSchema7Definition as JSONSchemaDefinition,
-} from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { getDataModel, getPropertySchemaAndModel } from '../../DataTypes';
 import {
 	createFilter,
@@ -33,6 +30,7 @@ import { getRefSchema } from '../../schemaOps';
 import type { IChangeEvent } from '@rjsf/core';
 import { DialogWithCloseButton } from '../../../DialogWithCloseButton';
 import { RJSForm } from '../../../Form';
+import type { JSONSchemaDefinition } from '../../../../typings/shared';
 
 const ArrayFieldTemplate = ({
 	items,
diff --git a/src/components/RJST/components/Filters/SchemaSieve.ts b/src/components/RJST/components/Filters/SchemaSieve.ts
@@ -1,7 +1,4 @@
-import type {
-	JSONSchema7 as JSONSchema,
-	JSONSchema7Definition as JSONSchemaDefinition,
-} from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import {
 	getAllOperators,
 	getDataModel,
@@ -13,6 +10,7 @@ import { pickBy } from 'es-toolkit';
 import Ajv from 'ajv';
 import { enqueueSnackbar } from 'notistack';
 import { isObjectEmpty } from '../../../../utils/objects';
+import type { JSONSchemaDefinition } from '../../../../typings/shared';
 
 const ajv = new Ajv();
 ajvKeywords(ajv, ['regexp']);
diff --git a/src/components/RJST/components/Filters/Summary.tsx b/src/components/RJST/components/Filters/Summary.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { useTranslation } from '../../../../hooks/useTranslations';
 import { FilterDescription } from './FilterDescription';
 import { DialogWithCloseButton } from '../../../DialogWithCloseButton';
diff --git a/src/components/RJST/components/Filters/Views.tsx b/src/components/RJST/components/Filters/Views.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { faChartPie } from '@fortawesome/free-solid-svg-icons/faChartPie';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTrash } from '@fortawesome/free-solid-svg-icons/faTrash';
 import { useTranslation } from '../../../../hooks/useTranslations';
diff --git a/src/components/RJST/components/Filters/index.tsx b/src/components/RJST/components/Filters/index.tsx
@@ -14,7 +14,7 @@ import { Summary } from './Summary';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faFilter } from '@fortawesome/free-solid-svg-icons/faFilter';
 import { useClickOutsideOrEsc } from '../../../../hooks/useClickOutsideOrEsc';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { getPropertySchemaAndModel } from '../../DataTypes';
 import { getFromLocalStorage, setToLocalStorage } from '../../utils';
 import { useAnalyticsContext } from '../../../../contexts/AnalyticsContext';
diff --git a/src/components/RJST/components/Widget/index.tsx b/src/components/RJST/components/Widget/index.tsx
@@ -2,7 +2,7 @@ import { toArray } from '../../../../utils/arrays';
 import type { Format, UiSchema, Value, WidgetProps } from './utils';
 import { JsonTypes } from './utils';
 import { typeWidgets } from './Formats';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { getSchemaFormat, getSubSchemaFromRefScheme } from '../../schemaOps';
 
 const getValue = (value?: Value, schema?: JSONSchema, uiSchema?: UiSchema) => {
diff --git a/src/components/RJST/components/Widget/utils.ts b/src/components/RJST/components/Widget/utils.ts
@@ -1,4 +1,4 @@
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import type { UiSchema as rjsfUiSchema } from '@rjsf/utils';
 import { get } from '../../../../utils/objects';
 import { format, formatDistance } from 'date-fns';
diff --git a/src/components/RJST/index.tsx b/src/components/RJST/index.tsx
@@ -24,7 +24,6 @@ import {
 	isJSONSchema,
 } from './schemaOps';
 import { LensSelection } from './Lenses/LensSelection';
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
 import { isEqual, pickBy } from 'es-toolkit';
 import { Filters } from './Filters/Filters';
 import { Tags } from './Actions/Tags';
@@ -71,6 +70,7 @@ import { Widget } from './components/Widget';
 import { defaultFormats } from './components/Widget/Formats';
 import { Tooltip } from '../Tooltip';
 import { token } from '../../utils/token';
+import type { StrictRJSFSchema } from '@rjsf/utils';
 
 const HeaderGrid = styled(Box)(({ theme }) => ({
 	display: 'flex',
@@ -114,7 +114,7 @@ export interface RJSTProps<T> extends Omit<BoxProps, 'onChange'> {
 	// TODO: onChange should also be called when data in the table is sorted and when columns change
 	/** Function that gets called when filters change */
 	onChange?: (changes: {
-		filters?: JSONSchema[];
+		filters?: StrictRJSFSchema[];
 		page: number;
 		itemsPerPage?: number;
 		oData?: {
@@ -173,7 +173,7 @@ export const RJST = <T extends RJSTBaseResource<T>>({
 		return modelRaw;
 	}, [modelRaw]);
 
-	const [filters, setFilters] = React.useState<JSONSchema[]>([]);
+	const [filters, setFilters] = React.useState<StrictRJSFSchema[]>([]);
 	// TODO: this logic should be moved in the lens/table.tsx.
 	// With the layer refactor we should have a lens.data.renderer should
 	// only handle a onChange event that has all the info. the lens should handle all cases
@@ -203,7 +203,7 @@ export const RJST = <T extends RJSTBaseResource<T>>({
 
 	const internalOnChange = React.useCallback(
 		(
-			updatedFilters: JSONSchema[],
+			updatedFilters: StrictRJSFSchema[],
 			sortInfo: TableSortOptions<T> | null,
 			page: number,
 			itemsPerPage: number,
@@ -238,7 +238,7 @@ export const RJST = <T extends RJSTBaseResource<T>>({
 	);
 
 	const $setFilters = React.useCallback(
-		(updatedFilters: JSONSchema[]) => {
+		(updatedFilters: StrictRJSFSchema[]) => {
 			setFilters(updatedFilters);
 			internalOnChange(
 				updatedFilters,
@@ -655,7 +655,7 @@ export {
 
 const getTitleAndLabel = <T extends object>(
 	t: TFunction,
-	jsonSchema: JSONSchema,
+	jsonSchema: StrictRJSFSchema,
 	propertyKey: string,
 	refScheme: string | undefined,
 ) => {
@@ -717,7 +717,7 @@ const getColumnsFromSchema = <T extends RJSTBaseResource<T>>({
 	formats,
 }: {
 	t: TFunction;
-	schema: JSONSchema;
+	schema: StrictRJSFSchema;
 	idField: RJSTContext<T>['idField'];
 	isServerSide: boolean;
 	customSort?: RJSTContext<T>['customSort'];
@@ -736,42 +736,48 @@ const getColumnsFromSchema = <T extends RJSTBaseResource<T>>({
 			]
 		>
 	)
-		.filter((entry): entry is [Extract<keyof T, string>, JSONSchema] => {
+		.filter((entry): entry is [Extract<keyof T, string>, StrictRJSFSchema] => {
 			const [_key, val] = entry;
 			return isJSONSchema(val);
 		})
-		.flatMap(([key, val]): Array<[Extract<keyof T, string>, JSONSchema]> => {
-			const refScheme = getPropertyScheme(val);
-			if (!refScheme || refScheme.length <= 1) {
-				return [[key, val]];
-			}
-			const entityFilterOnly = parseDescriptionProperty(val, 'x-filter-only');
-			return refScheme.map((propKey: string) => {
-				const referenceSchema = generateSchemaFromRefScheme(val, key, propKey);
-				const referenceSchemaFilterOnly = parseDescriptionProperty(
-					referenceSchema,
-					'x-filter-only',
-				);
-				const xFilterOnly =
-					hasPropertyEnabled(referenceSchemaFilterOnly, propKey) ||
-					hasPropertyEnabled(entityFilterOnly, propKey);
-				const xNoSort =
-					hasPropertyEnabled(
-						parseDescriptionProperty(val, 'x-no-sort'),
-						propKey,
-					) ||
-					hasPropertyEnabled(
-						parseDescriptionProperty(referenceSchema, 'x-no-sort'),
+		.flatMap(
+			([key, val]): Array<[Extract<keyof T, string>, StrictRJSFSchema]> => {
+				const refScheme = getPropertyScheme(val);
+				if (!refScheme || refScheme.length <= 1) {
+					return [[key, val]];
+				}
+				const entityFilterOnly = parseDescriptionProperty(val, 'x-filter-only');
+				return refScheme.map((propKey: string) => {
+					const referenceSchema = generateSchemaFromRefScheme(
+						val,
+						key,
 						propKey,
 					);
-				const description = JSON.stringify({
-					'x-ref-scheme': [propKey],
-					...(xFilterOnly && { 'x-filter-only': 'true' }),
-					...(xNoSort && { 'x-no-sort': 'true' }),
+					const referenceSchemaFilterOnly = parseDescriptionProperty(
+						referenceSchema,
+						'x-filter-only',
+					);
+					const xFilterOnly =
+						hasPropertyEnabled(referenceSchemaFilterOnly, propKey) ||
+						hasPropertyEnabled(entityFilterOnly, propKey);
+					const xNoSort =
+						hasPropertyEnabled(
+							parseDescriptionProperty(val, 'x-no-sort'),
+							propKey,
+						) ||
+						hasPropertyEnabled(
+							parseDescriptionProperty(referenceSchema, 'x-no-sort'),
+							propKey,
+						);
+					const description = JSON.stringify({
+						'x-ref-scheme': [propKey],
+						...(xFilterOnly && { 'x-filter-only': 'true' }),
+						...(xNoSort && { 'x-no-sort': 'true' }),
+					});
+					return [key, { ...val, description }];
 				});
-				return [key, { ...val, description }];
-			});
-		})
+			},
+		)
 		.filter(([key, val]) => {
 			const entryDescription = parseDescription(val);
 			return (
diff --git a/src/components/RJST/oData/converter.spec.ts b/src/components/RJST/oData/converter.spec.ts
@@ -1,4 +1,4 @@
-import type { JSONSchema7 as JSONSchema } from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import { convertToPineClientFilter } from './jsonToOData';
 
 type FilterTest = {
diff --git a/src/components/RJST/oData/jsonToOData.ts b/src/components/RJST/oData/jsonToOData.ts
@@ -1,11 +1,9 @@
 import type { TableSortOptions } from '../components/Table/utils';
-import type {
-	JSONSchema7 as JSONSchema,
-	JSONSchema7Definition as JSONSchemaDefinition,
-} from 'json-schema';
+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';
 import type { RJSTContext } from '../schemaOps';
 import { isJSONSchema } from '../schemaOps';
 import { regexUnescape } from '../DataTypes/utils';
+import type { JSONSchemaDefinition } from '../../../typings/shared';
 
 export type PineFilterObject = Record<string, any>;
 
diff --git a/src/components/RJST/schemaOps.ts b/src/components/RJST/schemaOps.ts
diff --git a/src/components/RJST/utils.ts b/src/components/RJST/utils.ts
diff --git a/src/typings/shared.ts b/src/typings/shared.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { JSONSchema7 as JSONSchema } from 'json-schema';`
	`1`	`+import type { StrictRJSFSchema as JSONSchema } from '@rjsf/utils';`
`2`	`2`	`import {`
`3`	`3`	`FULL_TEXT_SLUG,`
`4`	`4`	`createModelFilter,`