@fragno-dev/core 0.1.7 → 0.1.9

package/src/client/client.ts

@@ -1,7 +1,12 @@
 import { nanoquery, type FetcherStore, type MutatorStore } from "@nanostores/query";
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import { computed, task, type ReadableAtom, type Store } from "nanostores";
-import type { FragnoRouteConfig, HTTPMethod, NonGetHTTPMethod } from "../api/api";
+import type {
+  FragnoRouteConfig,
+  HTTPMethod,
+  NonGetHTTPMethod,
+  RequestThisContext,
+} from "../api/api";
 import {
   buildPath,
   extractPathParams,
@@ -16,7 +21,8 @@ import type {
   FetcherConfig,
   FragnoFragmentSharedConfig,
   FragnoPublicClientConfig,
-} from "../api/fragment-instantiation";
+  FragnoPublicConfig,
+} from "../api/shared-types";
 import { FragnoClientApiError, FragnoClientError, FragnoClientFetchError } from "./client-error";
 import type { InferOr } from "../util/types-util";
 import { parseContentType } from "../util/content-type";
@@ -26,7 +32,7 @@ import {
 } from "./internal/ndjson-streaming";
 import { addStore, getInitialData, SSR_ENABLED } from "../util/ssr";
 import { unwrapObject } from "../util/nanostores";
-import type { FragmentDefinition } from "../api/fragment-builder";
+import type { FragmentDefinition } from "../api/fragment-definition-builder";
 import {
   type AnyRouteOrFactory,
   type FlattenRouteFactories,
@@ -43,6 +49,7 @@ const STORE_SYMBOL = Symbol("fragno-store");
 
 /**
  * Extract only GET routes from a library config's routes array
+ * @internal
  */
 export type ExtractGetRoutes<
   T extends readonly FragnoRouteConfig<
@@ -70,6 +77,7 @@ export type ExtractGetRoutes<
 
 /**
  * Extract the path from a route configuration for a given method
+ * @internal
  */
 export type ExtractRoutePath<
   T extends readonly FragnoRouteConfig<
@@ -96,6 +104,9 @@ export type ExtractRoutePath<
     : never;
 }[number];
 
+/**
+ * @internal
+ */
 export type ExtractGetRoutePaths<
   T extends readonly FragnoRouteConfig<
     HTTPMethod,
@@ -107,6 +118,9 @@ export type ExtractGetRoutePaths<
   >[],
 > = ExtractRoutePath<T, "GET">;
 
+/**
+ * @internal
+ */
 export type ExtractNonGetRoutePaths<
   T extends readonly FragnoRouteConfig<
     HTTPMethod,
@@ -124,6 +138,7 @@ export type ExtractNonGetRoutePaths<
  *
  * Defaults to extracting all methods for the matching path, producing a union
  * if multiple methods exist for the same path.
+ * @internal
  */
 export type ExtractRouteByPath<
   TRoutes extends readonly FragnoRouteConfig<
@@ -153,6 +168,7 @@ export type ExtractRouteByPath<
 
 /**
  * Extract the output schema type for a specific route path from a routes array
+ * @internal
  */
 export type ExtractOutputSchemaForPath<
   TRoutes extends readonly FragnoRouteConfig<
@@ -177,6 +193,7 @@ export type ExtractOutputSchemaForPath<
 
 /**
  * Check if a path exists as a GET route in the routes array
+ * @internal
  */
 export type IsValidGetRoutePath<
   TRoutes extends readonly FragnoRouteConfig<
@@ -192,6 +209,7 @@ export type IsValidGetRoutePath<
 
 /**
  * Utility type to ensure only valid GET route paths can be used
+ * @internal
  */
 export type ValidateGetRoutePath<
   TRoutes extends readonly FragnoRouteConfig<
@@ -210,6 +228,7 @@ export type ValidateGetRoutePath<
 
 /**
  * Helper type to check if a routes array has any GET routes
+ * @internal
  */
 export type HasGetRoutes<
   T extends readonly FragnoRouteConfig<
