diff --git a/app/package.json b/app/package.json index bb2f303..5eb22ce 100644 --- a/app/package.json +++ b/app/package.json @@ -13,34 +13,34 @@ "@nodarium/registry": "link:../packages/registry", "@nodarium/ui": "link:../packages/ui", "@nodarium/utils": "link:../packages/utils", - "@sveltejs/kit": "^2.49.0", - "@threlte/core": "8.3.0", - "@threlte/extras": "9.7.0", - "@types/three": "^0.181.0", - "@unocss/reset": "^66.5.9", + "@sveltejs/kit": "^2.50.0", + "@threlte/core": "8.3.1", + "@threlte/extras": "9.7.1", + "@unocss/reset": "^66.6.0", "comlink": "^4.4.2", "file-saver": "^2.0.5", "idb": "^8.0.3", "jsondiffpatch": "^0.7.3", - "three": "^0.181.2" + "three": "^0.182.0" }, "devDependencies": { - "@iconify-json/tabler": "^1.2.23", + "@iconify-json/tabler": "^1.2.26", "@nodarium/types": "link:../packages/types", "@sveltejs/adapter-static": "^3.0.10", - "@sveltejs/vite-plugin-svelte": "^6.2.1", + "@sveltejs/vite-plugin-svelte": "^6.2.4", "@tsconfig/svelte": "^5.0.6", "@types/file-saver": "^2.0.7", - "@unocss/preset-icons": "^66.5.9", - "svelte": "^5.43.14", - "svelte-check": "^4.3.4", + "@types/three": "^0.182.0", + "@unocss/preset-icons": "^66.6.0", + "svelte": "^5.46.4", + "svelte-check": "^4.3.5", "tslib": "^2.8.1", "typescript": "^5.9.3", - "unocss": "^66.5.9", - "vite": "^7.2.4", + "unocss": "^66.6.0", + "vite": "^7.3.1", "vite-plugin-comlink": "^5.3.0", - "vite-plugin-glsl": "^1.5.4", + "vite-plugin-glsl": "^1.5.5", "vite-plugin-wasm": "^3.5.0", - "vitest": "^4.0.13" + "vitest": "^4.0.17" } } diff --git a/app/src/routes/dev/+page.svelte b/app/src/routes/dev/+page.svelte new file mode 100644 index 0000000..c9c760e --- /dev/null +++ b/app/src/routes/dev/+page.svelte @@ -0,0 +1,29 @@ + + + + + + + +
+ +
+ + + + + + diff --git a/packages/store-client/package.json b/packages/store-client/package.json index 51754f1..573071c 100644 --- a/packages/store-client/package.json +++ b/packages/store-client/package.json @@ -10,10 +10,7 @@ "keywords": [], "author": "", "license": "ISC", - "dependencies": { - "@hey-api/client-fetch": "^0.13.1" - }, "devDependencies": { - "@hey-api/openapi-ts": "^0.88.0" + "@hey-api/openapi-ts": "^0.90.4" } } diff --git a/packages/store-client/src/client/client.gen.ts b/packages/store-client/src/client/client.gen.ts new file mode 100644 index 0000000..cab3c70 --- /dev/null +++ b/packages/store-client/src/client/client.gen.ts @@ -0,0 +1,16 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import type { ClientOptions as ClientOptions2 } from './types.gen'; + +/** + * The `createClientConfig()` function will be called on client initialization + * and the returned object will become the client's initial configuration. + * + * You may want to initialize your client this way instead of calling + * `setConfig()`. This is useful for example if you're using Next.js + * to ensure your client always has the correct values. + */ +export type CreateClientConfig = (override?: Config) => Config & T>; + +export const client = createClient(createConfig()); diff --git a/packages/store-client/src/client/client/client.gen.ts b/packages/store-client/src/client/client/client.gen.ts new file mode 100644 index 0000000..d4cbcce --- /dev/null +++ b/packages/store-client/src/client/client/client.gen.ts @@ -0,0 +1,311 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { createSseClient } from '../core/serverSentEvents.gen'; +import type { HttpMethod } from '../core/types.gen'; +import { getValidRequestBody } from '../core/utils.gen'; +import type { + Client, + Config, + RequestOptions, + ResolvedRequestOptions, +} from './types.gen'; +import { + buildUrl, + createConfig, + createInterceptors, + getParseAs, + mergeConfigs, + mergeHeaders, + setAuthParams, +} from './utils.gen'; + +type ReqInit = Omit & { + body?: any; + headers: ReturnType; +}; + +export const createClient = (config: Config = {}): Client => { + let _config = mergeConfigs(createConfig(), config); + + const getConfig = (): Config => ({ ..._config }); + + const setConfig = (config: Config): Config => { + _config = mergeConfigs(_config, config); + return getConfig(); + }; + + const interceptors = createInterceptors< + Request, + Response, + unknown, + ResolvedRequestOptions + >(); + + const beforeRequest = async (options: RequestOptions) => { + const opts = { + ..._config, + ...options, + fetch: options.fetch ?? _config.fetch ?? globalThis.fetch, + headers: mergeHeaders(_config.headers, options.headers), + serializedBody: undefined, + }; + + if (opts.security) { + await setAuthParams({ + ...opts, + security: opts.security, + }); + } + + if (opts.requestValidator) { + await opts.requestValidator(opts); + } + + if (opts.body !== undefined && opts.bodySerializer) { + opts.serializedBody = opts.bodySerializer(opts.body); + } + + // remove Content-Type header if body is empty to avoid sending invalid requests + if (opts.body === undefined || opts.serializedBody === '') { + opts.headers.delete('Content-Type'); + } + + const url = buildUrl(opts); + + return { opts, url }; + }; + + const request: Client['request'] = async (options) => { + // @ts-expect-error + const { opts, url } = await beforeRequest(options); + const requestInit: ReqInit = { + redirect: 'follow', + ...opts, + body: getValidRequestBody(opts), + }; + + let request = new Request(url, requestInit); + + for (const fn of interceptors.request.fns) { + if (fn) { + request = await fn(request, opts); + } + } + + // fetch must be assigned here, otherwise it would throw the error: + // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation + const _fetch = opts.fetch!; + let response: Response; + + try { + response = await _fetch(request); + } catch (error) { + // Handle fetch exceptions (AbortError, network errors, etc.) + let finalError = error; + + for (const fn of interceptors.error.fns) { + if (fn) { + finalError = (await fn( + error, + undefined as any, + request, + opts, + )) as unknown; + } + } + + finalError = finalError || ({} as unknown); + + if (opts.throwOnError) { + throw finalError; + } + + // Return error response + return opts.responseStyle === 'data' + ? undefined + : { + error: finalError, + request, + response: undefined as any, + }; + } + + for (const fn of interceptors.response.fns) { + if (fn) { + response = await fn(response, request, opts); + } + } + + const result = { + request, + response, + }; + + if (response.ok) { + const parseAs = + (opts.parseAs === 'auto' + ? getParseAs(response.headers.get('Content-Type')) + : opts.parseAs) ?? 'json'; + + if ( + response.status === 204 || + response.headers.get('Content-Length') === '0' + ) { + let emptyData: any; + switch (parseAs) { + case 'arrayBuffer': + case 'blob': + case 'text': + emptyData = await response[parseAs](); + break; + case 'formData': + emptyData = new FormData(); + break; + case 'stream': + emptyData = response.body; + break; + case 'json': + default: + emptyData = {}; + break; + } + return opts.responseStyle === 'data' + ? emptyData + : { + data: emptyData, + ...result, + }; + } + + let data: any; + switch (parseAs) { + case 'arrayBuffer': + case 'blob': + case 'formData': + case 'text': + data = await response[parseAs](); + break; + case 'json': { + // Some servers return 200 with no Content-Length and empty body. + // response.json() would throw; read as text and parse if non-empty. + const text = await response.text(); + data = text ? JSON.parse(text) : {}; + break; + } + case 'stream': + return opts.responseStyle === 'data' + ? response.body + : { + data: response.body, + ...result, + }; + } + + if (parseAs === 'json') { + if (opts.responseValidator) { + await opts.responseValidator(data); + } + + if (opts.responseTransformer) { + data = await opts.responseTransformer(data); + } + } + + return opts.responseStyle === 'data' + ? data + : { + data, + ...result, + }; + } + + const textError = await response.text(); + let jsonError: unknown; + + try { + jsonError = JSON.parse(textError); + } catch { + // noop + } + + const error = jsonError ?? textError; + let finalError = error; + + for (const fn of interceptors.error.fns) { + if (fn) { + finalError = (await fn(error, response, request, opts)) as string; + } + } + + finalError = finalError || ({} as string); + + if (opts.throwOnError) { + throw finalError; + } + + // TODO: we probably want to return error and improve types + return opts.responseStyle === 'data' + ? undefined + : { + error: finalError, + ...result, + }; + }; + + const makeMethodFn = + (method: Uppercase) => (options: RequestOptions) => + request({ ...options, method }); + + const makeSseFn = + (method: Uppercase) => async (options: RequestOptions) => { + const { opts, url } = await beforeRequest(options); + return createSseClient({ + ...opts, + body: opts.body as BodyInit | null | undefined, + headers: opts.headers as unknown as Record, + method, + onRequest: async (url, init) => { + let request = new Request(url, init); + for (const fn of interceptors.request.fns) { + if (fn) { + request = await fn(request, opts); + } + } + return request; + }, + serializedBody: getValidRequestBody(opts) as + | BodyInit + | null + | undefined, + url, + }); + }; + + return { + buildUrl, + connect: makeMethodFn('CONNECT'), + delete: makeMethodFn('DELETE'), + get: makeMethodFn('GET'), + getConfig, + head: makeMethodFn('HEAD'), + interceptors, + options: makeMethodFn('OPTIONS'), + patch: makeMethodFn('PATCH'), + post: makeMethodFn('POST'), + put: makeMethodFn('PUT'), + request, + setConfig, + sse: { + connect: makeSseFn('CONNECT'), + delete: makeSseFn('DELETE'), + get: makeSseFn('GET'), + head: makeSseFn('HEAD'), + options: makeSseFn('OPTIONS'), + patch: makeSseFn('PATCH'), + post: makeSseFn('POST'), + put: makeSseFn('PUT'), + trace: makeSseFn('TRACE'), + }, + trace: makeMethodFn('TRACE'), + } as Client; +}; diff --git a/packages/store-client/src/client/client/index.ts b/packages/store-client/src/client/client/index.ts new file mode 100644 index 0000000..b295ede --- /dev/null +++ b/packages/store-client/src/client/client/index.ts @@ -0,0 +1,25 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export type { Auth } from '../core/auth.gen'; +export type { QuerySerializerOptions } from '../core/bodySerializer.gen'; +export { + formDataBodySerializer, + jsonBodySerializer, + urlSearchParamsBodySerializer, +} from '../core/bodySerializer.gen'; +export { buildClientParams } from '../core/params.gen'; +export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export { createClient } from './client.gen'; +export type { + Client, + ClientOptions, + Config, + CreateClientConfig, + Options, + RequestOptions, + RequestResult, + ResolvedRequestOptions, + ResponseStyle, + TDataShape, +} from './types.gen'; +export { createConfig, mergeHeaders } from './utils.gen'; diff --git a/packages/store-client/src/client/client/types.gen.ts b/packages/store-client/src/client/client/types.gen.ts new file mode 100644 index 0000000..b4a499c --- /dev/null +++ b/packages/store-client/src/client/client/types.gen.ts @@ -0,0 +1,241 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Auth } from '../core/auth.gen'; +import type { + ServerSentEventsOptions, + ServerSentEventsResult, +} from '../core/serverSentEvents.gen'; +import type { + Client as CoreClient, + Config as CoreConfig, +} from '../core/types.gen'; +import type { Middleware } from './utils.gen'; + +export type ResponseStyle = 'data' | 'fields'; + +export interface Config + extends Omit, + CoreConfig { + /** + * Base URL for all requests made by this client. + */ + baseUrl?: T['baseUrl']; + /** + * Fetch API implementation. You can use this option to provide a custom + * fetch instance. + * + * @default globalThis.fetch + */ + fetch?: typeof fetch; + /** + * Please don't use the Fetch client for Next.js applications. The `next` + * options won't have any effect. + * + * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead. + */ + next?: never; + /** + * Return the response data parsed in a specified format. By default, `auto` + * will infer the appropriate method from the `Content-Type` response header. + * You can override this behavior with any of the {@link Body} methods. + * Select `stream` if you don't want to parse response data at all. + * + * @default 'auto' + */ + parseAs?: + | 'arrayBuffer' + | 'auto' + | 'blob' + | 'formData' + | 'json' + | 'stream' + | 'text'; + /** + * Should we return only data or multiple fields (data, error, response, etc.)? + * + * @default 'fields' + */ + responseStyle?: ResponseStyle; + /** + * Throw an error instead of returning it in the response? + * + * @default false + */ + throwOnError?: T['throwOnError']; +} + +export interface RequestOptions< + TData = unknown, + TResponseStyle extends ResponseStyle = 'fields', + ThrowOnError extends boolean = boolean, + Url extends string = string, +> extends Config<{ + responseStyle: TResponseStyle; + throwOnError: ThrowOnError; + }>, + Pick< + ServerSentEventsOptions, + | 'onSseError' + | 'onSseEvent' + | 'sseDefaultRetryDelay' + | 'sseMaxRetryAttempts' + | 'sseMaxRetryDelay' + > { + /** + * Any body that you want to add to your request. + * + * {@link https://developer.mozilla.org/docs/Web/API/fetch#body} + */ + body?: unknown; + path?: Record; + query?: Record; + /** + * Security mechanism(s) to use for the request. + */ + security?: ReadonlyArray; + url: Url; +} + +export interface ResolvedRequestOptions< + TResponseStyle extends ResponseStyle = 'fields', + ThrowOnError extends boolean = boolean, + Url extends string = string, +> extends RequestOptions { + serializedBody?: string; +} + +export type RequestResult< + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = boolean, + TResponseStyle extends ResponseStyle = 'fields', +> = ThrowOnError extends true + ? Promise< + TResponseStyle extends 'data' + ? TData extends Record + ? TData[keyof TData] + : TData + : { + data: TData extends Record + ? TData[keyof TData] + : TData; + request: Request; + response: Response; + } + > + : Promise< + TResponseStyle extends 'data' + ? + | (TData extends Record + ? TData[keyof TData] + : TData) + | undefined + : ( + | { + data: TData extends Record + ? TData[keyof TData] + : TData; + error: undefined; + } + | { + data: undefined; + error: TError extends Record + ? TError[keyof TError] + : TError; + } + ) & { + request: Request; + response: Response; + } + >; + +export interface ClientOptions { + baseUrl?: string; + responseStyle?: ResponseStyle; + throwOnError?: boolean; +} + +type MethodFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'>, +) => RequestResult; + +type SseFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'>, +) => Promise>; + +type RequestFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'> & + Pick< + Required>, + 'method' + >, +) => RequestResult; + +type BuildUrlFn = < + TData extends { + body?: unknown; + path?: Record; + query?: Record; + url: string; + }, +>( + options: TData & Options, +) => string; + +export type Client = CoreClient< + RequestFn, + Config, + MethodFn, + BuildUrlFn, + SseFn +> & { + interceptors: Middleware; +}; + +/** + * The `createClientConfig()` function will be called on client initialization + * and the returned object will become the client's initial configuration. + * + * You may want to initialize your client this way instead of calling + * `setConfig()`. This is useful for example if you're using Next.js + * to ensure your client always has the correct values. + */ +export type CreateClientConfig = ( + override?: Config, +) => Config & T>; + +export interface TDataShape { + body?: unknown; + headers?: unknown; + path?: unknown; + query?: unknown; + url: string; +} + +type OmitKeys = Pick>; + +export type Options< + TData extends TDataShape = TDataShape, + ThrowOnError extends boolean = boolean, + TResponse = unknown, + TResponseStyle extends ResponseStyle = 'fields', +> = OmitKeys< + RequestOptions, + 'body' | 'path' | 'query' | 'url' +> & + ([TData] extends [never] ? unknown : Omit); diff --git a/packages/store-client/src/client/client/utils.gen.ts b/packages/store-client/src/client/client/utils.gen.ts new file mode 100644 index 0000000..4c48a9e --- /dev/null +++ b/packages/store-client/src/client/client/utils.gen.ts @@ -0,0 +1,332 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { getAuthToken } from '../core/auth.gen'; +import type { QuerySerializerOptions } from '../core/bodySerializer.gen'; +import { jsonBodySerializer } from '../core/bodySerializer.gen'; +import { + serializeArrayParam, + serializeObjectParam, + serializePrimitiveParam, +} from '../core/pathSerializer.gen'; +import { getUrl } from '../core/utils.gen'; +import type { Client, ClientOptions, Config, RequestOptions } from './types.gen'; + +export const createQuerySerializer = ({ + parameters = {}, + ...args +}: QuerySerializerOptions = {}) => { + const querySerializer = (queryParams: T) => { + const search: string[] = []; + if (queryParams && typeof queryParams === 'object') { + for (const name in queryParams) { + const value = queryParams[name]; + + if (value === undefined || value === null) { + continue; + } + + const options = parameters[name] || args; + + if (Array.isArray(value)) { + const serializedArray = serializeArrayParam({ + allowReserved: options.allowReserved, + explode: true, + name, + style: 'form', + value, + ...options.array, + }); + if (serializedArray) search.push(serializedArray); + } else if (typeof value === 'object') { + const serializedObject = serializeObjectParam({ + allowReserved: options.allowReserved, + explode: true, + name, + style: 'deepObject', + value: value as Record, + ...options.object, + }); + if (serializedObject) search.push(serializedObject); + } else { + const serializedPrimitive = serializePrimitiveParam({ + allowReserved: options.allowReserved, + name, + value: value as string, + }); + if (serializedPrimitive) search.push(serializedPrimitive); + } + } + } + return search.join('&'); + }; + return querySerializer; +}; + +/** + * Infers parseAs value from provided Content-Type header. + */ +export const getParseAs = ( + contentType: string | null, +): Exclude => { + if (!contentType) { + // If no Content-Type header is provided, the best we can do is return the raw response body, + // which is effectively the same as the 'stream' option. + return 'stream'; + } + + const cleanContent = contentType.split(';')[0]?.trim(); + + if (!cleanContent) { + return; + } + + if ( + cleanContent.startsWith('application/json') || + cleanContent.endsWith('+json') + ) { + return 'json'; + } + + if (cleanContent === 'multipart/form-data') { + return 'formData'; + } + + if ( + ['application/', 'audio/', 'image/', 'video/'].some((type) => + cleanContent.startsWith(type), + ) + ) { + return 'blob'; + } + + if (cleanContent.startsWith('text/')) { + return 'text'; + } + + return; +}; + +const checkForExistence = ( + options: Pick & { + headers: Headers; + }, + name?: string, +): boolean => { + if (!name) { + return false; + } + if ( + options.headers.has(name) || + options.query?.[name] || + options.headers.get('Cookie')?.includes(`${name}=`) + ) { + return true; + } + return false; +}; + +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { + headers: Headers; + }) => { + for (const auth of security) { + if (checkForExistence(options, auth.name)) { + continue; + } + + const token = await getAuthToken(auth, options.auth); + + if (!token) { + continue; + } + + const name = auth.name ?? 'Authorization'; + + switch (auth.in) { + case 'query': + if (!options.query) { + options.query = {}; + } + options.query[name] = token; + break; + case 'cookie': + options.headers.append('Cookie', `${name}=${token}`); + break; + case 'header': + default: + options.headers.set(name, token); + break; + } + } +}; + +export const buildUrl: Client['buildUrl'] = (options) => + getUrl({ + baseUrl: options.baseUrl as string, + path: options.path, + query: options.query, + querySerializer: + typeof options.querySerializer === 'function' + ? options.querySerializer + : createQuerySerializer(options.querySerializer), + url: options.url, + }); + +export const mergeConfigs = (a: Config, b: Config): Config => { + const config = { ...a, ...b }; + if (config.baseUrl?.endsWith('/')) { + config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1); + } + config.headers = mergeHeaders(a.headers, b.headers); + return config; +}; + +const headersEntries = (headers: Headers): Array<[string, string]> => { + const entries: Array<[string, string]> = []; + headers.forEach((value, key) => { + entries.push([key, value]); + }); + return entries; +}; + +export const mergeHeaders = ( + ...headers: Array['headers'] | undefined> +): Headers => { + const mergedHeaders = new Headers(); + for (const header of headers) { + if (!header) { + continue; + } + + const iterator = + header instanceof Headers + ? headersEntries(header) + : Object.entries(header); + + for (const [key, value] of iterator) { + if (value === null) { + mergedHeaders.delete(key); + } else if (Array.isArray(value)) { + for (const v of value) { + mergedHeaders.append(key, v as string); + } + } else if (value !== undefined) { + // assume object headers are meant to be JSON stringified, i.e. their + // content value in OpenAPI specification is 'application/json' + mergedHeaders.set( + key, + typeof value === 'object' ? JSON.stringify(value) : (value as string), + ); + } + } + } + return mergedHeaders; +}; + +type ErrInterceptor = ( + error: Err, + response: Res, + request: Req, + options: Options, +) => Err | Promise; + +type ReqInterceptor = ( + request: Req, + options: Options, +) => Req | Promise; + +type ResInterceptor = ( + response: Res, + request: Req, + options: Options, +) => Res | Promise; + +class Interceptors { + fns: Array = []; + + clear(): void { + this.fns = []; + } + + eject(id: number | Interceptor): void { + const index = this.getInterceptorIndex(id); + if (this.fns[index]) { + this.fns[index] = null; + } + } + + exists(id: number | Interceptor): boolean { + const index = this.getInterceptorIndex(id); + return Boolean(this.fns[index]); + } + + getInterceptorIndex(id: number | Interceptor): number { + if (typeof id === 'number') { + return this.fns[id] ? id : -1; + } + return this.fns.indexOf(id); + } + + update( + id: number | Interceptor, + fn: Interceptor, + ): number | Interceptor | false { + const index = this.getInterceptorIndex(id); + if (this.fns[index]) { + this.fns[index] = fn; + return id; + } + return false; + } + + use(fn: Interceptor): number { + this.fns.push(fn); + return this.fns.length - 1; + } +} + +export interface Middleware { + error: Interceptors>; + request: Interceptors>; + response: Interceptors>; +} + +export const createInterceptors = (): Middleware< + Req, + Res, + Err, + Options +> => ({ + error: new Interceptors>(), + request: new Interceptors>(), + response: new Interceptors>(), +}); + +const defaultQuerySerializer = createQuerySerializer({ + allowReserved: false, + array: { + explode: true, + style: 'form', + }, + object: { + explode: true, + style: 'deepObject', + }, +}); + +const defaultHeaders = { + 'Content-Type': 'application/json', +}; + +export const createConfig = ( + override: Config & T> = {}, +): Config & T> => ({ + ...jsonBodySerializer, + headers: defaultHeaders, + parseAs: 'auto', + querySerializer: defaultQuerySerializer, + ...override, +}); diff --git a/packages/store-client/src/client/core/auth.gen.ts b/packages/store-client/src/client/core/auth.gen.ts new file mode 100644 index 0000000..f8a7326 --- /dev/null +++ b/packages/store-client/src/client/core/auth.gen.ts @@ -0,0 +1,42 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export type AuthToken = string | undefined; + +export interface Auth { + /** + * Which part of the request do we use to send the auth? + * + * @default 'header' + */ + in?: 'header' | 'query' | 'cookie'; + /** + * Header or query parameter name. + * + * @default 'Authorization' + */ + name?: string; + scheme?: 'basic' | 'bearer'; + type: 'apiKey' | 'http'; +} + +export const getAuthToken = async ( + auth: Auth, + callback: ((auth: Auth) => Promise | AuthToken) | AuthToken, +): Promise => { + const token = + typeof callback === 'function' ? await callback(auth) : callback; + + if (!token) { + return; + } + + if (auth.scheme === 'bearer') { + return `Bearer ${token}`; + } + + if (auth.scheme === 'basic') { + return `Basic ${btoa(token)}`; + } + + return token; +}; diff --git a/packages/store-client/src/client/core/bodySerializer.gen.ts b/packages/store-client/src/client/core/bodySerializer.gen.ts new file mode 100644 index 0000000..552b50f --- /dev/null +++ b/packages/store-client/src/client/core/bodySerializer.gen.ts @@ -0,0 +1,100 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { + ArrayStyle, + ObjectStyle, + SerializerOptions, +} from './pathSerializer.gen'; + +export type QuerySerializer = (query: Record) => string; + +export type BodySerializer = (body: any) => any; + +type QuerySerializerOptionsObject = { + allowReserved?: boolean; + array?: Partial>; + object?: Partial>; +}; + +export type QuerySerializerOptions = QuerySerializerOptionsObject & { + /** + * Per-parameter serialization overrides. When provided, these settings + * override the global array/object settings for specific parameter names. + */ + parameters?: Record; +}; + +const serializeFormDataPair = ( + data: FormData, + key: string, + value: unknown, +): void => { + if (typeof value === 'string' || value instanceof Blob) { + data.append(key, value); + } else if (value instanceof Date) { + data.append(key, value.toISOString()); + } else { + data.append(key, JSON.stringify(value)); + } +}; + +const serializeUrlSearchParamsPair = ( + data: URLSearchParams, + key: string, + value: unknown, +): void => { + if (typeof value === 'string') { + data.append(key, value); + } else { + data.append(key, JSON.stringify(value)); + } +}; + +export const formDataBodySerializer = { + bodySerializer: | Array>>( + body: T, + ): FormData => { + const data = new FormData(); + + Object.entries(body).forEach(([key, value]) => { + if (value === undefined || value === null) { + return; + } + if (Array.isArray(value)) { + value.forEach((v) => serializeFormDataPair(data, key, v)); + } else { + serializeFormDataPair(data, key, value); + } + }); + + return data; + }, +}; + +export const jsonBodySerializer = { + bodySerializer: (body: T): string => + JSON.stringify(body, (_key, value) => + typeof value === 'bigint' ? value.toString() : value, + ), +}; + +export const urlSearchParamsBodySerializer = { + bodySerializer: | Array>>( + body: T, + ): string => { + const data = new URLSearchParams(); + + Object.entries(body).forEach(([key, value]) => { + if (value === undefined || value === null) { + return; + } + if (Array.isArray(value)) { + value.forEach((v) => serializeUrlSearchParamsPair(data, key, v)); + } else { + serializeUrlSearchParamsPair(data, key, value); + } + }); + + return data.toString(); + }, +}; diff --git a/packages/store-client/src/client/core/params.gen.ts b/packages/store-client/src/client/core/params.gen.ts new file mode 100644 index 0000000..602715c --- /dev/null +++ b/packages/store-client/src/client/core/params.gen.ts @@ -0,0 +1,176 @@ +// This file is auto-generated by @hey-api/openapi-ts + +type Slot = 'body' | 'headers' | 'path' | 'query'; + +export type Field = + | { + in: Exclude; + /** + * Field name. This is the name we want the user to see and use. + */ + key: string; + /** + * Field mapped name. This is the name we want to use in the request. + * If omitted, we use the same value as `key`. + */ + map?: string; + } + | { + in: Extract; + /** + * Key isn't required for bodies. + */ + key?: string; + map?: string; + } + | { + /** + * Field name. This is the name we want the user to see and use. + */ + key: string; + /** + * Field mapped name. This is the name we want to use in the request. + * If `in` is omitted, `map` aliases `key` to the transport layer. + */ + map: Slot; + }; + +export interface Fields { + allowExtra?: Partial>; + args?: ReadonlyArray; +} + +export type FieldsConfig = ReadonlyArray; + +const extraPrefixesMap: Record = { + $body_: 'body', + $headers_: 'headers', + $path_: 'path', + $query_: 'query', +}; +const extraPrefixes = Object.entries(extraPrefixesMap); + +type KeyMap = Map< + string, + | { + in: Slot; + map?: string; + } + | { + in?: never; + map: Slot; + } +>; + +const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => { + if (!map) { + map = new Map(); + } + + for (const config of fields) { + if ('in' in config) { + if (config.key) { + map.set(config.key, { + in: config.in, + map: config.map, + }); + } + } else if ('key' in config) { + map.set(config.key, { + map: config.map, + }); + } else if (config.args) { + buildKeyMap(config.args, map); + } + } + + return map; +}; + +interface Params { + body: unknown; + headers: Record; + path: Record; + query: Record; +} + +const stripEmptySlots = (params: Params) => { + for (const [slot, value] of Object.entries(params)) { + if (value && typeof value === 'object' && !Object.keys(value).length) { + delete params[slot as Slot]; + } + } +}; + +export const buildClientParams = ( + args: ReadonlyArray, + fields: FieldsConfig, +) => { + const params: Params = { + body: {}, + headers: {}, + path: {}, + query: {}, + }; + + const map = buildKeyMap(fields); + + let config: FieldsConfig[number] | undefined; + + for (const [index, arg] of args.entries()) { + if (fields[index]) { + config = fields[index]; + } + + if (!config) { + continue; + } + + if ('in' in config) { + if (config.key) { + const field = map.get(config.key)!; + const name = field.map || config.key; + if (field.in) { + (params[field.in] as Record)[name] = arg; + } + } else { + params.body = arg; + } + } else { + for (const [key, value] of Object.entries(arg ?? {})) { + const field = map.get(key); + + if (field) { + if (field.in) { + const name = field.map || key; + (params[field.in] as Record)[name] = value; + } else { + params[field.map] = value; + } + } else { + const extra = extraPrefixes.find(([prefix]) => + key.startsWith(prefix), + ); + + if (extra) { + const [prefix, slot] = extra; + (params[slot] as Record)[ + key.slice(prefix.length) + ] = value; + } else if ('allowExtra' in config && config.allowExtra) { + for (const [slot, allowed] of Object.entries(config.allowExtra)) { + if (allowed) { + (params[slot as Slot] as Record)[key] = value; + break; + } + } + } + } + } + } + } + + stripEmptySlots(params); + + return params; +}; diff --git a/packages/store-client/src/client/core/pathSerializer.gen.ts b/packages/store-client/src/client/core/pathSerializer.gen.ts new file mode 100644 index 0000000..8d99931 --- /dev/null +++ b/packages/store-client/src/client/core/pathSerializer.gen.ts @@ -0,0 +1,181 @@ +// This file is auto-generated by @hey-api/openapi-ts + +interface SerializeOptions + extends SerializePrimitiveOptions, + SerializerOptions {} + +interface SerializePrimitiveOptions { + allowReserved?: boolean; + name: string; +} + +export interface SerializerOptions { + /** + * @default true + */ + explode: boolean; + style: T; +} + +export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited'; +export type ArraySeparatorStyle = ArrayStyle | MatrixStyle; +type MatrixStyle = 'label' | 'matrix' | 'simple'; +export type ObjectStyle = 'form' | 'deepObject'; +type ObjectSeparatorStyle = ObjectStyle | MatrixStyle; + +interface SerializePrimitiveParam extends SerializePrimitiveOptions { + value: string; +} + +export const separatorArrayExplode = (style: ArraySeparatorStyle) => { + switch (style) { + case 'label': + return '.'; + case 'matrix': + return ';'; + case 'simple': + return ','; + default: + return '&'; + } +}; + +export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { + switch (style) { + case 'form': + return ','; + case 'pipeDelimited': + return '|'; + case 'spaceDelimited': + return '%20'; + default: + return ','; + } +}; + +export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { + switch (style) { + case 'label': + return '.'; + case 'matrix': + return ';'; + case 'simple': + return ','; + default: + return '&'; + } +}; + +export const serializeArrayParam = ({ + allowReserved, + explode, + name, + style, + value, +}: SerializeOptions & { + value: unknown[]; +}) => { + if (!explode) { + const joinedValues = ( + allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) + ).join(separatorArrayNoExplode(style)); + switch (style) { + case 'label': + return `.${joinedValues}`; + case 'matrix': + return `;${name}=${joinedValues}`; + case 'simple': + return joinedValues; + default: + return `${name}=${joinedValues}`; + } + } + + const separator = separatorArrayExplode(style); + const joinedValues = value + .map((v) => { + if (style === 'label' || style === 'simple') { + return allowReserved ? v : encodeURIComponent(v as string); + } + + return serializePrimitiveParam({ + allowReserved, + name, + value: v as string, + }); + }) + .join(separator); + return style === 'label' || style === 'matrix' + ? separator + joinedValues + : joinedValues; +}; + +export const serializePrimitiveParam = ({ + allowReserved, + name, + value, +}: SerializePrimitiveParam) => { + if (value === undefined || value === null) { + return ''; + } + + if (typeof value === 'object') { + throw new Error( + 'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.', + ); + } + + return `${name}=${allowReserved ? value : encodeURIComponent(value)}`; +}; + +export const serializeObjectParam = ({ + allowReserved, + explode, + name, + style, + value, + valueOnly, +}: SerializeOptions & { + value: Record | Date; + valueOnly?: boolean; +}) => { + if (value instanceof Date) { + return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; + } + + if (style !== 'deepObject' && !explode) { + let values: string[] = []; + Object.entries(value).forEach(([key, v]) => { + values = [ + ...values, + key, + allowReserved ? (v as string) : encodeURIComponent(v as string), + ]; + }); + const joinedValues = values.join(','); + switch (style) { + case 'form': + return `${name}=${joinedValues}`; + case 'label': + return `.${joinedValues}`; + case 'matrix': + return `;${name}=${joinedValues}`; + default: + return joinedValues; + } + } + + const separator = separatorObjectExplode(style); + const joinedValues = Object.entries(value) + .map(([key, v]) => + serializePrimitiveParam({ + allowReserved, + name: style === 'deepObject' ? `${name}[${key}]` : key, + value: v as string, + }), + ) + .join(separator); + return style === 'label' || style === 'matrix' + ? separator + joinedValues + : joinedValues; +}; diff --git a/packages/store-client/src/client/core/queryKeySerializer.gen.ts b/packages/store-client/src/client/core/queryKeySerializer.gen.ts new file mode 100644 index 0000000..d3bb683 --- /dev/null +++ b/packages/store-client/src/client/core/queryKeySerializer.gen.ts @@ -0,0 +1,136 @@ +// This file is auto-generated by @hey-api/openapi-ts + +/** + * JSON-friendly union that mirrors what Pinia Colada can hash. + */ +export type JsonValue = + | null + | string + | number + | boolean + | JsonValue[] + | { [key: string]: JsonValue }; + +/** + * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. + */ +export const queryKeyJsonReplacer = (_key: string, value: unknown) => { + if ( + value === undefined || + typeof value === 'function' || + typeof value === 'symbol' + ) { + return undefined; + } + if (typeof value === 'bigint') { + return value.toString(); + } + if (value instanceof Date) { + return value.toISOString(); + } + return value; +}; + +/** + * Safely stringifies a value and parses it back into a JsonValue. + */ +export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => { + try { + const json = JSON.stringify(input, queryKeyJsonReplacer); + if (json === undefined) { + return undefined; + } + return JSON.parse(json) as JsonValue; + } catch { + return undefined; + } +}; + +/** + * Detects plain objects (including objects with a null prototype). + */ +const isPlainObject = (value: unknown): value is Record => { + if (value === null || typeof value !== 'object') { + return false; + } + const prototype = Object.getPrototypeOf(value as object); + return prototype === Object.prototype || prototype === null; +}; + +/** + * Turns URLSearchParams into a sorted JSON object for deterministic keys. + */ +const serializeSearchParams = (params: URLSearchParams): JsonValue => { + const entries = Array.from(params.entries()).sort(([a], [b]) => + a.localeCompare(b), + ); + const result: Record = {}; + + for (const [key, value] of entries) { + const existing = result[key]; + if (existing === undefined) { + result[key] = value; + continue; + } + + if (Array.isArray(existing)) { + (existing as string[]).push(value); + } else { + result[key] = [existing, value]; + } + } + + return result; +}; + +/** + * Normalizes any accepted value into a JSON-friendly shape for query keys. + */ +export const serializeQueryKeyValue = ( + value: unknown, +): JsonValue | undefined => { + if (value === null) { + return null; + } + + if ( + typeof value === 'string' || + typeof value === 'number' || + typeof value === 'boolean' + ) { + return value; + } + + if ( + value === undefined || + typeof value === 'function' || + typeof value === 'symbol' + ) { + return undefined; + } + + if (typeof value === 'bigint') { + return value.toString(); + } + + if (value instanceof Date) { + return value.toISOString(); + } + + if (Array.isArray(value)) { + return stringifyToJsonValue(value); + } + + if ( + typeof URLSearchParams !== 'undefined' && + value instanceof URLSearchParams + ) { + return serializeSearchParams(value); + } + + if (isPlainObject(value)) { + return stringifyToJsonValue(value); + } + + return undefined; +}; diff --git a/packages/store-client/src/client/core/serverSentEvents.gen.ts b/packages/store-client/src/client/core/serverSentEvents.gen.ts new file mode 100644 index 0000000..343d25a --- /dev/null +++ b/packages/store-client/src/client/core/serverSentEvents.gen.ts @@ -0,0 +1,266 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Config } from './types.gen'; + +export type ServerSentEventsOptions = Omit< + RequestInit, + 'method' +> & + Pick & { + /** + * Fetch API implementation. You can use this option to provide a custom + * fetch instance. + * + * @default globalThis.fetch + */ + fetch?: typeof fetch; + /** + * Implementing clients can call request interceptors inside this hook. + */ + onRequest?: (url: string, init: RequestInit) => Promise; + /** + * Callback invoked when a network or parsing error occurs during streaming. + * + * This option applies only if the endpoint returns a stream of events. + * + * @param error The error that occurred. + */ + onSseError?: (error: unknown) => void; + /** + * Callback invoked when an event is streamed from the server. + * + * This option applies only if the endpoint returns a stream of events. + * + * @param event Event streamed from the server. + * @returns Nothing (void). + */ + onSseEvent?: (event: StreamEvent) => void; + serializedBody?: RequestInit['body']; + /** + * Default retry delay in milliseconds. + * + * This option applies only if the endpoint returns a stream of events. + * + * @default 3000 + */ + sseDefaultRetryDelay?: number; + /** + * Maximum number of retry attempts before giving up. + */ + sseMaxRetryAttempts?: number; + /** + * Maximum retry delay in milliseconds. + * + * Applies only when exponential backoff is used. + * + * This option applies only if the endpoint returns a stream of events. + * + * @default 30000 + */ + sseMaxRetryDelay?: number; + /** + * Optional sleep function for retry backoff. + * + * Defaults to using `setTimeout`. + */ + sseSleepFn?: (ms: number) => Promise; + url: string; + }; + +export interface StreamEvent { + data: TData; + event?: string; + id?: string; + retry?: number; +} + +export type ServerSentEventsResult< + TData = unknown, + TReturn = void, + TNext = unknown, +> = { + stream: AsyncGenerator< + TData extends Record ? TData[keyof TData] : TData, + TReturn, + TNext + >; +}; + +export const createSseClient = ({ + onRequest, + onSseError, + onSseEvent, + responseTransformer, + responseValidator, + sseDefaultRetryDelay, + sseMaxRetryAttempts, + sseMaxRetryDelay, + sseSleepFn, + url, + ...options +}: ServerSentEventsOptions): ServerSentEventsResult => { + let lastEventId: string | undefined; + + const sleep = + sseSleepFn ?? + ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms))); + + const createStream = async function* () { + let retryDelay: number = sseDefaultRetryDelay ?? 3000; + let attempt = 0; + const signal = options.signal ?? new AbortController().signal; + + while (true) { + if (signal.aborted) break; + + attempt++; + + const headers = + options.headers instanceof Headers + ? options.headers + : new Headers(options.headers as Record | undefined); + + if (lastEventId !== undefined) { + headers.set('Last-Event-ID', lastEventId); + } + + try { + const requestInit: RequestInit = { + redirect: 'follow', + ...options, + body: options.serializedBody, + headers, + signal, + }; + let request = new Request(url, requestInit); + if (onRequest) { + request = await onRequest(url, requestInit); + } + // fetch must be assigned here, otherwise it would throw the error: + // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation + const _fetch = options.fetch ?? globalThis.fetch; + const response = await _fetch(request); + + if (!response.ok) + throw new Error( + `SSE failed: ${response.status} ${response.statusText}`, + ); + + if (!response.body) throw new Error('No body in SSE response'); + + const reader = response.body + .pipeThrough(new TextDecoderStream()) + .getReader(); + + let buffer = ''; + + const abortHandler = () => { + try { + reader.cancel(); + } catch { + // noop + } + }; + + signal.addEventListener('abort', abortHandler); + + try { + while (true) { + const { done, value } = await reader.read(); + if (done) break; + buffer += value; + // Normalize line endings: CRLF -> LF, then CR -> LF + buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n'); + + const chunks = buffer.split('\n\n'); + buffer = chunks.pop() ?? ''; + + for (const chunk of chunks) { + const lines = chunk.split('\n'); + const dataLines: Array = []; + let eventName: string | undefined; + + for (const line of lines) { + if (line.startsWith('data:')) { + dataLines.push(line.replace(/^data:\s*/, '')); + } else if (line.startsWith('event:')) { + eventName = line.replace(/^event:\s*/, ''); + } else if (line.startsWith('id:')) { + lastEventId = line.replace(/^id:\s*/, ''); + } else if (line.startsWith('retry:')) { + const parsed = Number.parseInt( + line.replace(/^retry:\s*/, ''), + 10, + ); + if (!Number.isNaN(parsed)) { + retryDelay = parsed; + } + } + } + + let data: unknown; + let parsedJson = false; + + if (dataLines.length) { + const rawData = dataLines.join('\n'); + try { + data = JSON.parse(rawData); + parsedJson = true; + } catch { + data = rawData; + } + } + + if (parsedJson) { + if (responseValidator) { + await responseValidator(data); + } + + if (responseTransformer) { + data = await responseTransformer(data); + } + } + + onSseEvent?.({ + data, + event: eventName, + id: lastEventId, + retry: retryDelay, + }); + + if (dataLines.length) { + yield data as any; + } + } + } + } finally { + signal.removeEventListener('abort', abortHandler); + reader.releaseLock(); + } + + break; // exit loop on normal completion + } catch (error) { + // connection failed or aborted; retry after delay + onSseError?.(error); + + if ( + sseMaxRetryAttempts !== undefined && + attempt >= sseMaxRetryAttempts + ) { + break; // stop after firing error + } + + // exponential backoff: double retry each attempt, cap at 30s + const backoff = Math.min( + retryDelay * 2 ** (attempt - 1), + sseMaxRetryDelay ?? 30000, + ); + await sleep(backoff); + } + } + }; + + const stream = createStream(); + + return { stream }; +}; diff --git a/packages/store-client/src/client/core/types.gen.ts b/packages/store-client/src/client/core/types.gen.ts new file mode 100644 index 0000000..643c070 --- /dev/null +++ b/packages/store-client/src/client/core/types.gen.ts @@ -0,0 +1,118 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Auth, AuthToken } from './auth.gen'; +import type { + BodySerializer, + QuerySerializer, + QuerySerializerOptions, +} from './bodySerializer.gen'; + +export type HttpMethod = + | 'connect' + | 'delete' + | 'get' + | 'head' + | 'options' + | 'patch' + | 'post' + | 'put' + | 'trace'; + +export type Client< + RequestFn = never, + Config = unknown, + MethodFn = never, + BuildUrlFn = never, + SseFn = never, +> = { + /** + * Returns the final request URL. + */ + buildUrl: BuildUrlFn; + getConfig: () => Config; + request: RequestFn; + setConfig: (config: Config) => Config; +} & { + [K in HttpMethod]: MethodFn; +} & ([SseFn] extends [never] + ? { sse?: never } + : { sse: { [K in HttpMethod]: SseFn } }); + +export interface Config { + /** + * Auth token or a function returning auth token. The resolved value will be + * added to the request payload as defined by its `security` array. + */ + auth?: ((auth: Auth) => Promise | AuthToken) | AuthToken; + /** + * A function for serializing request body parameter. By default, + * {@link JSON.stringify()} will be used. + */ + bodySerializer?: BodySerializer | null; + /** + * An object containing any HTTP headers that you want to pre-populate your + * `Headers` object with. + * + * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more} + */ + headers?: + | RequestInit['headers'] + | Record< + string, + | string + | number + | boolean + | (string | number | boolean)[] + | null + | undefined + | unknown + >; + /** + * The request method. + * + * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more} + */ + method?: Uppercase; + /** + * A function for serializing request query parameters. By default, arrays + * will be exploded in form style, objects will be exploded in deepObject + * style, and reserved characters are percent-encoded. + * + * This method will have no effect if the native `paramsSerializer()` Axios + * API function is used. + * + * {@link https://swagger.io/docs/specification/serialization/#query View examples} + */ + querySerializer?: QuerySerializer | QuerySerializerOptions; + /** + * A function validating request data. This is useful if you want to ensure + * the request conforms to the desired shape, so it can be safely sent to + * the server. + */ + requestValidator?: (data: unknown) => Promise; + /** + * A function transforming response data before it's returned. This is useful + * for post-processing data, e.g. converting ISO strings into Date objects. + */ + responseTransformer?: (data: unknown) => Promise; + /** + * A function validating response data. This is useful if you want to ensure + * the response conforms to the desired shape, so it can be safely passed to + * the transformers and returned to the user. + */ + responseValidator?: (data: unknown) => Promise; +} + +type IsExactlyNeverOrNeverUndefined = [T] extends [never] + ? true + : [T] extends [never | undefined] + ? [undefined] extends [T] + ? false + : true + : false; + +export type OmitNever> = { + [K in keyof T as IsExactlyNeverOrNeverUndefined extends true + ? never + : K]: T[K]; +}; diff --git a/packages/store-client/src/client/core/utils.gen.ts b/packages/store-client/src/client/core/utils.gen.ts new file mode 100644 index 0000000..0b5389d --- /dev/null +++ b/packages/store-client/src/client/core/utils.gen.ts @@ -0,0 +1,143 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { BodySerializer, QuerySerializer } from './bodySerializer.gen'; +import { + type ArraySeparatorStyle, + serializeArrayParam, + serializeObjectParam, + serializePrimitiveParam, +} from './pathSerializer.gen'; + +export interface PathSerializer { + path: Record; + url: string; +} + +export const PATH_PARAM_RE = /\{[^{}]+\}/g; + +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { + let url = _url; + const matches = _url.match(PATH_PARAM_RE); + if (matches) { + for (const match of matches) { + let explode = false; + let name = match.substring(1, match.length - 1); + let style: ArraySeparatorStyle = 'simple'; + + if (name.endsWith('*')) { + explode = true; + name = name.substring(0, name.length - 1); + } + + if (name.startsWith('.')) { + name = name.substring(1); + style = 'label'; + } else if (name.startsWith(';')) { + name = name.substring(1); + style = 'matrix'; + } + + const value = path[name]; + + if (value === undefined || value === null) { + continue; + } + + if (Array.isArray(value)) { + url = url.replace( + match, + serializeArrayParam({ explode, name, style, value }), + ); + continue; + } + + if (typeof value === 'object') { + url = url.replace( + match, + serializeObjectParam({ + explode, + name, + style, + value: value as Record, + valueOnly: true, + }), + ); + continue; + } + + if (style === 'matrix') { + url = url.replace( + match, + `;${serializePrimitiveParam({ + name, + value: value as string, + })}`, + ); + continue; + } + + const replaceValue = encodeURIComponent( + style === 'label' ? `.${value as string}` : (value as string), + ); + url = url.replace(match, replaceValue); + } + } + return url; +}; + +export const getUrl = ({ + baseUrl, + path, + query, + querySerializer, + url: _url, +}: { + baseUrl?: string; + path?: Record; + query?: Record; + querySerializer: QuerySerializer; + url: string; +}) => { + const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; + let url = (baseUrl ?? '') + pathUrl; + if (path) { + url = defaultPathSerializer({ path, url }); + } + let search = query ? querySerializer(query) : ''; + if (search.startsWith('?')) { + search = search.substring(1); + } + if (search) { + url += `?${search}`; + } + return url; +}; + +export function getValidRequestBody(options: { + body?: unknown; + bodySerializer?: BodySerializer | null; + serializedBody?: unknown; +}) { + const hasBody = options.body !== undefined; + const isSerializedBody = hasBody && options.bodySerializer; + + if (isSerializedBody) { + if ('serializedBody' in options) { + const hasSerializedBody = + options.serializedBody !== undefined && options.serializedBody !== ''; + + return hasSerializedBody ? options.serializedBody : null; + } + + // not all clients implement a serializedBody property (i.e. client-axios) + return options.body !== '' ? options.body : null; + } + + // plain/text body + if (hasBody) { + return options.body; + } + + // no body was provided + return undefined; +} diff --git a/packages/store-client/src/client/index.ts b/packages/store-client/src/client/index.ts index 81abc82..0f00196 100644 --- a/packages/store-client/src/client/index.ts +++ b/packages/store-client/src/client/index.ts @@ -1,3 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export * from './sdk.gen'; -export * from './types.gen'; \ No newline at end of file + +export { getNodesByUserBySystemByNodeId_byVersionJson, getNodesByUserBySystemByNodeId_byVersionWasm, getNodesByUserBySystemByNodeIdJson, getNodesByUserBySystemByNodeIdVersionsJson, getNodesByUserBySystemByNodeIdWasm, getNodesByUserBySystemJson, getNodesByUserJson, getUsersByUserIdJson, getUsersUsersJson, type Options, postNodes } from './sdk.gen'; +export type { ClientOptions, GetNodesByUserBySystemByNodeId_byVersionJsonData, GetNodesByUserBySystemByNodeId_byVersionJsonResponse, GetNodesByUserBySystemByNodeId_byVersionJsonResponses, GetNodesByUserBySystemByNodeId_byVersionWasmData, GetNodesByUserBySystemByNodeId_byVersionWasmResponses, GetNodesByUserBySystemByNodeIdJsonData, GetNodesByUserBySystemByNodeIdJsonResponse, GetNodesByUserBySystemByNodeIdJsonResponses, GetNodesByUserBySystemByNodeIdVersionsJsonData, GetNodesByUserBySystemByNodeIdVersionsJsonResponse, GetNodesByUserBySystemByNodeIdVersionsJsonResponses, GetNodesByUserBySystemByNodeIdWasmData, GetNodesByUserBySystemByNodeIdWasmResponses, GetNodesByUserBySystemJsonData, GetNodesByUserBySystemJsonResponse, GetNodesByUserBySystemJsonResponses, GetNodesByUserJsonData, GetNodesByUserJsonResponse, GetNodesByUserJsonResponses, GetUsersByUserIdJsonData, GetUsersByUserIdJsonResponse, GetUsersByUserIdJsonResponses, GetUsersUsersJsonData, GetUsersUsersJsonResponse, GetUsersUsersJsonResponses, NodeDefinition, NodeInput, PostNodesData, PostNodesResponse, PostNodesResponses, User } from './types.gen'; diff --git a/packages/store-client/src/client/sdk.gen.ts b/packages/store-client/src/client/sdk.gen.ts index 97e748c..bdea1d5 100644 --- a/packages/store-client/src/client/sdk.gen.ts +++ b/packages/store-client/src/client/sdk.gen.ts @@ -1,55 +1,39 @@ // This file is auto-generated by @hey-api/openapi-ts -import { createClient, createConfig, type OptionsLegacyParser } from '@hey-api/client-fetch'; -import type { GetV1NodesByUserJsonData, GetV1NodesByUserJsonError, GetV1NodesByUserJsonResponse, GetV1NodesByUserBySystemJsonData, GetV1NodesByUserBySystemJsonError, GetV1NodesByUserBySystemJsonResponse, GetV1NodesByUserBySystemByNodeIdby-.+jsonData, GetV1NodesByUserBySystemByNodeIdby-.+jsonError, GetV1NodesByUserBySystemByNodeIdby-.+jsonResponse, GetV1NodesByUserBySystemByNodeIdby-.+WasmData, GetV1NodesByUserBySystemByNodeIdby-.+WasmError, GetV1NodesByUserBySystemByNodeIdby-.+WasmResponse, PostV1NodesError, PostV1NodesResponse, GetV1UsersUsersJsonError, GetV1UsersUsersJsonResponse, GetV1UsersByUserIdJsonData, GetV1UsersByUserIdJsonError, GetV1UsersByUserIdJsonResponse } from './types.gen'; +import type { Client, Options as Options2, TDataShape } from './client'; +import { client } from './client.gen'; +import type { GetNodesByUserBySystemByNodeId_byVersionJsonData, GetNodesByUserBySystemByNodeId_byVersionJsonResponses, GetNodesByUserBySystemByNodeId_byVersionWasmData, GetNodesByUserBySystemByNodeId_byVersionWasmResponses, GetNodesByUserBySystemByNodeIdJsonData, GetNodesByUserBySystemByNodeIdJsonResponses, GetNodesByUserBySystemByNodeIdVersionsJsonData, GetNodesByUserBySystemByNodeIdVersionsJsonResponses, GetNodesByUserBySystemByNodeIdWasmData, GetNodesByUserBySystemByNodeIdWasmResponses, GetNodesByUserBySystemJsonData, GetNodesByUserBySystemJsonResponses, GetNodesByUserJsonData, GetNodesByUserJsonResponses, GetUsersByUserIdJsonData, GetUsersByUserIdJsonResponses, GetUsersUsersJsonData, GetUsersUsersJsonResponses, PostNodesData, PostNodesResponses } from './types.gen'; -export const client = createClient(createConfig()); - -export const getV1NodesByUserJson = (options: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/nodes/{user}.json' - }); +export type Options = Options2 & { + /** + * You can provide a client instance returned by `createClient()` instead of + * individual options. This might be also useful if you want to implement a + * custom client. + */ + client?: Client; + /** + * You can pass arbitrary values through the `meta` object. This can be + * used to access values that aren't defined as part of the SDK function. + */ + meta?: Record; }; -export const getV1NodesByUserBySystemJson = (options: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/nodes/{user}/{system}.json' - }); -}; +export const postNodes = (options?: Options) => (options?.client ?? client).post({ url: '/nodes', ...options }); -export const getV1NodesByUserBySystemByNodeIdby-.+Json = (options: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/nodes/{user}/{system}/{nodeId}{.+\\.json}' - }); -}; +export const getNodesByUserJson = (options?: Options) => (options?.client ?? client).get({ url: '/nodes/{user}.json', ...options }); -export const getV1NodesByUserBySystemByNodeIdby-.+Wasm = (options: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/nodes/{user}/{system}/{nodeId}{.+\\.wasm}' - }); -}; +export const getNodesByUserBySystemJson = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}.json', ...options }); -export const postV1Nodes = (options?: OptionsLegacyParser) => { - return (options?.client ?? client).post({ - ...options, - url: '/v1/nodes' - }); -}; +export const getNodesByUserBySystemByNodeIdJson = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}/{nodeId}.json', ...options }); -export const getV1UsersUsersJson = (options?: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/users/users.json' - }); -}; +export const getNodesByUserBySystemByNodeId_byVersionJson = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}/{nodeId}@{version}.json', ...options }); -export const getV1UsersByUserIdJson = (options?: OptionsLegacyParser) => { - return (options?.client ?? client).get({ - ...options, - url: '/v1/users/{userId}.json' - }); -}; \ No newline at end of file +export const getNodesByUserBySystemByNodeIdVersionsJson = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}/{nodeId}/versions.json', ...options }); + +export const getNodesByUserBySystemByNodeIdWasm = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}/{nodeId}.wasm', ...options }); + +export const getNodesByUserBySystemByNodeId_byVersionWasm = (options: Options) => (options.client ?? client).get({ url: '/nodes/{user}/{system}/{nodeId}@{version}.wasm', ...options }); + +export const getUsersUsersJson = (options?: Options) => (options?.client ?? client).get({ url: '/users/users.json', ...options }); + +export const getUsersByUserIdJson = (options?: Options) => (options?.client ?? client).get({ url: '/users/{userId}.json', ...options }); diff --git a/packages/store-client/src/client/types.gen.ts b/packages/store-client/src/client/types.gen.ts index 0cc89c9..1b3c4fa 100644 --- a/packages/store-client/src/client/types.gen.ts +++ b/packages/store-client/src/client/types.gen.ts @@ -1,15 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -export type NodeDefinition = { - id: string; - inputs?: { - [key: string]: NodeInput; - }; - outputs?: Array<(string)>; - meta?: { - description?: string; - title?: string; - }; +export type ClientOptions = { + baseUrl: `${string}://${string}` | (string & {}); }; export type NodeInput = { @@ -18,7 +10,7 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'seed'; value?: number; @@ -28,7 +20,7 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'boolean'; value?: boolean; @@ -38,7 +30,7 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'float'; element?: 'slider'; @@ -52,7 +44,7 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'integer'; element?: 'slider'; @@ -65,10 +57,10 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'select'; - options?: Array<(string)>; + options?: Array; value?: number; } | { internal?: boolean; @@ -76,17 +68,27 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; - type: 'vec3'; - value?: Array<(number)>; + type: 'seed'; + value?: number; } | { internal?: boolean; external?: boolean; setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; + hidden?: boolean; + type: 'vec3'; + value?: Array; +} | { + internal?: boolean; + external?: boolean; + setting?: string; + label?: string; + description?: string; + accepts?: Array; hidden?: boolean; type: 'geometry'; } | { @@ -95,79 +97,209 @@ export type NodeInput = { setting?: string; label?: string; description?: string; - accepts?: Array<(string)>; + accepts?: Array; hidden?: boolean; type: 'path'; }; -export type type = 'seed'; - -export type element = 'slider'; +export type NodeDefinition = { + id: string; + inputs?: { + [key: string]: NodeInput; + }; + outputs?: Array; + meta?: { + description?: string; + title?: string; + }; +}; export type User = { id: string; name: string; }; -export type GetV1NodesByUserJsonData = { - path: { - user: string; - }; +export type PostNodesData = { + body?: never; + path?: never; + query?: never; + url: '/nodes'; }; -export type GetV1NodesByUserJsonResponse = (Array); +export type PostNodesResponses = { + /** + * Create a single node + */ + 200: NodeDefinition; +}; -export type GetV1NodesByUserJsonError = unknown; +export type PostNodesResponse = PostNodesResponses[keyof PostNodesResponses]; -export type GetV1NodesByUserBySystemJsonData = { +export type GetNodesByUserJsonData = { + body?: never; + path?: { + user?: string; + }; + query?: never; + url: '/nodes/{user}.json'; +}; + +export type GetNodesByUserJsonResponses = { + /** + * Retrieve nodes for a user + */ + 200: Array; +}; + +export type GetNodesByUserJsonResponse = GetNodesByUserJsonResponses[keyof GetNodesByUserJsonResponses]; + +export type GetNodesByUserBySystemJsonData = { + body?: never; path: { + user: string; system?: string; - user: string; }; + query?: never; + url: '/nodes/{user}/{system}.json'; }; -export type GetV1NodesByUserBySystemJsonResponse = (Array); +export type GetNodesByUserBySystemJsonResponses = { + /** + * Retrieve nodes for a system + */ + 200: Array; +}; -export type GetV1NodesByUserBySystemJsonError = unknown; +export type GetNodesByUserBySystemJsonResponse = GetNodesByUserBySystemJsonResponses[keyof GetNodesByUserBySystemJsonResponses]; -export type GetV1NodesByUserBySystemByNodeIdby-.+jsonData = { +export type GetNodesByUserBySystemByNodeIdJsonData = { + body?: never; path: { - nodeId: string; - system: string; user: string; + system: string; + nodeId?: string; }; + query?: never; + url: '/nodes/{user}/{system}/{nodeId}.json'; }; -export type GetV1NodesByUserBySystemByNodeIdby-.+jsonResponse = (NodeDefinition); +export type GetNodesByUserBySystemByNodeIdJsonResponses = { + /** + * Retrieve a single node definition + */ + 200: NodeDefinition; +}; -export type GetV1NodesByUserBySystemByNodeIdby-.+jsonError = unknown; +export type GetNodesByUserBySystemByNodeIdJsonResponse = GetNodesByUserBySystemByNodeIdJsonResponses[keyof GetNodesByUserBySystemByNodeIdJsonResponses]; -export type GetV1NodesByUserBySystemByNodeIdby-.+WasmData = { +export type GetNodesByUserBySystemByNodeId_byVersionJsonData = { + body?: never; path: { - nodeId: string; - system: string; user: string; + system: string; + nodeId: string; + version?: string; }; + query?: never; + url: '/nodes/{user}/{system}/{nodeId}@{version}.json'; }; -export type GetV1NodesByUserBySystemByNodeIdby-.+WasmResponse = (unknown); +export type GetNodesByUserBySystemByNodeId_byVersionJsonResponses = { + /** + * Retrieve a single node definition + */ + 200: NodeDefinition; +}; -export type GetV1NodesByUserBySystemByNodeIdby-.+WasmError = unknown; +export type GetNodesByUserBySystemByNodeId_byVersionJsonResponse = GetNodesByUserBySystemByNodeId_byVersionJsonResponses[keyof GetNodesByUserBySystemByNodeId_byVersionJsonResponses]; -export type PostV1NodesResponse = (NodeDefinition); +export type GetNodesByUserBySystemByNodeIdVersionsJsonData = { + body?: never; + path: { + user: string; + system: string; + nodeId: string; + }; + query?: never; + url: '/nodes/{user}/{system}/{nodeId}/versions.json'; +}; -export type PostV1NodesError = unknown; +export type GetNodesByUserBySystemByNodeIdVersionsJsonResponses = { + /** + * Retrieve a single node definition + */ + 200: Array; +}; -export type GetV1UsersUsersJsonResponse = (Array); +export type GetNodesByUserBySystemByNodeIdVersionsJsonResponse = GetNodesByUserBySystemByNodeIdVersionsJsonResponses[keyof GetNodesByUserBySystemByNodeIdVersionsJsonResponses]; -export type GetV1UsersUsersJsonError = unknown; +export type GetNodesByUserBySystemByNodeIdWasmData = { + body?: never; + path: { + user: string; + system: string; + nodeId?: string; + }; + query?: never; + url: '/nodes/{user}/{system}/{nodeId}.wasm'; +}; -export type GetV1UsersByUserIdJsonData = { +export type GetNodesByUserBySystemByNodeIdWasmResponses = { + /** + * Retrieve a node's WASM file + */ + 200: unknown; +}; + +export type GetNodesByUserBySystemByNodeId_byVersionWasmData = { + body?: never; + path: { + user: string; + system: string; + nodeId: string; + version?: string; + }; + query?: never; + url: '/nodes/{user}/{system}/{nodeId}@{version}.wasm'; +}; + +export type GetNodesByUserBySystemByNodeId_byVersionWasmResponses = { + /** + * Retrieve a node's WASM file + */ + 200: unknown; +}; + +export type GetUsersUsersJsonData = { + body?: never; + path?: never; + query?: never; + url: '/users/users.json'; +}; + +export type GetUsersUsersJsonResponses = { + /** + * Retrieve a single node definition + */ + 200: Array; +}; + +export type GetUsersUsersJsonResponse = GetUsersUsersJsonResponses[keyof GetUsersUsersJsonResponses]; + +export type GetUsersByUserIdJsonData = { + body?: never; path?: { userId?: string; }; + query?: never; + url: '/users/{userId}.json'; }; -export type GetV1UsersByUserIdJsonResponse = (User); +export type GetUsersByUserIdJsonResponses = { + /** + * Retrieve a single node definition + */ + 200: User; +}; -export type GetV1UsersByUserIdJsonError = unknown; \ No newline at end of file +export type GetUsersByUserIdJsonResponse = GetUsersByUserIdJsonResponses[keyof GetUsersByUserIdJsonResponses]; diff --git a/packages/types/package.json b/packages/types/package.json index 89a8b7a..f9ae497 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -13,6 +13,6 @@ "author": "", "license": "ISC", "dependencies": { - "zod": "^4.1.12" + "zod": "^4.3.5" } } diff --git a/packages/ui/.storybook/main.ts b/packages/ui/.storybook/main.ts deleted file mode 100644 index 52aa66f..0000000 --- a/packages/ui/.storybook/main.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { StorybookConfig } from '@storybook/sveltekit'; - -const config: StorybookConfig = { - "stories": [ - "../src/**/*.stories.@(js|ts|svelte)" - ], - - "addons": [ - "@storybook/addon-svelte-csf", - "@storybook/addon-essentials", - "@storybook/addon-themes", - ], - - "framework": { - "name": "@storybook/sveltekit", - "options": {} - }, - - docs: {} -}; -export default config; diff --git a/packages/ui/.storybook/manager-head.html b/packages/ui/.storybook/manager-head.html deleted file mode 100644 index a3c7f89..0000000 --- a/packages/ui/.storybook/manager-head.html +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/packages/ui/.storybook/preview.ts b/packages/ui/.storybook/preview.ts deleted file mode 100644 index 9e27467..0000000 --- a/packages/ui/.storybook/preview.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { withThemeByClassName } from "@storybook/addon-themes"; -import type { Preview } from '@storybook/svelte'; - -import "../src/lib/app.css"; - -const preview: Preview = { - parameters: { - controls: { - matchers: { - color: /(background|color)$/i, - date: /Date$/i, - }, - }, - }, - decorators: [withThemeByClassName({ - themes: { - dark: 'theme-dark', - light: 'theme-light', - catppuccin: 'theme-catppuccin', - solarized: 'theme-solarized', - high: 'theme-high-contrast', - nord: 'theme-nord', - dracula: 'theme-dracula', - }, - defaultTheme: 'light', - })], -}; - -export default preview; diff --git a/packages/ui/package.json b/packages/ui/package.json index f710a49..9eccefd 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -10,9 +10,7 @@ "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "test": "vitest", - "lint": "eslint .", - "story:dev": "storybook dev -p 6006", - "story:build": "storybook build" + "lint": "eslint ." }, "exports": { ".": { @@ -30,36 +28,32 @@ "svelte": "^4.0.0" }, "devDependencies": { - "@storybook/addon-essentials": "^8.6.14", - "@storybook/addon-svelte-csf": "5.0.10", - "@storybook/addon-themes": "^10.0.8", - "@storybook/svelte": "^10.0.8", - "@storybook/sveltekit": "^10.0.8", + "@nodarium/types": "link:../types", "@sveltejs/adapter-static": "^3.0.10", - "@sveltejs/kit": "^2.49.0", - "@sveltejs/package": "^2.5.6", - "@sveltejs/vite-plugin-svelte": "^6.2.1", + "@sveltejs/kit": "^2.50.0", + "@sveltejs/package": "^2.5.7", + "@sveltejs/vite-plugin-svelte": "^6.2.4", "@types/eslint": "^9.6.1", - "@typescript-eslint/eslint-plugin": "^8.47.0", - "@typescript-eslint/parser": "^8.47.0", - "eslint": "^9.39.1", - "eslint-plugin-storybook": "^10.0.8", - "eslint-plugin-svelte": "^3.13.0", - "publint": "^0.3.15", - "storybook": "^10.0.8", - "svelte": "^5.43.14", - "svelte-check": "^4.3.4", + "@types/three": "^0.182.0", + "@typescript-eslint/eslint-plugin": "^8.53.0", + "@typescript-eslint/parser": "^8.53.0", + "eslint": "^9.39.2", + "eslint-plugin-svelte": "^3.14.0", + "publint": "^0.3.16", + "svelte": "^5.46.4", + "svelte-check": "^4.3.5", "tslib": "^2.8.1", "typescript": "^5.9.3", - "vite": "^7.2.4", - "vitest": "^4.0.13", - "@nodarium/types": "link:../types" + "vite": "^7.3.1", + "vitest": "^4.0.17" }, "svelte": "./dist/index.js", "types": "./dist/index.d.ts", "type": "module", "dependencies": { - "@threlte/core": "^8.3.0", - "@threlte/extras": "^9.7.0" + "@tailwindcss/vite": "^4.1.18", + "@threlte/core": "^8.3.1", + "@threlte/extras": "^9.7.1", + "tailwindcss": "^4.1.18" } } diff --git a/packages/ui/src/lib/Input.svelte b/packages/ui/src/lib/Input.svelte index 2e87617..ce16b12 100644 --- a/packages/ui/src/lib/Input.svelte +++ b/packages/ui/src/lib/Input.svelte @@ -1,29 +1,28 @@ {#if input.type === 'float'} - + {:else if input.type === 'integer'} - + {:else if input.type === 'boolean'} - + {:else if input.type === 'select'} - {:else if input.type === 'vec3'} - + {/if} diff --git a/packages/ui/src/lib/app.css b/packages/ui/src/lib/app.css index de087f3..e96ef2e 100644 --- a/packages/ui/src/lib/app.css +++ b/packages/ui/src/lib/app.css @@ -1,3 +1,5 @@ +@import "tailwindcss"; + /* fira-code-300 - latin */ @font-face { font-display: swap; @@ -63,11 +65,9 @@ html { } body { - overflow: hidden; - - color: var(--text-color); background-color: var(--layer-0); + margin: 0; } body * { @@ -140,10 +140,6 @@ html.theme-dracula { --connection: #6272A4; } -body { - margin: 0; -} - button { background-color: var(--layer-2); border: 1px solid var(--outline); diff --git a/packages/ui/src/lib/elements/Checkbox.svelte b/packages/ui/src/lib/elements/Checkbox.svelte deleted file mode 100644 index 8010391..0000000 --- a/packages/ui/src/lib/elements/Checkbox.svelte +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - diff --git a/packages/ui/src/lib/elements/Float.stories.svelte b/packages/ui/src/lib/elements/Float.stories.svelte deleted file mode 100644 index 1c5500a..0000000 --- a/packages/ui/src/lib/elements/Float.stories.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/packages/ui/src/lib/elements/Integer.stories.svelte b/packages/ui/src/lib/elements/Integer.stories.svelte deleted file mode 100644 index 27f83f8..0000000 --- a/packages/ui/src/lib/elements/Integer.stories.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/packages/ui/src/lib/elements/Select.stories.svelte b/packages/ui/src/lib/elements/Select.stories.svelte deleted file mode 100644 index e6a0418..0000000 --- a/packages/ui/src/lib/elements/Select.stories.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/packages/ui/src/lib/elements/Vec3.stories.svelte b/packages/ui/src/lib/elements/Vec3.stories.svelte deleted file mode 100644 index dc288bf..0000000 --- a/packages/ui/src/lib/elements/Vec3.stories.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/packages/ui/src/lib/index.ts b/packages/ui/src/lib/index.ts index 48684f7..4f200e7 100644 --- a/packages/ui/src/lib/index.ts +++ b/packages/ui/src/lib/index.ts @@ -1,16 +1,12 @@ -// Reexport your entry components here -import Input from './Input.svelte'; - -import Float from "./elements/Float.svelte"; -import Integer from "./elements/Integer.svelte"; -import Select from "./elements/Select.svelte"; -import Checkbox from "./elements/Checkbox.svelte"; -import Details from "./Details.svelte"; - -export const icons = import.meta.glob('./icons/*.svg?raw', { eager: true }) - -export { Float, Integer, Select, Checkbox, Input, Details }; - -export default Input; +export { default as Input } from "./Input.svelte" +export { default as Float } from "./inputs/Float.svelte" +export { default as Integer } from "./inputs/Integer.svelte" +export { default as Select } from "./inputs/Select.svelte" +export { default as Checkbox } from "./inputs/Checkbox.svelte" +export { default as Vec3 } from "./inputs/Vec3.svelte"; +export { default as Details } from "./Details.svelte" export { default as ShortCut } from "./ShortCut.svelte"; + +import Input from './Input.svelte'; +export default Input; diff --git a/packages/ui/src/lib/inputs/Checkbox.svelte b/packages/ui/src/lib/inputs/Checkbox.svelte new file mode 100644 index 0000000..7505dcb --- /dev/null +++ b/packages/ui/src/lib/inputs/Checkbox.svelte @@ -0,0 +1,45 @@ + + + diff --git a/packages/ui/src/lib/elements/Float.svelte b/packages/ui/src/lib/inputs/Float.svelte similarity index 97% rename from packages/ui/src/lib/elements/Float.svelte rename to packages/ui/src/lib/inputs/Float.svelte index c3d9d66..7435d3a 100644 --- a/packages/ui/src/lib/elements/Float.svelte +++ b/packages/ui/src/lib/inputs/Float.svelte @@ -4,15 +4,13 @@ step?: number; min?: number; max?: number; - id?: string; } let { value = $bindable(0.5), step = 0.01, min = $bindable(0), - max = $bindable(1), - id = '' + max = $bindable(1) }: Props = $props(); if (min > max) { @@ -55,6 +53,7 @@ window.addEventListener('mousemove', handleMouseMove); window.addEventListener('mouseup', handleMouseUp); document.body.style.cursor = 'ew-resize'; + (ev.target as HTMLElement)?.blur(); } function handleMouseUp() { @@ -93,6 +92,7 @@ } else { value = Math.max(Math.min(min + (max - min) * vx, max), min); } + (ev.target as HTMLElement)?.blur(); } $effect(() => { if ((value || 0).toString().length > 5) { @@ -110,7 +110,6 @@ import '$lib/app.css'; - import Float from '$lib/elements/Float.svelte'; - import Integer from '$lib/elements/Integer.svelte'; - import Vec3 from '$lib/elements/Vec3.svelte'; + import { Checkbox, Details, Float, Integer, Select, ShortCut, Vec3 } from '$lib/index.js'; + import Section from './Section.svelte'; let intValue = $state(0); let floatValue = $state(0.2); let vecValue = $state([0.2, 0.3, 0.4]); + const options = ['strawberry', 'raspberry', 'chickpeas']; + let selectValue = $state(0); + const d = $derived(options[selectValue]); + + let checked = $state(false); + let detailsOpen = $state(false); + + const themes = ['light', 'solarized', 'catppuccin', 'high-contrast', 'nord', 'dracula']; + let themeIndex = $state(0); + $effect(() => { + const classList = document.documentElement.classList; + for (const c of classList) { + if (c.startsWith('theme-')) document.documentElement.classList.remove(c); + } + document.documentElement.classList.add(`theme-${themes[themeIndex]}`); + }); -
-
-

Integer {intValue}

+
+
+

@nodarium/ui

+ +
+ +
-
+
-
-

Float {floatValue}

+
-
+
-
-

Vec3 {JSON.stringify(vecValue)}

+
-
+
+ +
+