@fragno-dev/core 0.0.5 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +47 -55
- package/.turbo/turbo-test.log +297 -0
- package/CHANGELOG.md +15 -0
- package/dist/api/api.d.ts +1 -1
- package/dist/api/api.js +1 -1
- package/dist/{api-CBDGZiLC.d.ts → api-CAPyac52.d.ts} +3 -3
- package/dist/api-CAPyac52.d.ts.map +1 -0
- package/dist/{api-DgHfYjq2.js → api-DuzjjCT4.js} +2 -2
- package/dist/{api-DgHfYjq2.js.map → api-DuzjjCT4.js.map} +1 -1
- package/dist/client/client.d.ts +2 -2
- package/dist/client/client.js +4 -4
- package/dist/client/client.svelte.d.ts +14 -14
- package/dist/client/client.svelte.d.ts.map +1 -1
- package/dist/client/client.svelte.js +4 -4
- package/dist/client/react.d.ts +12 -12
- package/dist/client/react.d.ts.map +1 -1
- package/dist/client/react.js +6 -8
- package/dist/client/react.js.map +1 -1
- package/dist/client/solid.d.ts +45 -0
- package/dist/client/solid.d.ts.map +1 -0
- package/dist/client/solid.js +110 -0
- package/dist/client/solid.js.map +1 -0
- package/dist/client/vanilla.d.ts +21 -21
- package/dist/client/vanilla.d.ts.map +1 -1
- package/dist/client/vanilla.js +4 -4
- package/dist/client/vue.d.ts +14 -14
- package/dist/client/vue.d.ts.map +1 -1
- package/dist/client/vue.js +4 -4
- package/dist/{client-Cf53QR-z.js → client-C_Oc8hpD.js} +7 -10
- package/dist/{client-Cf53QR-z.js.map → client-C_Oc8hpD.js.map} +1 -1
- package/dist/client-DdpPMlXL.d.ts +338 -0
- package/dist/client-DdpPMlXL.d.ts.map +1 -0
- package/dist/integrations/react-ssr.js +1 -1
- package/dist/mod.d.ts +2 -2
- package/dist/mod.js +44 -6
- package/dist/mod.js.map +1 -1
- package/dist/{route-Bp6eByhz.js → route-Dq62lXqB.js} +6 -6
- package/dist/route-Dq62lXqB.js.map +1 -0
- package/dist/{ssr-B9TeIF01.js → ssr-BAhbA_3q.js} +2 -2
- package/dist/{ssr-B9TeIF01.js.map → ssr-BAhbA_3q.js.map} +1 -1
- package/package.json +21 -22
- package/src/api/fragment.ts +90 -13
- package/src/api/request-middleware.test.ts +3 -3
- package/src/api/request-output-context.ts +3 -3
- package/src/api/route.ts +1 -8
- package/src/client/client-error.test.ts +17 -1
- package/src/client/solid.test.ts +840 -0
- package/src/client/solid.ts +261 -0
- package/tsdown.config.ts +1 -0
- package/vitest.config.ts +10 -7
- package/dist/api-CBDGZiLC.d.ts.map +0 -1
- package/dist/client-XFdAy-IQ.d.ts +0 -287
- package/dist/client-XFdAy-IQ.d.ts.map +0 -1
- package/dist/integrations/astro.d.ts +0 -18
- package/dist/integrations/astro.d.ts.map +0 -1
- package/dist/integrations/astro.js +0 -16
- package/dist/integrations/astro.js.map +0 -1
- package/dist/integrations/next-js.d.ts +0 -15
- package/dist/integrations/next-js.d.ts.map +0 -1
- package/dist/integrations/next-js.js +0 -17
- package/dist/integrations/next-js.js.map +0 -1
- package/dist/integrations/svelte-kit.d.ts +0 -21
- package/dist/integrations/svelte-kit.d.ts.map +0 -1
- package/dist/integrations/svelte-kit.js +0 -18
- package/dist/integrations/svelte-kit.js.map +0 -1
- package/dist/route-Bp6eByhz.js.map +0 -1
- package/src/integrations/astro.ts +0 -17
- package/src/integrations/next-js.ts +0 -31
- package/src/integrations/svelte-kit.ts +0 -41
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-Dq62lXqB.js","names":["#path","#method","#pathParams","#searchParams","#body","#inputSchema","#shouldValidateInput","#validateInput","#aborted","#closed","#responseReadable","#writer","#encoder","#abortSubscribers","mergedHeaders","#outputSchema","routes: any[]"],"sources":["../src/api/internal/route.ts","../src/api/request-input-context.ts","../src/api/internal/response-stream.ts","../src/api/request-output-context.ts","../src/api/route.ts"],"sourcesContent":["export function getMountRoute(opts: { mountRoute?: string; name: string }) {\n const mountRoute = opts.mountRoute ?? `/api/${opts.name}`;\n\n if (mountRoute.endsWith(\"/\")) {\n return mountRoute.slice(0, -1);\n }\n\n return mountRoute;\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { ExtractPathParams } from \"./internal/path\";\nimport { FragnoApiValidationError, type HTTPMethod } from \"./api\";\n\nexport type RequestBodyType =\n | unknown // JSON\n | FormData\n | Blob\n | null\n | undefined;\n\nexport class RequestInputContext<\n TPath extends string = string,\n TInputSchema extends StandardSchemaV1 | undefined = undefined,\n> {\n readonly #path: TPath;\n readonly #method: string;\n readonly #pathParams: ExtractPathParams<TPath>;\n readonly #searchParams: URLSearchParams;\n readonly #body: RequestBodyType;\n readonly #inputSchema: TInputSchema | undefined;\n readonly #shouldValidateInput: boolean;\n\n constructor(config: {\n path: TPath;\n method: string;\n pathParams: ExtractPathParams<TPath>;\n searchParams: URLSearchParams;\n body: RequestBodyType;\n\n request?: Request;\n inputSchema?: TInputSchema;\n shouldValidateInput?: boolean;\n }) {\n this.#path = config.path;\n this.#method = config.method;\n this.#pathParams = config.pathParams;\n this.#searchParams = config.searchParams;\n this.#body = config.body;\n this.#inputSchema = config.inputSchema;\n this.#shouldValidateInput = config.shouldValidateInput ?? true;\n }\n\n /**\n * Create a RequestContext from a Request object for server-side handling\n */\n static async fromRequest<\n TPath extends string,\n TInputSchema extends StandardSchemaV1 | undefined = undefined,\n >(config: {\n request: Request;\n method: string;\n path: TPath;\n pathParams: ExtractPathParams<TPath>;\n inputSchema?: TInputSchema;\n shouldValidateInput?: boolean;\n }): Promise<RequestInputContext<TPath, TInputSchema>> {\n const url = new URL(config.request.url);\n\n // Clone the request to avoid consuming the body stream\n // TODO: Probably we should just cache the result instead\n const request = config.request.clone();\n\n // TODO: Support other body types other than json\n const json = request.body instanceof ReadableStream ? await request.json() : undefined;\n\n return new RequestInputContext({\n method: config.method,\n path: config.path,\n pathParams: config.pathParams,\n searchParams: url.searchParams,\n body: json,\n inputSchema: config.inputSchema,\n shouldValidateInput: config.shouldValidateInput,\n });\n }\n\n /**\n * Create a RequestContext for server-side rendering contexts (no Request object)\n */\n static fromSSRContext<\n TPath extends string,\n TInputSchema extends StandardSchemaV1 | undefined = undefined,\n >(\n config:\n | {\n method: \"GET\";\n path: TPath;\n pathParams: ExtractPathParams<TPath>;\n searchParams?: URLSearchParams;\n }\n | {\n method: Exclude<HTTPMethod, \"GET\">;\n path: TPath;\n pathParams: ExtractPathParams<TPath>;\n searchParams?: URLSearchParams;\n body: RequestBodyType;\n inputSchema?: TInputSchema;\n },\n ): RequestInputContext<TPath, TInputSchema> {\n return new RequestInputContext({\n method: config.method,\n path: config.path,\n pathParams: config.pathParams,\n searchParams: config.searchParams ?? new URLSearchParams(),\n body: \"body\" in config ? config.body : undefined,\n inputSchema: \"inputSchema\" in config ? config.inputSchema : undefined,\n shouldValidateInput: false, // No input validation in SSR context\n });\n }\n\n // TODO(Wilco): We should support reading/modifying headers here.\n /**\n * The HTTP method as string (e.g., `GET`, `POST`)\n */\n get method(): string {\n return this.#method;\n }\n /**\n * The matched route path (e.g., `/users/:id`)\n * @remarks `string`\n */\n get path(): TPath {\n return this.#path;\n }\n /**\n * Extracted path parameters as object (e.g., `{ id: '123' }`)\n * @remarks `Record<string, string>`\n */\n get pathParams(): ExtractPathParams<TPath> {\n return this.#pathParams;\n }\n /**\n * [URLSearchParams](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) object for query parameters\n * @remarks `URLSearchParams`\n */\n get query(): URLSearchParams {\n return this.#searchParams;\n }\n // TODO: Should probably remove this\n /**\n * @internal\n */\n get rawBody(): RequestBodyType {\n return this.#body;\n }\n /**\n * Input validation context (only if inputSchema is defined)\n * @remarks `InputContext`\n */\n get input(): TInputSchema extends undefined\n ? undefined\n : {\n schema: TInputSchema;\n valid: () => Promise<\n TInputSchema extends StandardSchemaV1\n ? StandardSchemaV1.InferOutput<TInputSchema>\n : unknown\n >;\n } {\n if (!this.#inputSchema) {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n return undefined as any;\n }\n\n return {\n schema: this.#inputSchema,\n valid: async () => {\n if (!this.#shouldValidateInput) {\n // In SSR context, return the body directly without validation\n return this.#body;\n }\n\n return this.#validateInput();\n },\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n } as any;\n }\n\n async #validateInput(): Promise<\n TInputSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TInputSchema> : never\n > {\n if (!this.#inputSchema) {\n throw new Error(\"No input schema defined for this route\");\n }\n\n if (this.#body instanceof FormData || this.#body instanceof Blob) {\n throw new Error(\"Schema validation is only supported for JSON data, not FormData or Blob\");\n }\n\n const result = await this.#inputSchema[\"~standard\"].validate(this.#body);\n\n if (result.issues) {\n throw new FragnoApiValidationError(\"Validation failed\", result.issues);\n }\n\n return result.value as TInputSchema extends StandardSchemaV1\n ? StandardSchemaV1.InferOutput<TInputSchema>\n : never;\n }\n}\n","/**\n * @module\n * Stream utility.\n *\n * Modified from honojs/hono\n * Original source: https://github.com/honojs/hono/blob/0e3db674ad3f40be215a55a18062dd8e387ce525/src/utils/stream.ts\n * License: MIT\n * Date obtained: August 28 2025\n * Copyright (c) 2021-present Yusuke Wada and Hono contributors\n */\n\ntype Error<Message extends string> = { __errorMessage: Message };\n\nexport class ResponseStream<TArray> {\n #writer: WritableStreamDefaultWriter<Uint8Array>;\n #encoder: TextEncoder;\n #abortSubscribers: (() => void | Promise<void>)[] = [];\n #responseReadable: ReadableStream;\n\n #aborted: boolean = false;\n #closed: boolean = false;\n\n /**\n * Whether the stream has been aborted.\n */\n get aborted(): boolean {\n return this.#aborted;\n }\n\n /**\n * Whether the stream has been closed normally.\n */\n get closed(): boolean {\n return this.#closed;\n }\n\n /**\n * The readable stream that the response is piped to.\n */\n get responseReadable(): ReadableStream {\n return this.#responseReadable;\n }\n\n constructor(writable: WritableStream, readable: ReadableStream) {\n this.#writer = writable.getWriter();\n this.#encoder = new TextEncoder();\n const reader = readable.getReader();\n\n // in case the user disconnects, let the reader know to cancel\n // this in-turn results in responseReadable being closed\n // and writeSSE method no longer blocks indefinitely\n this.#abortSubscribers.push(async () => {\n await reader.cancel();\n });\n\n this.#responseReadable = new ReadableStream({\n async pull(controller) {\n const { done, value } = await reader.read();\n if (done) {\n controller.close();\n } else {\n controller.enqueue(value);\n }\n },\n cancel: () => {\n this.abort();\n },\n });\n }\n\n async writeRaw(input: Uint8Array | string): Promise<void> {\n try {\n if (typeof input === \"string\") {\n input = this.#encoder.encode(input);\n }\n await this.#writer.write(input);\n } catch {\n // Do nothing.\n }\n }\n\n write(\n input: TArray extends (infer U)[]\n ? U\n : Error<\"To use a streaming response, outputSchema must be an array.\">,\n ): Promise<void> {\n return this.writeRaw(JSON.stringify(input) + \"\\n\");\n }\n\n sleep(ms: number): Promise<unknown> {\n return new Promise((res) => setTimeout(res, ms));\n }\n\n async close() {\n try {\n await this.#writer.close();\n } catch {\n // Do nothing. If you want to handle errors, create a stream by yourself.\n } finally {\n this.#closed = true;\n }\n }\n\n onAbort(listener: () => void | Promise<void>) {\n this.#abortSubscribers.push(listener);\n }\n\n /**\n * Abort the stream.\n * You can call this method when stream is aborted by external event.\n */\n abort() {\n if (!this.aborted) {\n this.#aborted = true;\n this.#abortSubscribers.forEach((subscriber) => subscriber());\n }\n }\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { ContentlessStatusCode, StatusCode } from \"../http/http-status\";\nimport { ResponseStream } from \"./internal/response-stream\";\nimport type { InferOrUnknown } from \"../util/types-util\";\n\nexport type ResponseData = string | ArrayBuffer | ReadableStream | Uint8Array<ArrayBuffer>;\n\ninterface ResponseInit<T extends StatusCode = StatusCode> {\n headers?: HeadersInit;\n status?: T;\n statusText?: string;\n}\n\n/**\n * Utility function to merge headers from multiple sources.\n * Later headers override earlier ones.\n */\nfunction mergeHeaders(...headerSources: (HeadersInit | undefined)[]): HeadersInit | undefined {\n const mergedHeaders = new Headers();\n\n for (const headerSource of headerSources) {\n if (!headerSource) continue;\n\n if (headerSource instanceof Headers) {\n for (const [key, value] of headerSource.entries()) {\n mergedHeaders.set(key, value);\n }\n } else if (Array.isArray(headerSource)) {\n for (const [key, value] of headerSource) {\n mergedHeaders.set(key, value);\n }\n } else {\n for (const [key, value] of Object.entries(headerSource)) {\n mergedHeaders.set(key, value);\n }\n }\n }\n\n return mergedHeaders;\n}\n\nexport abstract class OutputContext<const TOutput, const TErrorCode extends string> {\n /**\n * Creates an error response.\n *\n * Shortcut for `throw new FragnoApiError(...)`\n */\n error(\n { message, code }: { message: string; code: TErrorCode },\n initOrStatus?: ResponseInit | StatusCode,\n headers?: HeadersInit,\n ): Response {\n if (typeof initOrStatus === \"undefined\") {\n return Response.json({ message: message, code }, { status: 500, headers });\n }\n\n if (typeof initOrStatus === \"number\") {\n return Response.json({ message: message, code }, { status: initOrStatus, headers });\n }\n\n const mergedHeaders = mergeHeaders(initOrStatus.headers, headers);\n return Response.json(\n { message: message, code },\n { status: initOrStatus.status, headers: mergedHeaders },\n );\n }\n\n empty(\n initOrStatus?: ResponseInit<ContentlessStatusCode> | ContentlessStatusCode,\n headers?: HeadersInit,\n ): Response {\n const defaultHeaders = {};\n\n if (typeof initOrStatus === \"undefined\") {\n const mergedHeaders = mergeHeaders(defaultHeaders, headers);\n return Response.json(null, {\n status: 201,\n headers: mergedHeaders,\n });\n }\n\n if (typeof initOrStatus === \"number\") {\n const mergedHeaders = mergeHeaders(defaultHeaders, headers);\n return Response.json(null, {\n status: initOrStatus,\n headers: mergedHeaders,\n });\n }\n\n const mergedHeaders = mergeHeaders(defaultHeaders, initOrStatus.headers, headers);\n return Response.json(null, {\n status: initOrStatus.status,\n headers: mergedHeaders,\n });\n }\n\n json(object: TOutput, initOrStatus?: ResponseInit | StatusCode, headers?: HeadersInit): Response {\n if (typeof initOrStatus === \"undefined\") {\n return Response.json(object, {\n status: 200,\n headers,\n });\n }\n\n if (typeof initOrStatus === \"number\") {\n return Response.json(object, {\n status: initOrStatus,\n headers,\n });\n }\n\n const mergedHeaders = mergeHeaders(initOrStatus.headers, headers);\n return Response.json(object, {\n status: initOrStatus.status,\n headers: mergedHeaders,\n });\n }\n\n jsonStream = (\n cb: (stream: ResponseStream<TOutput>) => void | Promise<void>,\n {\n onError,\n headers,\n }: {\n onError?: (error: Error, stream: ResponseStream<TOutput>) => void | Promise<void>;\n headers?: HeadersInit;\n } = {},\n ): Response => {\n // Note: this is intentionally an arrow function (=>) to keep `this` context.\n const defaultHeaders = {\n \"content-type\": \"application/x-ndjson; charset=utf-8\",\n \"transfer-encoding\": \"chunked\",\n \"cache-control\": \"no-cache\",\n };\n\n const { readable, writable } = new TransformStream();\n const stream = new ResponseStream(writable, readable);\n\n (async () => {\n try {\n await cb(stream);\n } catch (e) {\n if (e === undefined) {\n // If reading is canceled without a reason value (e.g. by StreamingApi)\n // then the .pipeTo() promise will reject with undefined.\n // In this case, do nothing because the stream is already closed.\n } else if (e instanceof Error && onError) {\n await onError(e, stream);\n } else {\n console.error(e);\n }\n } finally {\n stream.close();\n }\n })();\n\n return new Response(stream.responseReadable, {\n status: 200,\n headers: mergeHeaders(defaultHeaders, headers),\n });\n };\n}\n\nexport class RequestOutputContext<\n const TOutputSchema extends StandardSchemaV1 | undefined = undefined,\n const TErrorCode extends string = string,\n> extends OutputContext<InferOrUnknown<TOutputSchema>, TErrorCode> {\n // eslint-disable-next-line no-unused-private-class-members\n #outputSchema?: TOutputSchema;\n\n constructor(outputSchema?: TOutputSchema) {\n super();\n this.#outputSchema = outputSchema;\n }\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { FragnoRouteConfig, HTTPMethod } from \"./api\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyFragnoRouteConfig = FragnoRouteConfig<HTTPMethod, string, any, any, any, any>;\n\nexport interface RouteFactoryContext<TConfig, TDeps, TServices> {\n config: TConfig;\n deps: TDeps;\n services: TServices;\n}\n\nexport type RouteFactory<\n TConfig,\n TDeps,\n TServices,\n TRoutes extends readonly FragnoRouteConfig<\n HTTPMethod,\n string,\n StandardSchemaV1 | undefined,\n StandardSchemaV1 | undefined,\n string,\n string\n >[],\n> = (context: RouteFactoryContext<TConfig, TDeps, TServices>) => TRoutes;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyRouteOrFactory = AnyFragnoRouteConfig | RouteFactory<any, any, any, any>;\n\nexport type FlattenRouteFactories<T extends readonly AnyRouteOrFactory[]> = T extends readonly [\n infer First,\n ...infer Rest extends readonly AnyRouteOrFactory[],\n]\n ? // eslint-disable-next-line @typescript-eslint/no-explicit-any\n First extends RouteFactory<any, any, any, infer TRoutes>\n ? [...TRoutes, ...FlattenRouteFactories<Rest>]\n : [First, ...FlattenRouteFactories<Rest>]\n : [];\n\n// Helper to resolve route factories into routes\nexport function resolveRouteFactories<\n TConfig,\n TDeps,\n TServices,\n const TRoutesOrFactories extends readonly AnyRouteOrFactory[],\n>(\n context: RouteFactoryContext<TConfig, TDeps, TServices>,\n routesOrFactories: TRoutesOrFactories,\n): FlattenRouteFactories<TRoutesOrFactories> {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n const routes: any[] = [];\n\n for (const item of routesOrFactories) {\n if (typeof item === \"function\") {\n // It's a route factory\n const factoryRoutes = item(context);\n routes.push(...factoryRoutes);\n } else {\n // It's a direct route\n routes.push(item);\n }\n }\n\n return routes as FlattenRouteFactories<TRoutesOrFactories>;\n}\n\n// TODO(Wilco): Do these overloads actually do anything?\n// TODO(Wilco): ValidPath<T> should be added back in here.\n\n// Overload for routes without inputSchema\nexport function defineRoute<\n const TMethod extends HTTPMethod,\n const TPath extends string,\n const TOutputSchema extends StandardSchemaV1 | undefined,\n const TErrorCode extends string = string,\n const TQueryParameters extends string = string,\n>(\n config: FragnoRouteConfig<\n TMethod,\n TPath,\n undefined,\n TOutputSchema,\n TErrorCode,\n TQueryParameters\n > & { inputSchema?: undefined },\n): FragnoRouteConfig<TMethod, TPath, undefined, TOutputSchema, TErrorCode, TQueryParameters>;\n\n// Overload for routes with inputSchema\nexport function defineRoute<\n const TMethod extends HTTPMethod,\n const TPath extends string,\n const TInputSchema extends StandardSchemaV1,\n const TOutputSchema extends StandardSchemaV1 | undefined,\n const TErrorCode extends string = string,\n const TQueryParameters extends string = string,\n>(\n config: FragnoRouteConfig<\n TMethod,\n TPath,\n TInputSchema,\n TOutputSchema,\n TErrorCode,\n TQueryParameters\n > & { inputSchema: TInputSchema },\n): FragnoRouteConfig<TMethod, TPath, TInputSchema, TOutputSchema, TErrorCode, TQueryParameters>;\n\n// implementation\nexport function defineRoute<\n const TMethod extends HTTPMethod,\n const TPath extends string,\n const TInputSchema extends StandardSchemaV1 | undefined,\n const TOutputSchema extends StandardSchemaV1 | undefined,\n const TErrorCode extends string = string,\n const TQueryParameters extends string = string,\n>(\n config: FragnoRouteConfig<\n TMethod,\n TPath,\n TInputSchema,\n TOutputSchema,\n TErrorCode,\n TQueryParameters\n >,\n): FragnoRouteConfig<TMethod, TPath, TInputSchema, TOutputSchema, TErrorCode, TQueryParameters> {\n return config;\n}\n\nexport function defineRoutes<TConfig = {}, TDeps = {}, TServices = {}>() {\n return {\n create: <\n const TRoutes extends readonly FragnoRouteConfig<\n HTTPMethod,\n string,\n StandardSchemaV1 | undefined,\n StandardSchemaV1 | undefined,\n string,\n string\n >[],\n >(\n fn: (context: RouteFactoryContext<TConfig, TDeps, TServices>) => TRoutes,\n ): RouteFactory<TConfig, TDeps, TServices, TRoutes> => {\n return fn;\n },\n };\n}\n"],"mappings":"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"}
|
|
@@ -44,5 +44,5 @@ async function getFinalStoreValues() {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
//#endregion
|
|
47
|
-
export {
|
|
48
|
-
//# sourceMappingURL=ssr-
|
|
47
|
+
export { getInitialData as a, getFinalStoreValues as i, addStore as n, hydrateFromWindow as o, cleanStores as r, SSR_ENABLED as t };
|
|
48
|
+
//# sourceMappingURL=ssr-BAhbA_3q.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr-
|
|
1
|
+
{"version":3,"file":"ssr-BAhbA_3q.js","names":["stores: FetcherStore[]","clientInitialData: Map<string, unknown> | undefined","stores"],"sources":["../src/util/ssr.ts"],"sourcesContent":["import { allTasks } from \"nanostores\";\nimport type { FetcherStore } from \"@nanostores/query\";\n\nlet stores: FetcherStore[] = [];\n\nexport const SSR_ENABLED = false;\n\nexport function getStores() {\n return stores;\n}\n\nexport function addStore(store: FetcherStore) {\n stores.push(store);\n}\n\nexport function cleanStores() {\n stores = [];\n}\n\n// Client side\ndeclare global {\n interface Window {\n __FRAGNO_INITIAL_DATA__?: [string, unknown][];\n }\n}\n\nlet clientInitialData: Map<string, unknown> | undefined;\n\nexport function hydrateFromWindow() {\n if (typeof window !== \"undefined\" && window.__FRAGNO_INITIAL_DATA__) {\n clientInitialData = new Map(window.__FRAGNO_INITIAL_DATA__);\n delete window.__FRAGNO_INITIAL_DATA__;\n console.warn(\"hydrateFromWindow\", {\n clientInitialData: Array.from(clientInitialData.entries()),\n });\n }\n}\n\nexport function getInitialData(key: string): unknown | undefined {\n if (clientInitialData?.has(key)) {\n const data = clientInitialData.get(key);\n clientInitialData.delete(key);\n return data;\n }\n return undefined;\n}\n\nfunction listenToStores(): void {\n for (const store of getStores()) {\n // By calling `listen`, we trigger the fetcher function of the store.\n // This will start the data fetching process on the server.\n // We don't need to do anything with the return value of `listen`, as we\n // are only interested in starting the data fetching.\n store.listen(() => {});\n }\n}\n\n// Server side\nexport async function getFinalStoreValues(): Promise<Map<string, unknown>> {\n listenToStores();\n await allTasks();\n\n const stores = getStores();\n const storesInitialValue = new Map<string, unknown>();\n\n for (const store of stores) {\n const value = store.get();\n if (!value || !store.key || value.loading) {\n continue;\n }\n storesInitialValue.set(store.key, value.data);\n }\n\n return storesInitialValue;\n}\n"],"mappings":";;;AAGA,IAAIA,SAAyB,EAAE;AAE/B,MAAa,cAAc;AAE3B,SAAgB,YAAY;AAC1B,QAAO;;AAGT,SAAgB,SAAS,OAAqB;AAC5C,QAAO,KAAK,MAAM;;AAGpB,SAAgB,cAAc;AAC5B,UAAS,EAAE;;AAUb,IAAIC;AAEJ,SAAgB,oBAAoB;AAClC,KAAI,OAAO,WAAW,eAAe,OAAO,yBAAyB;AACnE,sBAAoB,IAAI,IAAI,OAAO,wBAAwB;AAC3D,SAAO,OAAO;AACd,UAAQ,KAAK,qBAAqB,EAChC,mBAAmB,MAAM,KAAK,kBAAkB,SAAS,CAAC,EAC3D,CAAC;;;AAIN,SAAgB,eAAe,KAAkC;AAC/D,KAAI,mBAAmB,IAAI,IAAI,EAAE;EAC/B,MAAM,OAAO,kBAAkB,IAAI,IAAI;AACvC,oBAAkB,OAAO,IAAI;AAC7B,SAAO;;;AAKX,SAAS,iBAAuB;AAC9B,MAAK,MAAM,SAAS,WAAW,CAK7B,OAAM,aAAa,GAAG;;AAK1B,eAAsB,sBAAqD;AACzE,iBAAgB;AAChB,OAAM,UAAU;CAEhB,MAAMC,WAAS,WAAW;CAC1B,MAAM,qCAAqB,IAAI,KAAsB;AAErD,MAAK,MAAM,SAASA,UAAQ;EAC1B,MAAM,QAAQ,MAAM,KAAK;AACzB,MAAI,CAAC,SAAS,CAAC,MAAM,OAAO,MAAM,QAChC;AAEF,qBAAmB,IAAI,MAAM,KAAK,MAAM,KAAK;;AAG/C,QAAO"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fragno-dev/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.7",
|
|
4
4
|
"exports": {
|
|
5
5
|
".": {
|
|
6
6
|
"bun": "./src/mod.ts",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"default": "./dist/client/client.js"
|
|
22
22
|
},
|
|
23
23
|
"./react": {
|
|
24
|
-
"bun": "./src/client/react.
|
|
24
|
+
"bun": "./src/client/react.ts",
|
|
25
25
|
"development": "./src/client/react.ts",
|
|
26
26
|
"types": "./dist/client/react.d.ts",
|
|
27
27
|
"default": "./dist/client/react.js"
|
|
@@ -44,17 +44,11 @@
|
|
|
44
44
|
"types": "./dist/client/client.svelte.d.ts",
|
|
45
45
|
"default": "./dist/client/client.svelte.js"
|
|
46
46
|
},
|
|
47
|
-
"./
|
|
48
|
-
"bun": "./src/
|
|
49
|
-
"development": "./src/
|
|
50
|
-
"types": "./dist/
|
|
51
|
-
"default": "./dist/
|
|
52
|
-
},
|
|
53
|
-
"./next-js": {
|
|
54
|
-
"bun": "./src/integrations/next-js.ts",
|
|
55
|
-
"development": "./src/integrations/next-js.ts",
|
|
56
|
-
"types": "./dist/integrations/next-js.d.ts",
|
|
57
|
-
"default": "./dist/integrations/next-js.js"
|
|
47
|
+
"./solid": {
|
|
48
|
+
"bun": "./src/client/solid.ts",
|
|
49
|
+
"development": "./src/client/solid.ts",
|
|
50
|
+
"types": "./dist/client/solid.d.ts",
|
|
51
|
+
"default": "./dist/client/solid.js"
|
|
58
52
|
},
|
|
59
53
|
"./react-ssr": {
|
|
60
54
|
"bun": "./src/integrations/react-ssr.ts",
|
|
@@ -62,12 +56,6 @@
|
|
|
62
56
|
"types": "./dist/integrations/react-ssr.d.ts",
|
|
63
57
|
"default": "./dist/integrations/react-ssr.js"
|
|
64
58
|
},
|
|
65
|
-
"./svelte-kit": {
|
|
66
|
-
"bun": "./src/integrations/svelte-kit.ts",
|
|
67
|
-
"development": "./src/integrations/svelte-kit.ts",
|
|
68
|
-
"types": "./dist/integrations/svelte-kit.d.ts",
|
|
69
|
-
"default": "./dist/integrations/svelte-kit.js"
|
|
70
|
-
},
|
|
71
59
|
"./package.json": "./package.json"
|
|
72
60
|
},
|
|
73
61
|
"main": "./dist/mod.js",
|
|
@@ -76,17 +64,21 @@
|
|
|
76
64
|
"scripts": {
|
|
77
65
|
"build": "tsdown",
|
|
78
66
|
"build:watch": "tsdown --watch",
|
|
79
|
-
"types:check": "tsc --noEmit"
|
|
67
|
+
"types:check": "tsc --noEmit",
|
|
68
|
+
"test": "vitest run",
|
|
69
|
+
"test:watch": "vitest --watch"
|
|
80
70
|
},
|
|
81
71
|
"type": "module",
|
|
82
72
|
"dependencies": {
|
|
83
73
|
"@nanostores/query": "^0.3.4",
|
|
74
|
+
"@nanostores/solid": "^1.1.1",
|
|
84
75
|
"@standard-schema/spec": "^1.0.0",
|
|
85
76
|
"nanostores": "^1.0.1",
|
|
86
77
|
"rou3": "^0.7.3"
|
|
87
78
|
},
|
|
88
79
|
"devDependencies": {
|
|
89
80
|
"@fragno-private/typescript-config": "0.0.1",
|
|
81
|
+
"@fragno-private/vitest-config": "0.0.0",
|
|
90
82
|
"@sveltejs/vite-plugin-svelte": "^6.2.0",
|
|
91
83
|
"@testing-library/react": "^16.3.0",
|
|
92
84
|
"@testing-library/svelte": "^5.2.8",
|
|
@@ -94,17 +86,21 @@
|
|
|
94
86
|
"@types/node": "^22",
|
|
95
87
|
"@types/react": "^19.0.0",
|
|
96
88
|
"@types/react-dom": "^19.0.0",
|
|
97
|
-
"
|
|
89
|
+
"@vitest/coverage-istanbul": "^3.2.4",
|
|
90
|
+
"happy-dom": "^20.0.0",
|
|
98
91
|
"react": "^19.0.0",
|
|
99
92
|
"react-dom": "^19.0.0",
|
|
100
93
|
"svelte": "^5.1.0",
|
|
94
|
+
"solid-js": "^1.9.3",
|
|
95
|
+
"vitest": "^3.2.4",
|
|
101
96
|
"vue": "^3",
|
|
102
97
|
"zod": "^4.0.5"
|
|
103
98
|
},
|
|
104
99
|
"peerDependencies": {
|
|
105
100
|
"react": "^19.0.0",
|
|
106
101
|
"vue": "^3",
|
|
107
|
-
"svelte": "^5"
|
|
102
|
+
"svelte": "^5",
|
|
103
|
+
"solid-js": "^1.0.0"
|
|
108
104
|
},
|
|
109
105
|
"peerDependenciesMeta": {
|
|
110
106
|
"react": {
|
|
@@ -115,6 +111,9 @@
|
|
|
115
111
|
},
|
|
116
112
|
"svelte": {
|
|
117
113
|
"optional": true
|
|
114
|
+
},
|
|
115
|
+
"solid-js": {
|
|
116
|
+
"optional": true
|
|
118
117
|
}
|
|
119
118
|
},
|
|
120
119
|
"repository": {
|
package/src/api/fragment.ts
CHANGED
|
@@ -7,7 +7,6 @@ import { RequestInputContext } from "./request-input-context";
|
|
|
7
7
|
import type { ExtractPathParams } from "./internal/path";
|
|
8
8
|
import { RequestOutputContext } from "./request-output-context";
|
|
9
9
|
import {
|
|
10
|
-
type EmptyObject,
|
|
11
10
|
type AnyFragnoRouteConfig,
|
|
12
11
|
type AnyRouteOrFactory,
|
|
13
12
|
type FlattenRouteFactories,
|
|
@@ -28,14 +27,54 @@ export interface FragnoPublicClientConfig {
|
|
|
28
27
|
baseUrl?: string;
|
|
29
28
|
}
|
|
30
29
|
|
|
30
|
+
type AstroHandlers = {
|
|
31
|
+
ALL: (req: Request) => Promise<Response>;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
type ReactRouterHandlers = {
|
|
35
|
+
loader: (args: { request: Request }) => Promise<Response>;
|
|
36
|
+
action: (args: { request: Request }) => Promise<Response>;
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
type SolidStartHandlers = {
|
|
40
|
+
GET: (args: { request: Request }) => Promise<Response>;
|
|
41
|
+
POST: (args: { request: Request }) => Promise<Response>;
|
|
42
|
+
PUT: (args: { request: Request }) => Promise<Response>;
|
|
43
|
+
DELETE: (args: { request: Request }) => Promise<Response>;
|
|
44
|
+
PATCH: (args: { request: Request }) => Promise<Response>;
|
|
45
|
+
HEAD: (args: { request: Request }) => Promise<Response>;
|
|
46
|
+
OPTIONS: (args: { request: Request }) => Promise<Response>;
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
type StandardHandlers = {
|
|
50
|
+
GET: (req: Request) => Promise<Response>;
|
|
51
|
+
POST: (req: Request) => Promise<Response>;
|
|
52
|
+
PUT: (req: Request) => Promise<Response>;
|
|
53
|
+
DELETE: (req: Request) => Promise<Response>;
|
|
54
|
+
PATCH: (req: Request) => Promise<Response>;
|
|
55
|
+
HEAD: (req: Request) => Promise<Response>;
|
|
56
|
+
OPTIONS: (req: Request) => Promise<Response>;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
type HandlersByFramework = {
|
|
60
|
+
astro: AstroHandlers;
|
|
61
|
+
"react-router": ReactRouterHandlers;
|
|
62
|
+
"next-js": StandardHandlers;
|
|
63
|
+
"svelte-kit": StandardHandlers;
|
|
64
|
+
"solid-start": SolidStartHandlers;
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
type FullstackFrameworks = keyof HandlersByFramework;
|
|
68
|
+
|
|
31
69
|
export interface FragnoInstantiatedFragment<
|
|
32
70
|
TRoutes extends readonly AnyFragnoRouteConfig[] = [],
|
|
33
|
-
TDeps =
|
|
71
|
+
TDeps = {},
|
|
34
72
|
TServices extends Record<string, unknown> = Record<string, unknown>,
|
|
35
73
|
> {
|
|
36
74
|
config: FragnoFragmentSharedConfig<TRoutes>;
|
|
37
75
|
deps: TDeps;
|
|
38
76
|
services: TServices;
|
|
77
|
+
handlersFor: <T extends FullstackFrameworks>(framework: T) => HandlersByFramework[T];
|
|
39
78
|
handler: (req: Request) => Promise<Response>;
|
|
40
79
|
mountRoute: string;
|
|
41
80
|
withMiddleware: (
|
|
@@ -61,21 +100,13 @@ export type AnyFragnoFragmentSharedConfig = FragnoFragmentSharedConfig<
|
|
|
61
100
|
readonly AnyFragnoRouteConfig[]
|
|
62
101
|
>;
|
|
63
102
|
|
|
64
|
-
interface FragmentDefinition<
|
|
65
|
-
TConfig,
|
|
66
|
-
TDeps = EmptyObject,
|
|
67
|
-
TServices extends Record<string, unknown> = EmptyObject,
|
|
68
|
-
> {
|
|
103
|
+
interface FragmentDefinition<TConfig, TDeps = {}, TServices extends Record<string, unknown> = {}> {
|
|
69
104
|
name: string;
|
|
70
105
|
dependencies?: (config: TConfig) => TDeps;
|
|
71
106
|
services?: (config: TConfig, deps: TDeps) => TServices;
|
|
72
107
|
}
|
|
73
108
|
|
|
74
|
-
export class FragmentBuilder<
|
|
75
|
-
TConfig,
|
|
76
|
-
TDeps = EmptyObject,
|
|
77
|
-
TServices extends Record<string, unknown> = EmptyObject,
|
|
78
|
-
> {
|
|
109
|
+
export class FragmentBuilder<TConfig, TDeps = {}, TServices extends Record<string, unknown> = {}> {
|
|
79
110
|
#definition: FragmentDefinition<TConfig, TDeps, TServices>;
|
|
80
111
|
|
|
81
112
|
constructor(definition: FragmentDefinition<TConfig, TDeps, TServices>) {
|
|
@@ -105,7 +136,6 @@ export class FragmentBuilder<
|
|
|
105
136
|
}
|
|
106
137
|
}
|
|
107
138
|
|
|
108
|
-
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
|
|
109
139
|
export function defineFragment<TConfig = {}>(name: string): FragmentBuilder<TConfig> {
|
|
110
140
|
return new FragmentBuilder({
|
|
111
141
|
name,
|
|
@@ -179,6 +209,53 @@ export function createFragment<
|
|
|
179
209
|
|
|
180
210
|
return fragment;
|
|
181
211
|
},
|
|
212
|
+
handlersFor: <T extends FullstackFrameworks>(framework: T): HandlersByFramework[T] => {
|
|
213
|
+
const handler = fragment.handler;
|
|
214
|
+
|
|
215
|
+
// LLMs hallucinate these values sometimes, solution isn't obvious so we throw this error
|
|
216
|
+
// @ts-expect-error TS2367
|
|
217
|
+
if (framework === "h3" || framework === "nuxt") {
|
|
218
|
+
throw new Error(`To get handlers for h3, use the 'fromWebHandler' utility function:
|
|
219
|
+
import { fromWebHandler } from "h3";
|
|
220
|
+
export default fromWebHandler(myFragment().handler);`);
|
|
221
|
+
}
|
|
222
|
+
const allHandlers = {
|
|
223
|
+
astro: { ALL: handler },
|
|
224
|
+
"react-router": {
|
|
225
|
+
loader: ({ request }: { request: Request }) => handler(request),
|
|
226
|
+
action: ({ request }: { request: Request }) => handler(request),
|
|
227
|
+
},
|
|
228
|
+
"next-js": {
|
|
229
|
+
GET: handler,
|
|
230
|
+
POST: handler,
|
|
231
|
+
PUT: handler,
|
|
232
|
+
DELETE: handler,
|
|
233
|
+
PATCH: handler,
|
|
234
|
+
HEAD: handler,
|
|
235
|
+
OPTIONS: handler,
|
|
236
|
+
},
|
|
237
|
+
"svelte-kit": {
|
|
238
|
+
GET: handler,
|
|
239
|
+
POST: handler,
|
|
240
|
+
PUT: handler,
|
|
241
|
+
DELETE: handler,
|
|
242
|
+
PATCH: handler,
|
|
243
|
+
HEAD: handler,
|
|
244
|
+
OPTIONS: handler,
|
|
245
|
+
},
|
|
246
|
+
"solid-start": {
|
|
247
|
+
GET: ({ request }: { request: Request }) => handler(request),
|
|
248
|
+
POST: ({ request }: { request: Request }) => handler(request),
|
|
249
|
+
PUT: ({ request }: { request: Request }) => handler(request),
|
|
250
|
+
DELETE: ({ request }: { request: Request }) => handler(request),
|
|
251
|
+
PATCH: ({ request }: { request: Request }) => handler(request),
|
|
252
|
+
HEAD: ({ request }: { request: Request }) => handler(request),
|
|
253
|
+
OPTIONS: ({ request }: { request: Request }) => handler(request),
|
|
254
|
+
},
|
|
255
|
+
} satisfies HandlersByFramework;
|
|
256
|
+
|
|
257
|
+
return allHandlers[framework];
|
|
258
|
+
},
|
|
182
259
|
handler: async (req: Request) => {
|
|
183
260
|
const url = new URL(req.url);
|
|
184
261
|
const pathname = url.pathname;
|
|
@@ -45,7 +45,7 @@ describe("Request Middleware", () => {
|
|
|
45
45
|
expect(unauthorizedRes.status).toBe(401);
|
|
46
46
|
const unauthorizedBody = await unauthorizedRes.json();
|
|
47
47
|
expect(unauthorizedBody).toEqual({
|
|
48
|
-
|
|
48
|
+
message: "Unauthorized",
|
|
49
49
|
code: "UNAUTHORIZED",
|
|
50
50
|
});
|
|
51
51
|
|
|
@@ -134,7 +134,7 @@ describe("Request Middleware", () => {
|
|
|
134
134
|
expect(res.status).toBe(403);
|
|
135
135
|
|
|
136
136
|
expect(await res.json()).toEqual({
|
|
137
|
-
|
|
137
|
+
message: "Creating users has been disabled.",
|
|
138
138
|
code: "CREATE_USERS_DISABLED",
|
|
139
139
|
});
|
|
140
140
|
|
|
@@ -439,7 +439,7 @@ describe("Request Middleware", () => {
|
|
|
439
439
|
|
|
440
440
|
const body = await res.json();
|
|
441
441
|
expect(body).toEqual({
|
|
442
|
-
|
|
442
|
+
message: "Request validation failed in middleware",
|
|
443
443
|
code: "MIDDLEWARE_VALIDATION_ERROR",
|
|
444
444
|
});
|
|
445
445
|
});
|
|
@@ -51,16 +51,16 @@ export abstract class OutputContext<const TOutput, const TErrorCode extends stri
|
|
|
51
51
|
headers?: HeadersInit,
|
|
52
52
|
): Response {
|
|
53
53
|
if (typeof initOrStatus === "undefined") {
|
|
54
|
-
return Response.json({
|
|
54
|
+
return Response.json({ message: message, code }, { status: 500, headers });
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
if (typeof initOrStatus === "number") {
|
|
58
|
-
return Response.json({
|
|
58
|
+
return Response.json({ message: message, code }, { status: initOrStatus, headers });
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
const mergedHeaders = mergeHeaders(initOrStatus.headers, headers);
|
|
62
62
|
return Response.json(
|
|
63
|
-
{
|
|
63
|
+
{ message: message, code },
|
|
64
64
|
{ status: initOrStatus.status, headers: mergedHeaders },
|
|
65
65
|
);
|
|
66
66
|
}
|
package/src/api/route.ts
CHANGED
|
@@ -125,14 +125,7 @@ export function defineRoute<
|
|
|
125
125
|
return config;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
|
|
129
|
-
export type EmptyObject = {}; //Record<string, never>;
|
|
130
|
-
|
|
131
|
-
export function defineRoutes<
|
|
132
|
-
TConfig = EmptyObject,
|
|
133
|
-
TDeps = EmptyObject,
|
|
134
|
-
TServices = EmptyObject,
|
|
135
|
-
>() {
|
|
128
|
+
export function defineRoutes<TConfig = {}, TDeps = {}, TServices = {}>() {
|
|
136
129
|
return {
|
|
137
130
|
create: <
|
|
138
131
|
const TRoutes extends readonly FragnoRouteConfig<
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { test, expect, describe } from "vitest";
|
|
2
|
-
import { FragnoClientApiError } from "./client-error";
|
|
2
|
+
import { FragnoClientApiError, FragnoClientUnknownApiError } from "./client-error";
|
|
3
3
|
import { FragnoApiError } from "../api/error";
|
|
4
|
+
import { RequestOutputContext } from "../api/request-output-context";
|
|
4
5
|
|
|
5
6
|
describe("Error Conversion", () => {
|
|
6
7
|
test("should convert API error to client error", async () => {
|
|
@@ -12,4 +13,19 @@ describe("Error Conversion", () => {
|
|
|
12
13
|
expect(clientError.code).toBe("API_ERROR");
|
|
13
14
|
expect(clientError.status).toBe(500);
|
|
14
15
|
});
|
|
16
|
+
|
|
17
|
+
test("error() should never result in an unknown error", async () => {
|
|
18
|
+
const ctx = new RequestOutputContext();
|
|
19
|
+
const response = ctx.error({ message: "test", code: "MY_TEST_ERROR" }, { status: 400 });
|
|
20
|
+
|
|
21
|
+
expect(response).toBeInstanceOf(Response);
|
|
22
|
+
expect(response.status).toBe(400);
|
|
23
|
+
|
|
24
|
+
const clientError = await FragnoClientApiError.fromResponse(response);
|
|
25
|
+
expect(clientError).toBeInstanceOf(FragnoClientApiError);
|
|
26
|
+
expect(clientError).not.toBeInstanceOf(FragnoClientUnknownApiError);
|
|
27
|
+
expect(clientError.message).toBe("test");
|
|
28
|
+
expect(clientError.code).toBe("MY_TEST_ERROR");
|
|
29
|
+
expect(clientError.status).toBe(400);
|
|
30
|
+
});
|
|
15
31
|
});
|