silgi 0.3.9 → 0.3.12

package/dist/cli/index.mjs

@@ -3,7 +3,7 @@ import consola from 'consola';
 
 const name = "silgi";
 const type = "module";
-const version = "0.3.9";
+const version = "0.3.12";
 const packageManager = "pnpm@9.15.1";
 const sideEffects = false;
 const exports = {
@@ -83,8 +83,8 @@ const peerDependencies = {
 	nitropack: "^2.10.4",
 	nuxt: "^3.15.3",
 	typescript: "^5.7.3",
-	zod: "^3.24.1",
-	vue: "^3.5.13"
+	vue: "^3.5.13",
+	zod: "^3.24.1"
 };
 const peerDependenciesMeta = {
 	"@nuxt/kit": {
@@ -99,10 +99,10 @@ const peerDependenciesMeta = {
 	nuxt: {
 		optional: true
 	},
-	zod: {
+	vue: {
 		optional: true
 	},
-	vue: {
+	zod: {
 		optional: true
 	}
 };

package/dist/ecosystem/nuxt/runtime/composables/useFetch.d.ts

@@ -1,19 +1,16 @@
-import type { AsyncData, UseFetchOptions } from 'nuxt/app';
-import type { $Fetch } from 'ofetch';
-import type { Ref } from 'vue';
-import type { FetchResponseData, FetchResponseError, FilterMethods, ParamsOption, RequestBodyOption, SilgiRouterTypes } from 'silgi';
-export type OpenFetchClientName = 'ofetch';
-type PickFrom<T, K extends Array<string>> = T extends Array<any> ? T : T extends Record<string, any> ? keyof T extends K[number] ? T : K[number] extends never ? T : Pick<T, K[number]> : T;
-type KeysOf<T> = Array<T extends T ? keyof T extends string ? keyof T : never : never>;
-type ComputedOptions<T> = {
-    [K in keyof T]: T[K] extends Function ? T[K] : ComputedOptions<T[K]> | Ref<T[K]> | T[K];
-};
-type ComputedMethodOption<M, P> = 'get' extends keyof P ? ComputedOptions<{
-    method?: M;
-}> : ComputedOptions<{
-    method: M;
-}>;
-type UseOpenFetchOptions<ReqT extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[ReqT], LowercasedMethod, Params, ResT, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null, Operation = 'get' extends LowercasedMethod ? ('get' extends keyof Params ? Params['get'] : never) : LowercasedMethod extends keyof Params ? Params[LowercasedMethod] : never> = ComputedMethodOption<Method, Params> & ComputedOptions<ParamsOption<Operation>> & ComputedOptions<RequestBodyOption<ReqT, Method>> & Omit<UseFetchOptions<ResT, DataT, PickKeys, DefaultT>, 'query' | 'body' | 'method'>;
-export type UseOpenFetchClient<Paths extends keyof SilgiRouterTypes, Lazy extends boolean> = <Methods extends FilterMethods<Paths>, Method extends Extract<keyof Methods, string> | Uppercase<Extract<keyof Methods, string>>, LowercasedMethod extends Lowercase<Method> extends keyof Methods ? Lowercase<Method> : never, DefaultMethod extends 'get' extends LowercasedMethod ? 'get' : LowercasedMethod, ResT = Methods[DefaultMethod] extends Record<string | number, any> ? FetchResponseData<Paths, Method> : never, ErrorT = Methods[DefaultMethod] extends Record<string | number, any> ? FetchResponseError<Methods[DefaultMethod]> : never, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(url: Paths | (() => Paths), options?: Lazy extends true ? Omit<UseOpenFetchOptions<Paths, Method, LowercasedMethod, Methods, ResT, DataT, PickKeys, DefaultT>, 'lazy'> : UseOpenFetchOptions<Paths, Method, LowercasedMethod, Methods, ResT, DataT, PickKeys, DefaultT>, autoKey?: string) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, ErrorT | null>;
-export declare function createUseOpenFetch<Paths extends keyof SilgiRouterTypes, Lazy extends boolean = false>(client: $Fetch | OpenFetchClientName, lazy?: Lazy): UseOpenFetchClient<Paths, Lazy>;
-export {};
+import type { AvailableRouterMethod } from 'nitropack';
+import type { FetchError } from 'ofetch';
+import type { SilgiRouterTypes } from 'silgi';
+import { type AsyncData, type FetchResult, type UseFetchOptions } from 'nuxt/app';
+export type KeysOf<T> = Array<T extends T ? keyof T extends string ? keyof T : never : never>;
+export type PickFrom<T, K extends Array<string>> = T extends Array<any> ? T : T extends Record<string, any> ? keyof T extends K[number] ? T : K[number] extends never ? T : Pick<T, K[number]> : T;
+export declare function useSilgiFetch<ResT = void, ErrorT = FetchError, ReqT extends keyof SilgiRouterTypes = keyof SilgiRouterTypes, Method extends AvailableRouterMethod<ReqT> = ResT extends void ? 'get' extends AvailableRouterMethod<ReqT> ? 'get' : AvailableRouterMethod<ReqT> : AvailableRouterMethod<ReqT>, _ResT = ResT extends void ? FetchResult<ReqT, Method> : ResT, DataT = SilgiRouterTypes[ReqT][Method] extends {
+    output: any;
+} ? SilgiRouterTypes[ReqT][Method]['output'] : any, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = SilgiRouterTypes[ReqT][Method] extends {
+    output: infer T;
+} ? T : never>(url: ReqT | (() => ReqT), options?: Omit<UseFetchOptions<any, any, any, any, ReqT>, 'method' | 'body'> & {
+    method?: keyof SilgiRouterTypes[ReqT];
+    body?: SilgiRouterTypes[ReqT][Method] extends {
+        input: any;
+    } ? SilgiRouterTypes[ReqT][Method]['input'] : never;
+}): AsyncData<DefaultT | PickFrom<DataT, PickKeys>, ErrorT | null>;

package/dist/ecosystem/nuxt/runtime/composables/useFetch.mjs

@@ -1,10 +1,7 @@
-import { useFetch, useNuxtApp } from "nuxt/app";
-import { toValue } from "vue";
-export function createUseOpenFetch(client, lazy = false) {
-  return (url, options = {}, autoKey) => {
-    const nuxtApp = useNuxtApp();
-    const $fetch = typeof client === "string" ? nuxtApp[`$${client}`] : client;
-    const opts = { $fetch, key: autoKey, ...options };
-    return useFetch(() => toValue(url), lazy ? { ...opts, lazy } : opts);
-  };
+import { useFetch } from "nuxt/app";
+export function useSilgiFetch(url, options) {
+  return useFetch(url, {
+    ...options,
+    method: options?.method?.toUpperCase() ?? "GET"
+  });
 }

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { b as SilgiConfig, c as SilgiHelper, d as SilgiRouterTypes, S as SilgiOptions, M as ModuleOptions, e as ModuleDefinition, f as SilgiModule, B as BaseSchemaType, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergedSilgiSchema, l as ServiceType, m as SilgiSchema, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.ClpvycKI.mjs';
 export { F as Awaitable, G as CreateScope, D as DeepPartial, C as DefaultHooks, A as DefaultMethods, E as ExtendShared, u as ExtractInputFromURI, v as ExtractOutputFromURI, w as ExtractRouterParamsFromURI, s as SilgiDefaultShared, o as SilgiEvent, z as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.ClpvycKI.mjs';
-import { FetchError, FetchContext, FetchOptions } from 'ofetch';
+import { FetchContext, FetchOptions } from 'ofetch';
 import { LoadConfigOptions } from 'c12';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
@@ -59,7 +59,6 @@ declare class SilgiError extends Error {
 type FetchResponseData<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
     output: any;
 } ? SilgiRouterTypes[Route][Method]['output'] : never;
-type FetchResponseError<T extends Record<string | number, any>> = FetchError;
 type MethodOption<M, P> = 'get' extends keyof P ? {
     method?: M;
 } : {
@@ -194,4 +193,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, type FetchResponseData, type FetchResponseError, type FilterMethods, MergedSilgiSchema, type MethodOption, type Namespaces, type ParamsOption, type RequestBodyOption, type RouterParams, ServiceType, Silgi, SilgiError, type SilgiFetchClient, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, silgiFetchRequestInterceptor, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, type FetchResponseData, type FilterMethods, MergedSilgiSchema, type MethodOption, type Namespaces, type ParamsOption, type RequestBodyOption, type RouterParams, ServiceType, Silgi, SilgiError, type SilgiFetchClient, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, silgiFetchRequestInterceptor, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { b as SilgiConfig, c as SilgiHelper, d as SilgiRouterTypes, S as SilgiOptions, M as ModuleOptions, e as ModuleDefinition, f as SilgiModule, B as BaseSchemaType, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergedSilgiSchema, l as ServiceType, m as SilgiSchema, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.ClpvycKI.js';
 export { F as Awaitable, G as CreateScope, D as DeepPartial, C as DefaultHooks, A as DefaultMethods, E as ExtendShared, u as ExtractInputFromURI, v as ExtractOutputFromURI, w as ExtractRouterParamsFromURI, s as SilgiDefaultShared, o as SilgiEvent, z as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.ClpvycKI.js';
-import { FetchError, FetchContext, FetchOptions } from 'ofetch';
+import { FetchContext, FetchOptions } from 'ofetch';
 import { LoadConfigOptions } from 'c12';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
@@ -59,7 +59,6 @@ declare class SilgiError extends Error {
 type FetchResponseData<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
     output: any;
 } ? SilgiRouterTypes[Route][Method]['output'] : never;
-type FetchResponseError<T extends Record<string | number, any>> = FetchError;
 type MethodOption<M, P> = 'get' extends keyof P ? {
     method?: M;
 } : {
@@ -194,4 +193,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, type FetchResponseData, type FetchResponseError, type FilterMethods, MergedSilgiSchema, type MethodOption, type Namespaces, type ParamsOption, type RequestBodyOption, type RouterParams, ServiceType, Silgi, SilgiError, type SilgiFetchClient, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, silgiFetchRequestInterceptor, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, type FetchResponseData, type FilterMethods, MergedSilgiSchema, type MethodOption, type Namespaces, type ParamsOption, type RequestBodyOption, type RouterParams, ServiceType, Silgi, SilgiError, type SilgiFetchClient, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, silgiFetchRequestInterceptor, tryUseSilgi, useHook, useShared, useSilgi };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.3.9",
+  "version": "0.3.12",
   "sideEffects": false,
   "exports": {
     ".": {
@@ -66,8 +66,8 @@
     "nitropack": "^2.10.4",
     "nuxt": "^3.15.3",
     "typescript": "^5.7.3",
-    "zod": "^3.24.1",
-    "vue": "^3.5.13"
+    "vue": "^3.5.13",
+    "zod": "^3.24.1"
   },
   "peerDependenciesMeta": {
     "@nuxt/kit": {
@@ -82,10 +82,10 @@
     "nuxt": {
       "optional": true
     },
-    "zod": {
+    "vue": {
       "optional": true
     },
-    "vue": {
+    "zod": {
       "optional": true
     }
   },