@@ -222,6 +241,9 @@ export type HasGetRoutes<
   >[],
 > = ExtractGetRoutePaths<T> extends never ? false : true;
 
+/**
+ * @internal
+ */
 export type ObjectContainingStoreField<T extends object> = T extends Store
   ? T
   : {
@@ -230,6 +252,9 @@ export type ObjectContainingStoreField<T extends object> = T extends Store
     ? never
     : T;
 
+/**
+ * @internal
+ */
 export type FragnoStoreData<T extends object> = {
   obj: T;
   [STORE_SYMBOL]: true;
@@ -305,6 +330,9 @@ export type FragnoClientMutatorData<
   readonly _outputSchema?: TOutputSchema;
 };
 
+/**
+ * @internal
+ */
 export function buildUrl<TPath extends string>(
   config: {
     baseUrl?: string;
@@ -342,6 +370,7 @@ export function buildUrl<TPath extends string>(
  * @param path
  * @param params
  * @returns
+ * @internal
  */
 export function getCacheKey<TMethod extends HTTPMethod, TPath extends string>(
   method: TMethod,
@@ -404,6 +433,9 @@ function isStreamingResponse(response: Response): false | "ndjson" | "octet-stre
 }
 
 // Type guard to check if a hook is a GET hook
+/**
+ * @internal
+ */
 export function isGetHook<
   TPath extends string,
   TOutputSchema extends StandardSchemaV1,
@@ -421,6 +453,9 @@ export function isGetHook<
 }
 
 // Type guard to check if a hook is a mutator
+/**
+ * @internal
+ */
 export function isMutatorHook<
   TMethod extends NonGetHTTPMethod,
   TPath extends string,
@@ -446,6 +481,9 @@ export function isMutatorHook<
   );
 }
 
+/**
+ * @internal
+ */
 export function isStore<TStore extends Store>(obj: unknown): obj is FragnoStoreData<TStore> {
   return (
     typeof obj === "object" && obj !== null && STORE_SYMBOL in obj && obj[STORE_SYMBOL] === true
@@ -482,6 +520,9 @@ type OnInvalidateFn<TPath extends string> = (
   },
 ) => void;
 
+/**
+ * @internal
+ */
 export type CacheLine = {
   data: unknown;
   error: unknown;
@@ -1073,16 +1114,35 @@ export class ClientBuilder<
   }
 }
 
+/**
+ * Create a client builder for fragments using the new fragment definition API.
+ * This is the same as createClientBuilder but works with FragmentDefinition.
+ */
 export function createClientBuilder<
   TConfig,
+  TOptions extends FragnoPublicConfig,
   TDeps,
-  TServices extends Record<string, unknown>,
+  TBaseServices,
+  TServices,
+  TServiceDependencies,
+  TPrivateServices,
+  TServiceThisContext extends RequestThisContext,
+  THandlerThisContext extends RequestThisContext,
+  TRequestStorage,
   const TRoutesOrFactories extends readonly AnyRouteOrFactory[],
-  const TAdditionalContext extends Record<string, unknown>,
 >(
-  fragmentBuilder: {
-    definition: FragmentDefinition<TConfig, TDeps, TServices, TAdditionalContext>;
-  },
+  definition: FragmentDefinition<
+    TConfig,
+    TOptions,
+    TDeps,
+    TBaseServices,
+    TServices,
+    TServiceDependencies,
+    TPrivateServices,
+    TServiceThisContext,
+    THandlerThisContext,
+    TRequestStorage
+  >,
   publicConfig: FragnoPublicClientConfig,
   routesOrFactories: TRoutesOrFactories,
   authorFetcherConfig?: FetcherConfig,
@@ -1090,14 +1150,13 @@ export function createClientBuilder<
   FlattenRouteFactories<TRoutesOrFactories>,
   FragnoFragmentSharedConfig<FlattenRouteFactories<TRoutesOrFactories>>
 > {
-  const definition = fragmentBuilder.definition;
-
   // For client-side, we resolve route factories with dummy context
   // This will be removed by the bundle plugin anyway
   const dummyContext = {
     config: {} as TConfig,
     deps: {} as TDeps,
-    services: {} as TServices,
+    services: {} as TBaseServices & TServices,
+    serviceDeps: {},
   };
 
   const routes = resolveRouteFactories(dummyContext, routesOrFactories);
@@ -1119,4 +1178,5 @@ export function createClientBuilder<
 }
 
 export * from "./client-error";
-export type { FetcherConfig };
+export type { FetcherConfig, FragnoPublicClientConfig } from "../api/shared-types";
+export type { FragnoFragmentSharedConfig } from "../api/fragment-instantiator";

package/src/client/internal/fetcher-merge.ts

@@ -1,4 +1,4 @@
-import type { FetcherConfig } from "../../api/fragment-instantiation";
+import type { FetcherConfig } from "../../api/shared-types";
 
 /**
  * Merge two fetcher configurations, with user config taking precedence.

package/src/client/react.test.ts

@@ -5,8 +5,8 @@ import { z } from "zod";
 import { createClientBuilder } from "./client";
 import { useFragno, useStore, type FragnoReactStore } from "./react";
 import { defineRoute } from "../api/route";
-import { defineFragment } from "../api/fragment-builder";
-import type { FragnoPublicClientConfig } from "../mod";
+import { defineFragment } from "../api/fragment-definition-builder";
+import type { FragnoPublicClientConfig } from "./client";
 import { FragnoClientFetchNetworkError, type FragnoClientError } from "./client-error";
 import { RequestOutputContext } from "../api/request-output-context";
 import type { FetcherStore } from "@nanostores/query";

package/src/client/solid.test.ts

@@ -4,8 +4,8 @@ import { z } from "zod";
 import { createClientBuilder } from "./client";
 import { useFragno, accessorToAtom, isAccessor } from "./solid";
 import { defineRoute } from "../api/route";
-import { defineFragment } from "../api/fragment-builder";
-import type { FragnoPublicClientConfig } from "../mod";
+import { defineFragment } from "../api/fragment-definition-builder";
+import type { FragnoPublicClientConfig } from "./client";
 import { FragnoClientUnknownApiError } from "./client-error";
 import { createSignal, createRoot } from "solid-js";
 

package/src/client/vanilla.test.ts

@@ -4,8 +4,8 @@ import { z } from "zod";
 import { createClientBuilder } from "./client";
 import { useFragno } from "./vanilla";
 import { defineRoute } from "../api/route";
-import { defineFragment } from "../api/fragment-builder";
-import type { FragnoPublicClientConfig } from "../mod";
+import { defineFragment } from "../api/fragment-definition-builder";
+import type { FragnoPublicClientConfig } from "./client";
 import { FragnoClientFetchNetworkError } from "./client-error";
 import { waitForAsyncIterator } from "../util/async";
 

package/src/client/vue.test.ts

@@ -1,8 +1,8 @@
 import { test, expect, describe, vi, beforeEach, afterEach, assert } from "vitest";
-import { type FragnoPublicClientConfig } from "../mod";
+import { type FragnoPublicClientConfig } from "./client";
 import { createClientBuilder } from "./client";
 import { defineRoute } from "../api/route";
-import { defineFragment } from "../api/fragment-builder";
+import { defineFragment } from "../api/fragment-definition-builder";
 import { z } from "zod";
 import { refToAtom, useFragno } from "./vue";
 import { waitFor } from "@testing-library/vue";

package/src/internal/symbols.ts

@@ -0,0 +1,5 @@
+/**
+ * Not actually a symbol, since we might be dealing with multiple instances of this code.
+ * @internal
+ */
+export const instantiatedFragmentFakeSymbol = "$fragno-instantiated-fragment" as const;

package/src/mod-client.ts

@@ -0,0 +1,59 @@
+// ============================================================================
+// Client-side entry point for @fragno-dev/core
+// This file mirrors mod.ts but provides stub implementations for server-side
+// APIs that are stripped by unplugin-fragno during browser builds.
+// ============================================================================
+
+// ============================================================================
+// Fragment Definition and Instantiation
+// ============================================================================
+
+// Re-export types only
+export type {
+  FragmentDefinition,
+  ServiceContext,
+  ServiceConstructorFn,
+} from "./api/fragment-definition-builder";
+
+export type {
+  FragmentInstantiationBuilder,
+  FragnoInstantiatedFragment,
+  BoundServices,
+} from "./api/fragment-instantiator";
+
+// Stub implementation for defineFragment
+// This is stripped by unplugin-fragno in browser builds
+export function defineFragment(_name: string) {
+  return {
+    withDependencies: () => ({ withDependencies: () => ({}) }),
+    providesBaseService: () => ({ providesBaseService: () => ({}) }),
+    providesService: () => ({ providesService: () => ({}) }),
+    withRequestStorage: () => ({ withRequestStorage: () => ({}) }),
+    withExternalRequestStorage: () => ({ withExternalRequestStorage: () => ({}) }),
+    withRequestThisContext: () => ({ withRequestThisContext: () => ({}) }),
+    extend: () => ({ extend: () => ({}) }),
+    build: () => ({}),
+  };
+}
+
+// Re-export the builder class (for type compatibility)
+export { FragmentDefinitionBuilder } from "./api/fragment-definition-builder";
+
+// ============================================================================
+// Core Configuration
+// ============================================================================
+export type { FragnoPublicConfig } from "./api/shared-types";
+
+// ============================================================================
+// Route Definition
+// ============================================================================
+export {
+  defineRoute,
+  defineRoutes,
+  type RouteFactory,
+  type RouteFactoryContext,
+} from "./api/route";
+
+export type { FragnoRouteConfig, RequestThisContext } from "./api/api";
+
+export { instantiatedFragmentFakeSymbol } from "./internal/symbols";

package/src/mod.ts

@@ -1,20 +1,37 @@
-export { defineFragment, FragmentBuilder, type FragmentDefinition } from "./api/fragment-builder";
+// ============================================================================
+// Fragment Definition and Instantiation
+// ============================================================================
+export {
+  defineFragment,
+  FragmentDefinitionBuilder,
+  type FragmentDefinition,
+  type ServiceContext,
+  type ServiceConstructorFn,
+  type LinkedFragmentCallback,
+  type ExtractLinkedServices,
+} from "./api/fragment-definition-builder";
 
 export {
-  createFragment,
-  type FragnoFragmentSharedConfig,
-  type FragnoPublicConfig,
-  type FragnoPublicClientConfig,
+  instantiate,
+  type FragmentInstantiationBuilder,
   type FragnoInstantiatedFragment,
-} from "./api/fragment-instantiation";
+  type AnyFragnoInstantiatedFragment,
+  type BoundServices,
+} from "./api/fragment-instantiator";
 
-export { type FragnoRouteConfig } from "./api/api";
+// ============================================================================
+// Core Configuration
+// ============================================================================
+export type { FragnoPublicConfig } from "./api/shared-types";
 
+// ============================================================================
+// Route Definition
+// ============================================================================
 export {
   defineRoute,
   defineRoutes,
   type RouteFactory,
   type RouteFactoryContext,
-  type AnyRouteOrFactory,
-  type FlattenRouteFactories,
 } from "./api/route";
+
+export { type FragnoRouteConfig, type RequestThisContext } from "./api/api";

package/src/request/request.ts

@@ -0,0 +1,8 @@
+export { RequestInputContext } from "../api/request-input-context";
+export { RequestOutputContext } from "../api/request-output-context";
+export {
+  RequestMiddlewareInputContext,
+  RequestMiddlewareOutputContext,
+  type FragnoMiddlewareCallback,
+  type RequestMiddlewareOptions,
+} from "../api/request-middleware";