polen 0.11.0-next.15 → 0.11.0-next.17

package/src/lib/file-router/linter.ts

@@ -1,43 +1,82 @@
+import { Diagnostic } from '#lib/diagnostic/$'
+import { S } from '#lib/kit-temp/effect'
 import { Idx, Path } from '@wollybeard/kit'
 import { type Route, type RouteFile, routeIsFromIndexFile, routeToPathExpression } from './route.js'
 
-export type DiagnosticSeverity = `error` | `warning` | `info`
-
-export type Diagnostic = DiagnosticIndexConflict | DiagnosticNumberedPrefixConflict | DiagnosticNumberedPrefixOnIndex
-
-export interface DiagnosticIndexConflict {
-  type: `index-conflict`
-  severity: DiagnosticSeverity
-  message: string
-  literal: {
-    file: RouteFile
-  }
-  index: {
-    file: RouteFile
-  }
-}
-
-export interface DiagnosticNumberedPrefixConflict {
-  type: `numbered-prefix-conflict`
-  severity: DiagnosticSeverity
-  message: string
-  kept: {
-    file: RouteFile
-    order: number
-  }
-  dropped: {
-    file: RouteFile
-    order: number
-  }
-}
-
-export interface DiagnosticNumberedPrefixOnIndex {
-  type: `numbered-prefix-on-index`
-  severity: DiagnosticSeverity
-  message: string
-  file: RouteFile
-  order: number
-}
+// ============================================================================
+// Schema - File Router Diagnostics
+// ============================================================================
+
+export const DiagnosticIndexConflict = Diagnostic.create({
+  source: 'file-router',
+  name: 'index-conflict',
+  severity: 'error',
+  context: {
+    literal: S.Struct({
+      file: S.Any, // RouteFile - using Any to avoid circular dependencies
+    }),
+    index: S.Struct({
+      file: S.Any, // RouteFile
+    }),
+  },
+}).annotations({
+  identifier: 'DiagnosticIndexConflict',
+  description: 'Diagnostic for conflicting index and literal file routes',
+})
+export const makeDiagnosticIndexConflict = Diagnostic.createMake(DiagnosticIndexConflict)
+
+export const DiagnosticNumberedPrefixConflict = Diagnostic.create({
+  source: 'file-router',
+  name: 'numbered-prefix-conflict',
+  severity: 'error',
+  context: {
+    kept: S.Struct({
+      file: S.Any, // RouteFile
+      order: S.Number,
+    }),
+    dropped: S.Struct({
+      file: S.Any, // RouteFile
+      order: S.Number,
+    }),
+  },
+}).annotations({
+  identifier: 'DiagnosticNumberedPrefixConflict',
+  description: 'Diagnostic for conflicting routes with numbered prefixes',
+})
+export const makeDiagnosticNumberedPrefixConflict = Diagnostic.createMake(DiagnosticNumberedPrefixConflict)
+
+export const DiagnosticNumberedPrefixOnIndex = Diagnostic.create({
+  source: 'file-router',
+  name: 'numbered-prefix-on-index',
+  severity: 'warning',
+  context: {
+    file: S.Any, // RouteFile
+    order: S.Number,
+  },
+})
+  .annotations({
+    identifier: 'DiagnosticNumberedPrefixOnIndex',
+    description: 'Diagnostic for numbered prefix on index file that has no effect',
+  })
+
+export const makeDiagnosticNumberedPrefixOnIndex = Diagnostic.createMake(DiagnosticNumberedPrefixOnIndex)
+
+// Union of all file-router diagnostics
+export const FileRouterDiagnostic = S.Union(
+  DiagnosticIndexConflict,
+  DiagnosticNumberedPrefixConflict,
+  DiagnosticNumberedPrefixOnIndex,
+).annotations({
+  identifier: 'FileRouterDiagnostic',
+  description: 'All diagnostics that can be generated by the file router',
+})
+
+export type Diagnostic = typeof FileRouterDiagnostic.Type
+
+// Individual diagnostic types
+export type DiagnosticIndexConflict = typeof DiagnosticIndexConflict.Type
+export type DiagnosticNumberedPrefixConflict = typeof DiagnosticNumberedPrefixConflict.Type
+export type DiagnosticNumberedPrefixOnIndex = typeof DiagnosticNumberedPrefixOnIndex.Type
 
 export interface LintResult {
   diagnostics: Diagnostic[]
@@ -52,15 +91,13 @@ export const lint = (routes: Route[]): LintResult => {
   // ━ Check for numbered prefix on index files
   for (const route of routes) {
     if (routeIsFromIndexFile(route) && route.logical.order !== undefined) {
-      const diagnostic: DiagnosticNumberedPrefixOnIndex = {
-        type: `numbered-prefix-on-index`,
-        severity: `warning`,
+      const diagnostic = makeDiagnosticNumberedPrefixOnIndex({
         message: `Numbered prefix on index file has no effect. The file:\n  ${
           Path.format(route.file.path.relative)
         }\n\nhas a numbered prefix (${route.logical.order}_) which doesn't affect ordering since index files represent their parent directory.`,
         file: route.file,
         order: route.logical.order,
-      }
+      })
       diagnostics.push(diagnostic)
     }
   }
@@ -84,9 +121,7 @@ export const lint = (routes: Route[]): LintResult => {
           ? `Both files have the same order number (${kept.logical.order}). The file processed later is being kept based on processing order.`
           : `The file with lower order number (${dropped.logical.order}) is being dropped in favor of the one with higher order (${kept.logical.order}).`
 
-        const diagnostic: DiagnosticNumberedPrefixConflict = {
-          type: `numbered-prefix-conflict`,
-          severity: `error`,
+        const diagnostic = makeDiagnosticNumberedPrefixConflict({
           // dprint-ignore
           message: `Your files represent conflicting routes due to numbered prefixes. This file:\n  ${Path.format(kept.file.path.relative)}\n\nconflicts with this file:\n\n  ${Path.format(dropped.file.path.relative)}.\n\n${orderMessage}`,
           kept: {
@@ -97,7 +132,7 @@ export const lint = (routes: Route[]): LintResult => {
             file: dropped.file,
             order: dropped.logical.order!,
           },
-        }
+        })
         diagnostics.push(diagnostic)
         continue
       }
@@ -109,9 +144,7 @@ export const lint = (routes: Route[]): LintResult => {
       }
 
       // Report
-      const diagnostic: DiagnosticIndexConflict = {
-        type: `index-conflict`,
-        severity: `error`,
+      const diagnostic = makeDiagnosticIndexConflict({
         // dprint-ignore
         message: `Your files represent conflicting routes. This index file route:\n  ${Path.format(index.file.path.relative)}\n\nconflicts with this literal file route:\n\n  ${Path.format(literal.file.path.relative)}.\n\nYour index route is being ignored.`,
         literal: {
@@ -120,7 +153,7 @@ export const lint = (routes: Route[]): LintResult => {
         index: {
           file: index.file,
         },
-      }
+      })
       diagnostics.push(diagnostic)
 
       continue

package/src/lib/graph/graph.ts

@@ -21,7 +21,7 @@ export const DependencyGraph = S.Struct({
   description: 'A directed graph tracking dependencies between nodes',
 })
 
-export type DependencyGraph = S.Schema.Type<typeof DependencyGraph>
+export type DependencyGraph = typeof DependencyGraph.Type
 
 // ─── Constructors ────────────────────────────────────────────────────────────
 

package/src/lib/graphql-error/$$.ts

@@ -0,0 +1 @@
+export * from './graphql-error.js'

package/src/lib/graphql-error/$.ts

@@ -0,0 +1 @@
+export * as GraphQLError from './$$.js'

package/src/lib/graphql-error/graphql-error.ts

@@ -0,0 +1,74 @@
+import { S } from '#lib/kit-temp/effect'
+
+// ============================================================================
+// Schema
+// ============================================================================
+
+/**
+ * GraphQL source location information
+ */
+export const Location = S.Struct({
+  line: S.Number,
+  column: S.Number,
+}).annotations({
+  identifier: 'GraphQLLocation',
+  description: 'Source location in a GraphQL document',
+})
+
+/**
+ * GraphQL error structure
+ */
+export const GraphQLError = S.Struct({
+  message: S.String,
+  locations: S.optional(S.Array(Location)),
+}).annotations({
+  identifier: 'GraphQLError',
+  description: 'GraphQL validation or execution error',
+})
+
+/**
+ * Context for GraphQL validation errors
+ */
+export const ValidationContext = S.Struct({
+  example: S.Struct({
+    id: S.String,
+    path: S.String,
+  }),
+  version: S.String,
+  errors: S.Array(GraphQLError),
+}).annotations({
+  identifier: 'GraphQLValidationContext',
+  description: 'Context for GraphQL validation errors against a schema version',
+})
+
+// ============================================================================
+// Type exports
+// ============================================================================
+
+export type Location = typeof Location.Type
+export type GraphQLError = typeof GraphQLError.Type
+export type ValidationContext = typeof ValidationContext.Type
+
+// ============================================================================
+// Constructors
+// ============================================================================
+
+export const make = GraphQLError.make
+export const makeLocation = Location.make
+export const makeValidationContext = ValidationContext.make
+
+// ============================================================================
+// Type guards
+// ============================================================================
+
+export const is = S.is(GraphQLError)
+export const isLocation = S.is(Location)
+export const isValidationContext = S.is(ValidationContext)
+
+// ============================================================================
+// Codecs
+// ============================================================================
+
+export const decode = S.decode(GraphQLError)
+export const decodeSync = S.decodeSync(GraphQLError)
+export const encode = S.encode(GraphQLError)

package/src/lib/kit-temp/effect.ts

@@ -1,5 +1,9 @@
+import { Ob } from '#lib/kit-temp/$'
+import type { ReplaceProperty } from '#lib/kit-temp/ob'
+import { Obj } from '@wollybeard/kit'
 import { Schema as S } from 'effect'
 import type * as E from 'effect'
+import { isPropertySignature } from 'effect/Schema'
 import type * as EAST from 'effect/SchemaAST'
 import { isLiteral, isSuspend, isTransformation, isTypeLiteral } from 'effect/SchemaAST'
 
@@ -48,6 +52,71 @@ export namespace EffectKit {
   }
 
   export namespace Schema {
+    export type Constructor<$Schema extends Struct.$any, $InputFields> = (
+      fields: $InputFields,
+    ) => S.Schema.Type<$Schema>
+
+    export type ConstructorUsingOmitLiteral1Algo<$Schema extends Struct.$any> = (
+      fields: ConstructorFieldsUsingOmitLiteral1Algo<$Schema>,
+    ) => S.Schema.Type<$Schema>
+
+    export const pickLiteral1FieldsAsLiterals = <schema extends Struct.$any>(
+      schema: schema,
+    ): { [k in keyof PickLiteral1Fields<schema>]: S.Schema.Type<PickLiteral1Fields<schema>[k]> } => {
+      const picked = {}
+      const ast = schema.ast
+      if (isTypeLiteral(ast)) {
+        ast.propertySignatures.forEach(prop => {
+          if (isLiteral(prop.type) && prop.name !== '_tag') {
+            // @ts-expect-error - Extract the literal value, not the schema
+            picked[prop.name] = prop.type.literal
+          }
+        })
+      }
+      return picked as any
+    }
+
+    export const pickLiteral1Fields = <schema extends Struct.$any>(
+      schema: schema,
+    ): PickLiteral1Fields<schema> => {
+      const picked = {}
+      const ast = schema.ast
+      if (isTypeLiteral(ast)) {
+        ast.propertySignatures.forEach(prop => {
+          if (isLiteral(prop.type)) {
+            // @ts-expect-error
+            picked[prop.name] = schema.fields[prop.name]
+          }
+        })
+      }
+      return picked as any
+    }
+
+    // todo: omit _tag to alig with runtime
+    export type PickLiteral1Fields<$Schema extends Struct.$any> = {
+      [k in keyof Struct.ExtractFields<$Schema>]: Struct.ExtractFields<$Schema>[k] extends
+        S.Literal<infer __literals__ extends [string]> ? Struct.ExtractFields<$Schema>[k]
+        : never
+    }
+
+    // todo: omit _tag to alig with runtime
+    export type OmitLiteral1Fields<$Schema extends Struct.$any> = {
+      [k in keyof Struct.ExtractFields<$Schema>]: Struct.ExtractFields<$Schema>[k] extends
+        S.Literal<infer __literals__ extends [string]> ? never : Struct.ExtractFields<$Schema>[k]
+    }
+
+    export type GetLiteral1FieldsNames<$Schema extends Struct.$any> = keyof PickLiteral1Fields<$Schema>
+
+    export type ConstructorFieldsUsingOmitLiteral1Algo<$Schema extends Struct.$any> = $Schema extends
+      S.Struct<infer __fields__> ? S.Struct.Constructor<Omit<__fields__, GetLiteral1FieldsNames<$Schema>>>
+      : never
+
+    export type ConstructorFor<$Schema extends S.Struct<any>, $Input> = ReplaceProperty<
+      $Schema,
+      'make',
+      (fields: $Input) => S.Schema.Type<$Schema>
+    >
+
     // todo: any real usecase for this? should we be just using S.All?
     export type $any = S.Schema<any, any, any>
 

package/src/lib/kit-temp/ob.ts

@@ -6,6 +6,12 @@ export type PickWhereValueExtends<$Obj extends object, $Constraint> = {
 
 export type Values<$Obj extends object> = $Obj[keyof $Obj]
 
+export type ReplaceProperty<$Obj extends object, $Key extends keyof $Obj, $NewType> =
+  & Omit<$Obj, $Key>
+  & {
+    [_ in $Key]: $NewType
+  }
+
 export type IsEmpty<$Obj extends object> = keyof $Obj extends never ? true : false
 
 export type KeysArray<$Obj extends object> = Array<keyof $Obj>
@@ -17,3 +23,10 @@ export type OnlyKeysInArray<$Obj extends object, $KeysArray extends readonly str
 }
 
 export type Writeable<$Obj extends object> = TF.Writable<$Obj>
+
+export const mapValues = <rec extends Record<PropertyKey, any>, newValue>(
+  obj: rec,
+  fn: (value: rec[keyof rec], key: keyof rec) => newValue,
+): Record<PropertyKey, newValue> => {
+  return Object.fromEntries(Object.entries(obj).map((k, v) => [k, fn(v as any, k as any)]))
+}

package/src/lib/kit-temp/other.test.ts

@@ -216,7 +216,7 @@ describe('mergeShallow', () => {
       fc.property(
         fc.object(),
         fc.object(),
-        fc.string(),
+        fc.string().filter(k => k !== '__proto__' && k !== 'constructor' && k !== 'prototype'),
         fc.anything().filter(v => v !== undefined),
         (obj1, obj2, key, value) => {
           // Set the same key in both objects

package/src/lib/kit-temp/resource.ts

@@ -1,6 +1,5 @@
-import { S } from '#lib/kit-temp/effect'
 import { FileSystem } from '@effect/platform'
-import { Effect, Equivalence } from 'effect'
+import { Effect, Equivalence, Schema as S } from 'effect'
 import * as Path from 'node:path'
 
 // ============================================================================

package/src/lib/lifecycles/lifecycles.ts

@@ -119,7 +119,7 @@ export const create = (catalog: Catalog.Catalog): Lifecycles => {
   Catalog.fold(
     // Versioned catalog - process each versioned schema
     (versioned) => {
-      for (const schema of versioned.entries) {
+      for (const schema of Catalog.Versioned.getAll(versioned)) {
         processSchema(schema)
       }
     },

package/src/lib/react-router-effect/route-helpers.ts

@@ -1,23 +1,86 @@
 import type { ReactRouter } from '#dep/react-router/index'
 import type { React } from '#dep/react/index'
+import { Effect, Schema } from 'effect'
+import type { IsNever } from 'type-fest'
+import type { SchemaRoute, SchemaRouteConfig } from './types.js'
 
 export type RouteObjectIndexInput = RouteObjectIndexInputConfig | React.ComponentType
 export type RouteObjectIndexInputConfig = Omit<ReactRouter.IndexRouteObject, 'index' | 'children'>
 
+export type SchemaRouteIndexConfig<TSchema extends Schema.Schema.Any> =
+  & Omit<SchemaRouteConfig<TSchema>, 'index' | 'children' | 'path'>
+  & {
+    index?: true
+  }
+
 /**
- * Helper to create an index route configuration
- * @param input - Either a component or a route configuration object
+ * Helper to create an index route configuration with optional schema support
+ * @param input - Either a component or a route configuration object (optionally with schema)
  * @returns An index route object
  */
-export const routeIndex = (
-  input: RouteObjectIndexInput,
-): ReactRouter.IndexRouteObject => {
-  const routeConfig: RouteObjectIndexInputConfig = isComponentType(input) ? { Component: input } : input
-  return {
-    ...routeConfig,
+export function routeIndex<TSchema extends Schema.Schema.Any = never>(
+  input: IsNever<TSchema> extends true ? RouteObjectIndexInput
+    : SchemaRouteIndexConfig<TSchema> | React.ComponentType,
+): TSchema extends never ? ReactRouter.IndexRouteObject : SchemaRoute<TSchema> {
+  const routeConfig: any = isComponentType(input) ? { Component: input } : input
+  const { schema, loader, handle, ...restConfig } = routeConfig
+
+  // Determine route ID for index routes
+  let routeId: string | undefined = undefined
+  if (typeof restConfig.id === 'string') {
+    routeId = restConfig.id
+  } else if (restConfig.id === true) {
+    routeId = '@index'
+  }
+
+  // If no schema provided, return a regular index route
+  if (!schema) {
+    return {
+      ...restConfig,
+      ...(routeId && { id: routeId }),
+      handle,
+      loader,
+      index: true,
+      children: undefined,
+    } as any
+  }
+
+  // Schema provided - add schema handling
+  const route: any = {
+    ...restConfig,
+    ...(routeId && { id: routeId }),
     index: true,
     children: undefined,
+    handle: {
+      ...handle,
+      schema,
+      schemaId: routeId,
+    },
   }
+
+  if (loader) {
+    route.loader = async (args: any) => {
+      // Call the loader function
+      const result = loader(args)
+
+      // Check if result is an Effect or a Promise
+      let decodedData: any
+      if (Effect.isEffect(result)) {
+        // It's an Effect, run it
+        decodedData = await Effect.runPromise(result as any)
+      } else {
+        // It's a Promise, await it
+        decodedData = await result
+      }
+
+      // Encode the data for transport using the schema
+      const encodedData = Schema.encodeSync(schema as any)(decodedData as any)
+
+      return encodedData
+    }
+  }
+
+  return route as any
 }
 
 const isComponentType = (value: unknown): value is React.ComponentType => {

package/src/lib/react-router-effect/route.ts

@@ -33,10 +33,22 @@ export const route = <TSchema extends Schema.Schema.Any = never>(
 ): TSchema extends never ? ReactRouter.RouteObject : SchemaRoute<TSchema> => {
   const { schema, loader, handle, ...routeConfig } = config as any
 
+  // Determine route ID
+  let routeId: string | undefined = undefined
+  const routeIdIndexPart = config.index ? '@index' : ''
+
+  if (typeof routeConfig.id === 'string') {
+    routeId = routeConfig.id
+  } else if (routeConfig.id === true && routeConfig.path) {
+    routeId = routeConfig.path === '/' ? routeConfig.path : routeConfig.path.replace(/\/$/, '')
+    routeId += routeIdIndexPart
+  }
+
   // If no schema provided, return a regular route
   if (!schema) {
     return {
       ...routeConfig,
+      ...(routeId && { id: routeId }), // Only add id if it exists
       handle,
       loader,
     } as any
@@ -45,10 +57,11 @@ export const route = <TSchema extends Schema.Schema.Any = never>(
   // Schema provided - add schema handling
   const route: any = {
     ...routeConfig,
+    ...(routeId && { id: routeId }), // Only add id if it exists
     handle: {
       ...handle,
       schema,
-      schemaId: routeConfig.id || undefined,
+      schemaId: routeId, // Can be undefined, that's ok
     },
   }
 

package/src/lib/react-router-effect/types.ts

@@ -18,8 +18,10 @@ export interface RouteHandle {
  * Global registry of route schemas that can be augmented by route definitions.
  * This enables type-safe access to route data by ID.
  */
-export interface RouteSchemaRegistry {
-  // Routes will augment this interface
+declare global {
+  interface RouteSchemaRegistry {
+    // Routes will augment this interface
+  }
 }
 
 /**
@@ -72,7 +74,13 @@ export interface SchemaRouteConfig<TSchema extends Schema.Schema.Any> {
   handle?: Omit<SchemaRouteHandle<TSchema>, 'schema'>
 
   // Route properties
-  id?: string
+  /**
+   * Route ID for accessing data via useRouteDataById.
+   * - If string: Use this explicit ID
+   * - If false: Disable auto-generation from path
+   * - If undefined/omitted: Auto-generate from path if path exists
+   */
+  id?: string | false
   path?: string
   index?: boolean
   children?: RouteObject[]

package/src/lib/react-router-effect/use-loader-data.ts

@@ -1,6 +1,6 @@
 import { Schema } from 'effect'
 import { useLoaderData as useLoaderDataRR, useMatches } from 'react-router'
-import type { GetRouteSchema, RouteSchemaRegistry } from './types.js'
+import type { GetRouteSchema } from './types.js'
 
 /**
  * Hook that retrieves and automatically decodes loader data based on a provided Effect schema.
@@ -60,7 +60,7 @@ export function useLoaderData<TSchema extends Schema.Schema.Any>(
  * const catalog = useRouteDataById('catalog') // Type-safe!
  * ```
  */
-export function useRouteDataById<TRouteId extends keyof RouteSchemaRegistry>(
+export function useRouteData<TRouteId extends keyof RouteSchemaRegistry>(
   routeId: TRouteId,
 ): Schema.Schema.Type<GetRouteSchema<TRouteId>> {
   const matches = useMatches()
@@ -99,7 +99,7 @@ export function useRouteDataById<TRouteId extends keyof RouteSchemaRegistry>(
  * }
  * ```
  */
-export function useRouteData(): Record<string, unknown> {
+export function useRoutesData(): Record<string, unknown> {
   const matches = useMatches()
 
   return matches.reduce((acc, match) => {

package/src/lib/revision/revision.ts

@@ -16,7 +16,7 @@ export const Revision = S.TaggedStruct('Revision', {
   description: 'A revision in the schema history',
 })
 
-export type Revision = S.Schema.Type<typeof Revision>
+export type Revision = typeof Revision.Type
 
 // ============================================================================
 // Constructors

package/src/lib/schema/$.test.ts

@@ -19,7 +19,7 @@ describe('Schema', () => {
     })
 
     expect(versionedSchema._tag).toBe('SchemaVersioned')
-    expect(Version.toString(versionedSchema.version)).toBe('1.0.0')
+    expect(Version.encodeSync(versionedSchema.version)).toBe('1.0.0')
   })
 
   test('creates unversioned schema', () => {

package/src/lib/schema/schema.ts

@@ -16,7 +16,7 @@ export * as Versioned from './versioned.js'
 
 export const Schema = S.Union(Versioned.Versioned, Unversioned.Unversioned)
 
-export type Schema = S.Schema.Type<typeof Schema>
+export type Schema = typeof Schema.Type
 
 // ============================================================================
 // Type Guard

package/src/lib/schema/unversioned.ts

@@ -17,7 +17,7 @@ export const Unversioned = S.TaggedStruct('SchemaUnversioned', {
   adt: { name: 'Schema' },
 })
 
-export type Unversioned = S.Schema.Type<typeof Unversioned>
+export type Unversioned = typeof Unversioned.Type
 
 // ============================================================================
 // Constructors

package/src/lib/schema-definition/schema-definition.ts

@@ -46,7 +46,7 @@ export const SchemaDefinition = S.transformOrFail(
 // Types
 // ============================================================================
 
-export type SchemaDefinition = S.Schema.Type<typeof SchemaDefinition>
+export type SchemaDefinition = typeof SchemaDefinition.Type
 
 // ============================================================================
 // SDL Codec

package/src/lib/semver/official-release.ts

@@ -21,7 +21,7 @@ export const OfficialRelease = S.TaggedStruct('SemverOfficialRelease', {
 // Type
 // ============================================================================
 
-export type OfficialRelease = S.Schema.Type<typeof OfficialRelease>
+export type OfficialRelease = typeof OfficialRelease.Type
 
 // ============================================================================
 // Constructors

package/src/lib/semver/pre-release.ts

@@ -22,7 +22,7 @@ export const PreRelease = S.TaggedStruct('SemverPreRelease', {
 // Type
 // ============================================================================
 
-export type PreRelease = S.Schema.Type<typeof PreRelease>
+export type PreRelease = typeof PreRelease.Type
 
 // ============================================================================
 // Constructors