From c826dd0e7c44c09be9b1ee0af5619461e840f862 Mon Sep 17 00:00:00 2001 From: Nik Graf Date: Tue, 22 Jul 2025 22:33:46 +0200 Subject: [PATCH 1/2] remove datatype url --- apps/events/src/schema.ts | 2 +- apps/typesync/client/src/Components/App/Schema/utils.ts | 2 -- apps/typesync/src/Generator.ts | 2 -- .../src/internal/use-generate-update-ops.tsx | 6 ------ .../hypergraph-react/src/internal/use-query-public.tsx | 9 +++------ packages/hypergraph-react/src/use-query.tsx | 8 -------- packages/hypergraph/src/type/type.ts | 1 - packages/typesync/src/Mapping.ts | 5 +---- 8 files changed, 5 insertions(+), 30 deletions(-) diff --git a/apps/events/src/schema.ts b/apps/events/src/schema.ts index 2ee013c8..ccf61ae3 100644 --- a/apps/events/src/schema.ts +++ b/apps/events/src/schema.ts @@ -17,7 +17,7 @@ export class Todo2 extends Entity.Class('Todo2')({ due: Type.Date, amount: Type.Number, point: Type.Point, - website: Type.Url, + website: Type.Text, }) {} export class JobOffer extends Entity.Class('JobOffer')({ diff --git a/apps/typesync/client/src/Components/App/Schema/utils.ts b/apps/typesync/client/src/Components/App/Schema/utils.ts index 2096f01e..52d85fa4 100644 --- a/apps/typesync/client/src/Components/App/Schema/utils.ts +++ b/apps/typesync/client/src/Components/App/Schema/utils.ts @@ -21,8 +21,6 @@ function fieldToEntityString({ return 'Type.Boolean'; case type_name === 'Date': return 'Type.Date'; - case type_name === 'Url': - return 'Type.Url'; case type_name === 'Point': return 'Type.Point'; case type_name.startsWith('Relation'): diff --git a/apps/typesync/src/Generator.ts b/apps/typesync/src/Generator.ts index 0d701353..ecb2bd36 100644 --- a/apps/typesync/src/Generator.ts +++ b/apps/typesync/src/Generator.ts @@ -319,8 +319,6 @@ function fieldToEntityString({ return 'Type.Checkbox'; case dataType === 'Date': return 'Type.Date'; - case dataType === 'Url': - return 'Type.Url'; case dataType === 'Point': return 'Type.Point'; case Mapping.isDataTypeRelation(dataType): diff --git a/packages/hypergraph-react/src/internal/use-generate-update-ops.tsx b/packages/hypergraph-react/src/internal/use-generate-update-ops.tsx index 2876a0a0..cdb3bc2b 100644 --- a/packages/hypergraph-react/src/internal/use-generate-update-ops.tsx +++ b/packages/hypergraph-react/src/internal/use-generate-update-ops.tsx @@ -43,12 +43,6 @@ export function useGenerateUpdateOps(type: // // @ts-expect-error: must be an array of numbers // value: rawValue.join(','), // }; - // } else if (type.fields[key] === Type.Url) { - // value = { - // type: 'URL', - // // @ts-expect-error: must be a URL - // value: rawValue.toString(), - // }; // } else if (type.fields[key] === Type.Date) { // value = { // type: 'TIME', diff --git a/packages/hypergraph-react/src/internal/use-query-public.tsx b/packages/hypergraph-react/src/internal/use-query-public.tsx index 460c7c1f..fc726baa 100644 --- a/packages/hypergraph-react/src/internal/use-query-public.tsx +++ b/packages/hypergraph-react/src/internal/use-query-public.tsx @@ -160,9 +160,6 @@ const convertPropertyValue = ( if (type.fields[key] === Type.Point) { return property.value; } - if (type.fields[key] === Type.Url) { - return property.value; - } if (type.fields[key] === Type.Date) { return property.value; } @@ -178,7 +175,7 @@ const convertRelations = ( mappingEntry: MappingEntry, mapping: Mapping, ) => { - const rawEntity: Record = {}; + const rawEntity: Record = {}; for (const [key, relationId] of Object.entries(mappingEntry?.relations ?? {})) { const properties = (queryEntity.relationsList ?? []).filter((a) => a.typeId === relationId); @@ -212,7 +209,7 @@ const convertRelations = ( // @ts-expect-error TODO: properly access the type.name const type = field.value; - let rawEntity: Record = { + let rawEntity: Record = { id: propertyEntry.toEntity.id, name: propertyEntry.toEntity.name, // TODO: should be determined by the actual value @@ -262,7 +259,7 @@ export const parseResult = ( const invalidEntities: Record[] = []; for (const queryEntity of queryData.entities) { - let rawEntity: Record = { + let rawEntity: Record = { id: queryEntity.id, }; diff --git a/packages/hypergraph-react/src/use-query.tsx b/packages/hypergraph-react/src/use-query.tsx index 397a150f..40e85ffa 100644 --- a/packages/hypergraph-react/src/use-query.tsx +++ b/packages/hypergraph-react/src/use-query.tsx @@ -99,14 +99,6 @@ const _getDiff = ( new: localEntity[key], }; } - } else if (field === Type.Url) { - if (entity[key].toString() !== localEntity[key].toString()) { - diff[key] = { - type: 'property', - current: entity[key], - new: localEntity[key], - }; - } } else if (field === Type.Point) { if (entity[key].join(',') !== localEntity[key].join(',')) { diff[key] = { diff --git a/packages/hypergraph/src/type/type.ts b/packages/hypergraph/src/type/type.ts index e1ebbe4b..9e14a3ee 100644 --- a/packages/hypergraph/src/type/type.ts +++ b/packages/hypergraph/src/type/type.ts @@ -8,7 +8,6 @@ export const Number = Schema.Number; export const Checkbox = Schema.Boolean; // biome-ignore lint/suspicious/noShadowRestrictedNames: is part of a namespaces module and therefor ok export const Date = Schema.Date; -export const Url = Schema.URL; export const Point = Schema.transform(Schema.String, Schema.Array(Number), { strict: true, decode: (str: string) => { diff --git a/packages/typesync/src/Mapping.ts b/packages/typesync/src/Mapping.ts index 6367ac59..e0fce750 100644 --- a/packages/typesync/src/Mapping.ts +++ b/packages/typesync/src/Mapping.ts @@ -94,7 +94,7 @@ export type SchemaDataTypeRelation = typeof SchemaDataTypeRelation.Type; /** * @since 0.0.1 */ -export const SchemaDataTypePrimitive = EffectSchema.Literal('Text', 'Number', 'Checkbox', 'Date', 'Point', 'Url'); +export const SchemaDataTypePrimitive = EffectSchema.Literal('Text', 'Number', 'Checkbox', 'Date', 'Point'); /** * @since 0.0.1 */ @@ -761,9 +761,6 @@ export function mapSchemaDataTypeToGRC20PropDataType(dataType: SchemaDataType): case dataType === 'Point': { return 'POINT'; } - case dataType === 'Url': { - return 'TEXT'; - } case isDataTypeRelation(dataType): { return 'RELATION'; } From af08a35309f7ba0cfad29fd9d45d0204774254c8 Mon Sep 17 00:00:00 2001 From: Nik Graf Date: Wed, 23 Jul 2025 06:38:30 +0200 Subject: [PATCH 2/2] add changeset --- .changeset/deep-banks-trade.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/deep-banks-trade.md diff --git a/.changeset/deep-banks-trade.md b/.changeset/deep-banks-trade.md new file mode 100644 index 00000000..74bd425d --- /dev/null +++ b/.changeset/deep-banks-trade.md @@ -0,0 +1,8 @@ +--- +"@graphprotocol/hypergraph-react": patch +"@graphprotocol/hypergraph": patch +"@graphprotocol/typesync": patch +"@graphprotocol/hypergraph-cli": patch +--- + +remove unsupported dataType Url