-
+
diff --git a/packages/schema-builder/src/core/context.tsx b/packages/schema-builder/src/core/context.tsx
index b7aeb7c..ee87035 100644
--- a/packages/schema-builder/src/core/context.tsx
+++ b/packages/schema-builder/src/core/context.tsx
@@ -52,17 +52,14 @@ export interface SchemaBuilderProviderProps extends SchemaBuilderHostOptions {
children: ReactNode;
}
-export function SchemaBuilderProvider({
- children,
- tabs = EMPTY_TABS,
- ...host
-}: SchemaBuilderProviderProps) {
+export function SchemaBuilderProvider(props: SchemaBuilderProviderProps) {
+ const { children, tabs = EMPTY_TABS } = props;
const [store] = useState(() =>
createSchemaBuilderStore(
- host.scope,
- host.preferences,
- host.activeTab,
- host.selectedTableId ?? null
+ props.scope,
+ props.preferences,
+ props.activeTab,
+ props.selectedTableId ?? null
)
);
@@ -72,22 +69,22 @@ export function SchemaBuilderProvider({
}, [tabs]);
useEffect(() => {
- store.getState().replaceScope(host.scope);
- }, [host.scope, store]);
+ store.getState().replaceScope(props.scope);
+ }, [props.scope, store]);
useEffect(() => {
- store.getState().replacePreferences(host.preferences);
- }, [host.preferences, store]);
+ store.getState().replacePreferences(props.preferences);
+ }, [props.preferences, store]);
useEffect(() => {
- store.getState().replaceActiveTab(host.activeTab);
- }, [host.activeTab, store]);
+ store.getState().replaceActiveTab(props.activeTab);
+ }, [props.activeTab, store]);
useEffect(() => {
- if (host.selectedTableId !== undefined) {
- store.getState().setSelectedTableId(host.selectedTableId);
+ if (props.selectedTableId !== undefined) {
+ store.getState().setSelectedTableId(props.selectedTableId);
}
- }, [host.scope, host.selectedTableId, store]);
+ }, [props.scope, props.selectedTableId, store]);
const setActiveTab = useCallback(
(tabId: string) => {
@@ -97,9 +94,9 @@ export function SchemaBuilderProvider({
}
void extension?.preload?.();
store.getState().replaceActiveTab(tabId);
- host.onActiveTabChange(tabId);
+ props.onActiveTabChange(tabId);
},
- [host.onActiveTabChange, store, validatedTabs]
+ [props.onActiveTabChange, store, validatedTabs]
);
const setPreferences = useCallback(
@@ -111,17 +108,17 @@ export function SchemaBuilderProvider({
const current = store.getState().preferences;
const next = typeof update === 'function' ? update(current) : update;
store.getState().replacePreferences(next);
- host.onPreferencesChange(next);
+ props.onPreferencesChange(next);
},
- [host.onPreferencesChange, store]
+ [props.onPreferencesChange, store]
);
const selectTable = useCallback(
(tableId: string | null, tableName?: string | null) => {
store.getState().setSelectedTableId(tableId);
- host.onSelectedTableChange?.({ tableId, tableName: tableName ?? null });
+ props.onSelectedTableChange?.({ tableId, tableName: tableName ?? null });
},
- [host.onSelectedTableChange, store]
+ [props.onSelectedTableChange, store]
);
const selectField = useCallback(
(fieldId: string | null) => store.getState().setSelectedFieldId(fieldId),
@@ -130,7 +127,17 @@ export function SchemaBuilderProvider({
const value = useMemo
(
() => ({
- ...host,
+ adapter: props.adapter,
+ scope: props.scope,
+ colorMode: props.colorMode,
+ preferences: props.preferences,
+ onPreferencesChange: props.onPreferencesChange,
+ activeTab: props.activeTab,
+ onActiveTabChange: props.onActiveTabChange,
+ selectedTableId: props.selectedTableId,
+ onSelectedTableChange: props.onSelectedTableChange,
+ onNavigate: props.onNavigate,
+ onInvalidate: props.onInvalidate,
tabs: validatedTabs,
store,
setActiveTab,
@@ -138,7 +145,25 @@ export function SchemaBuilderProvider({
selectTable,
selectField
}),
- [host, selectField, selectTable, setActiveTab, setPreferences, store, validatedTabs]
+ [
+ props.activeTab,
+ props.adapter,
+ props.colorMode,
+ props.onActiveTabChange,
+ props.onInvalidate,
+ props.onNavigate,
+ props.onPreferencesChange,
+ props.onSelectedTableChange,
+ props.preferences,
+ props.scope,
+ props.selectedTableId,
+ selectField,
+ selectTable,
+ setActiveTab,
+ setPreferences,
+ store,
+ validatedTabs
+ ]
);
return {children} ;
diff --git a/packages/schema-builder/src/index.ts b/packages/schema-builder/src/index.ts
index f894754..dc7b7e0 100644
--- a/packages/schema-builder/src/index.ts
+++ b/packages/schema-builder/src/index.ts
@@ -51,3 +51,4 @@ export type {
SchemaBuilderTablesCapabilities,
SchemaBuilderVariables
} from './types';
+export type { SchemaBuilderDataState } from './schema/schema-builder-core/lib/gql/hooks/schema-builder';
diff --git a/packages/schema-builder/src/schema/schema-builder-core/components/schemas/schema-state-display.tsx b/packages/schema-builder/src/schema/schema-builder-core/components/schemas/schema-state-display.tsx
index 2ac49bf..4095aaa 100644
--- a/packages/schema-builder/src/schema/schema-builder-core/components/schemas/schema-state-display.tsx
+++ b/packages/schema-builder/src/schema/schema-builder-core/components/schemas/schema-state-display.tsx
@@ -4,7 +4,6 @@ import { memo } from 'react';
import { RiDatabase2Line } from '@remixicon/react';
import { cn } from '@/lib/utils';
-import type { DataError } from '../../lib/data';
import { type BaseStateConfig, ErrorBanner, InfoBanner } from '../shared/base-state-display';
import {
SchemaBuilderSkeleton,
@@ -23,7 +22,7 @@ export interface SchemaStateConfig {
message?: string;
onRetry?: () => void;
/** Original error object for auth error detection */
- error?: Error | DataError | null;
+ error?: Error | null;
}
// ============================================================================
diff --git a/packages/schema-builder/src/schema/schema-builder-core/components/shared/base-state-display.tsx b/packages/schema-builder/src/schema/schema-builder-core/components/shared/base-state-display.tsx
index a9f53a8..e4e1978 100644
--- a/packages/schema-builder/src/schema/schema-builder-core/components/shared/base-state-display.tsx
+++ b/packages/schema-builder/src/schema/schema-builder-core/components/shared/base-state-display.tsx
@@ -5,8 +5,7 @@ import { RiAlertLine, RiDatabase2Line, RiRefreshLine, RiShieldLine } from '@remi
import { cn } from '@/lib/utils';
import { AuthErrorBanner, isAuthError } from '../../lib/gql/auth-error-handler';
-import type { DataError } from '../../lib/data';
-import { Button } from '@constructive-io/ui/button';
+import { Button, buttonVariants } from '@constructive-io/ui/button';
import { useSchemaBuilderRuntime } from '@/blocks/schema/schema-builder-core/context/block-config';
// ============================================================================
@@ -35,7 +34,7 @@ export interface BaseStateConfig {
message?: string;
onRetry?: () => void;
/** Original error object for auth error detection */
- error?: Error | DataError | null;
+ error?: Error | null;
}
// ============================================================================
@@ -245,9 +244,12 @@ export function NoDatabaseBanner({
{linkText}
) : (
-
- {linkText}
-
+
+ {linkText}
+
);
return (
diff --git a/packages/schema-builder/src/schema/schema-builder-core/lib/data/error-handler.ts b/packages/schema-builder/src/schema/schema-builder-core/lib/data/error-handler.ts
deleted file mode 100644
index b3a60ab..0000000
--- a/packages/schema-builder/src/schema/schema-builder-core/lib/data/error-handler.ts
+++ /dev/null
@@ -1,649 +0,0 @@
-// Vendored from @constructive-io/data — trimmed to the surface the schema-builder blocks use. Do not edit to track upstream.
-
-/**
- * Centralized error handling for the data layer
- * Provides consistent error types, messages, and handling patterns
- */
-
-// ============================================================================
-// Error Types (const map instead of enum per codebase conventions)
-// ============================================================================
-
-export const DataErrorType = {
- // Network/Connection errors
- NETWORK_ERROR: 'NETWORK_ERROR',
- TIMEOUT_ERROR: 'TIMEOUT_ERROR',
-
- // Validation errors
- VALIDATION_FAILED: 'VALIDATION_FAILED',
- REQUIRED_FIELD_MISSING: 'REQUIRED_FIELD_MISSING',
- INVALID_MUTATION_DATA: 'INVALID_MUTATION_DATA',
-
- // Query errors
- QUERY_GENERATION_FAILED: 'QUERY_GENERATION_FAILED',
- QUERY_EXECUTION_FAILED: 'QUERY_EXECUTION_FAILED',
-
- // Permission errors
- UNAUTHORIZED: 'UNAUTHORIZED',
- FORBIDDEN: 'FORBIDDEN',
-
- // Schema errors
- TABLE_NOT_FOUND: 'TABLE_NOT_FOUND',
-
- // Request errors
- BAD_REQUEST: 'BAD_REQUEST',
- NOT_FOUND: 'NOT_FOUND',
-
- // GraphQL-specific errors
- GRAPHQL_ERROR: 'GRAPHQL_ERROR',
-
- // PostgreSQL constraint errors (surfaced via PostGraphile)
- UNIQUE_VIOLATION: 'UNIQUE_VIOLATION',
- FOREIGN_KEY_VIOLATION: 'FOREIGN_KEY_VIOLATION',
- NOT_NULL_VIOLATION: 'NOT_NULL_VIOLATION',
- CHECK_VIOLATION: 'CHECK_VIOLATION',
- EXCLUSION_VIOLATION: 'EXCLUSION_VIOLATION',
-
- // Generic errors
- UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-} as const;
-
-export type DataErrorType = (typeof DataErrorType)[keyof typeof DataErrorType];
-
-// ============================================================================
-// DataError Class
-// ============================================================================
-
-export interface DataErrorOptions {
- /** Optional table name for data-layer operations */
- tableName?: string;
- /** Optional field name for data-layer operations */
- fieldName?: string;
- /** Optional constraint name for PostgreSQL constraint violations */
- constraint?: string;
- originalError?: Error;
- code?: string;
- context?: Record;
-}
-
-type CaptureStackTraceFn = (targetObject: object, constructorOpt?: Function) => void;
-
-const errorWithCaptureStackTrace = Error as ErrorConstructor & {
- captureStackTrace?: CaptureStackTraceFn;
-};
-
-/**
- * Standard data layer error class
- */
-export class DataError extends Error {
- public readonly type: DataErrorType;
- public readonly code?: string;
- public readonly originalError?: Error;
- public readonly context?: Record;
- public readonly tableName?: string;
- public readonly fieldName?: string;
- public readonly constraint?: string;
-
- constructor(type: DataErrorType, message: string, options: DataErrorOptions = {}) {
- super(message);
- this.name = 'DataError';
- this.type = type;
- this.code = options.code;
- this.originalError = options.originalError;
- this.context = options.context;
- this.tableName = options.tableName;
- this.fieldName = options.fieldName;
- this.constraint = options.constraint;
-
- if (errorWithCaptureStackTrace.captureStackTrace) {
- errorWithCaptureStackTrace.captureStackTrace(this, DataError);
- }
- }
-
- /**
- * Get a user-friendly error message.
- * Checks constraint-specific messages first, then falls back to generic messages.
- */
- getUserMessage(): string {
- // Check constraint-specific message first (for constraint violations)
- if (this.constraint) {
- const constraintMsg = getConstraintMessage(this.constraint);
- if (constraintMsg) return constraintMsg;
- }
-
- // Fall back to generic messages by error type
- switch (this.type) {
- case DataErrorType.NETWORK_ERROR:
- return 'Network error. Please check your connection and try again.';
- case DataErrorType.TIMEOUT_ERROR:
- return 'Request timed out. Please try again.';
- case DataErrorType.UNAUTHORIZED:
- return 'You are not authorized. Please log in and try again.';
- case DataErrorType.FORBIDDEN:
- return 'You do not have permission to access this resource.';
- case DataErrorType.VALIDATION_FAILED:
- return 'Validation failed. Please check your input and try again.';
- case DataErrorType.REQUIRED_FIELD_MISSING:
- return this.fieldName
- ? `The field "${this.fieldName}" is required.`
- : 'A required field is missing. Please check your input.';
- case DataErrorType.INVALID_MUTATION_DATA:
- return 'Invalid input. Please check your data and try again.';
- case DataErrorType.QUERY_GENERATION_FAILED:
- return 'Query validation failed. Please check your request.';
- case DataErrorType.QUERY_EXECUTION_FAILED:
- return 'Query execution failed. Please try again.';
- case DataErrorType.TABLE_NOT_FOUND:
- return 'The requested table was not found.';
- case DataErrorType.BAD_REQUEST:
- return this.message || 'Invalid request.';
- case DataErrorType.NOT_FOUND:
- return 'The requested resource was not found.';
- case DataErrorType.UNIQUE_VIOLATION:
- return this.fieldName
- ? `A record with this ${this.fieldName} already exists.`
- : 'A record with this value already exists.';
- case DataErrorType.FOREIGN_KEY_VIOLATION:
- return 'This record cannot be saved because it references a record that does not exist.';
- case DataErrorType.NOT_NULL_VIOLATION:
- return this.fieldName
- ? `The field "${this.fieldName}" cannot be empty.`
- : 'A required field cannot be empty.';
- case DataErrorType.CHECK_VIOLATION:
- return this.fieldName
- ? `The value for "${this.fieldName}" is not valid.`
- : 'The value does not meet the required constraints.';
- case DataErrorType.EXCLUSION_VIOLATION:
- return 'This record conflicts with an existing record.';
- default:
- return this.message || 'An unexpected error occurred.';
- }
- }
-
- /**
- * Check if this error is retryable
- */
- isRetryable(): boolean {
- return this.type === DataErrorType.NETWORK_ERROR || this.type === DataErrorType.TIMEOUT_ERROR;
- }
-
- /**
- * Get error details for logging
- */
- getLogDetails(): Record {
- return {
- type: this.type,
- message: this.message,
- code: this.code,
- tableName: this.tableName,
- fieldName: this.fieldName,
- context: this.context,
- stack: this.stack,
- originalError: this.originalError
- ? {
- name: this.originalError.name,
- message: this.originalError.message,
- }
- : undefined,
- };
- }
-}
-
-// ============================================================================
-// GraphQL Types
-// ============================================================================
-
-export interface GraphQLErrorLocation {
- line: number;
- column: number;
-}
-
-export type GraphQLErrorPath = Array;
-
-export interface GraphQLError {
- message: string;
- extensions?: { code?: string } & Record;
- locations?: GraphQLErrorLocation[];
- path?: GraphQLErrorPath;
-}
-
-// ============================================================================
-// Error Factory
-// ============================================================================
-
-export const createDataError = {
- networkError: (originalError?: Error, tableName?: string) =>
- new DataError(DataErrorType.NETWORK_ERROR, 'Network error occurred', { originalError, tableName }),
-
- timeoutError: (originalError?: Error, tableName?: string) =>
- new DataError(DataErrorType.TIMEOUT_ERROR, 'Request timed out', { originalError, tableName }),
-
- validationFailed: (tableName: string | undefined, validationErrors: string[]) =>
- new DataError(
- DataErrorType.VALIDATION_FAILED,
- `Validation failed: ${validationErrors.join(', ')}`,
- { tableName, context: { validationErrors } },
- ),
-
- requiredFieldMissing: (fieldName: string, tableName?: string) =>
- new DataError(DataErrorType.REQUIRED_FIELD_MISSING, `Required field ${fieldName} is missing`, {
- tableName,
- fieldName,
- }),
-
- unauthorized: (message = 'Authentication required', tableName?: string) =>
- new DataError(DataErrorType.UNAUTHORIZED, message, { tableName }),
-
- forbidden: (tableName?: string) =>
- new DataError(DataErrorType.FORBIDDEN, 'Access forbidden', { tableName }),
-
- queryGenerationFailed: (message: string, tableName?: string, code?: string) =>
- new DataError(DataErrorType.QUERY_GENERATION_FAILED, message, { tableName, code }),
-
- queryExecutionFailed: (message: string, tableName?: string, code?: string) =>
- new DataError(DataErrorType.QUERY_EXECUTION_FAILED, message, { tableName, code }),
-
- tableNotFound: (message = 'Table not found', tableName?: string, code?: string) =>
- new DataError(DataErrorType.TABLE_NOT_FOUND, message, { tableName, code }),
-
- invalidMutationData: (message: string, tableName?: string, code?: string, context?: Record