Remove circular dependencies

Author: emmatown

.changeset/proud-turtles-protect.md

@@ -0,0 +1,6 @@
+---
+'@keystatic/core': patch
+'@keystar/ui': patch
+---
+
+Remove circular dependencies

design-system/pkg/src/layout/ScrollView.tsx

@@ -24,7 +24,7 @@ import {
   tokenSchema,
   transition,
 } from '@keystar/ui/style';
-import { useGridStyleProps } from '.';
+import { useGridStyleProps } from './resolvers';
 
 export type ScrollDirection = 'vertical' | 'horizontal';
 export type ScrollIndicator = 'start' | 'end' | 'both' | 'none';

packages/keystatic/src/form/error-formatting.ts

@@ -1,5 +1,5 @@
 import { FieldDataError } from './fields/error';
-import { PropValidationError } from './parse-props';
+import { PropValidationError } from './prop-validation-error';
 
 function flattenErrors(error: unknown): unknown[] {
   if (error instanceof AggregateError) {

packages/keystatic/src/form/errors.ts

@@ -1,7 +1,7 @@
 import { getSlugFromState } from '../app/utils';
 import { ComponentSchema } from './api';
 import { SlugFieldInfo } from './fields/text/path-slug-context';
-import { PropValidationError } from './parse-props';
+import { PropValidationError } from './prop-validation-error';
 import { ReadonlyPropPath } from './fields/document/DocumentEditor/component-blocks/utils';
 import { validateArrayLength } from './validate-array-length';
 import { toFormattedFormDataError } from './error-formatting';

packages/keystatic/src/form/fields/blocks/index.tsx

@@ -4,10 +4,11 @@ import {
   ArrayField,
   ConditionalField,
   BasicFormField,
-  fields,
 } from '../../api';
 import { select as selectField } from '../select';
 import { BlocksFieldInput } from '#field-ui/blocks';
+import { conditional } from '../conditional';
+import { array } from '../array';
 
 export function blocks<Schemas extends Record<string, ComponentSchema>>(
   blocks: {
@@ -45,17 +46,14 @@ export function blocks<Schemas extends Record<string, ComponentSchema>>(
       value: key,
     })),
   });
-  const element = fields.conditional<
-    BasicFormField<keyof Schemas & string>,
-    Schemas
-  >(
+  const element = conditional<BasicFormField<keyof Schemas & string>, Schemas>(
     select,
     Object.fromEntries(
       entries.map(([key, { schema }]) => [key, schema])
     ) as Schemas
   );
   return {
-    ...fields.array(element, {
+    ...array(element, {
       label: opts.label,
       description: opts.description,
       validation: opts.validation,

packages/keystatic/src/form/parse-props.ts

@@ -5,18 +5,7 @@ import { FormField, FormFieldStoredValue, JsonYamlValue } from '..';
 import { FieldDataError } from './fields/error';
 import { validateArrayLength } from './validate-array-length';
 import { getInitialPropsValue } from './initial-values';
-
-export class PropValidationError extends Error {
-  path: ReadonlyPropPath;
-  schema: ComponentSchema;
-  cause: unknown;
-  constructor(cause: unknown, path: ReadonlyPropPath, schema: ComponentSchema) {
-    super(`field error at ${path.join('.')}`, { cause });
-    this.path = path;
-    this.schema = schema;
-    this.cause = cause;
-  }
-}
+import { PropValidationError } from './prop-validation-error';
 
 function toFormFieldStoredValue(
   val: JsonYamlValue | undefined

packages/keystatic/src/form/prop-validation-error.ts

@@ -0,0 +1,14 @@
+import type { ComponentSchema } from './api';
+import type { ReadonlyPropPath } from './fields/document/DocumentEditor/component-blocks/utils';
+
+export class PropValidationError extends Error {
+  path: ReadonlyPropPath;
+  schema: ComponentSchema;
+  cause: unknown;
+  constructor(cause: unknown, path: ReadonlyPropPath, schema: ComponentSchema) {
+    super(`field error at ${path.join('.')}`, { cause });
+    this.path = path;
+    this.schema = schema;
+    this.cause = cause;
+  }
+}

packages/keystatic/src/form/validate-array-length.ts

@@ -1,7 +1,7 @@
 import { ArrayField, ComponentSchema } from '..';
 import { ReadonlyPropPath } from './fields/document/DocumentEditor/component-blocks/utils';
 import { FieldDataError } from './fields/error';
-import { PropValidationError } from './parse-props';
+import { PropValidationError } from './prop-validation-error';
 
 export function validateArrayLength(
   schema: ArrayField<ComponentSchema>,