silgi 0.8.42 → 0.8.44

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.8.42";
+const version = "0.8.44";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/cli/prepare.mjs

@@ -277,7 +277,7 @@ async function readCoreFile(silgi) {
       console.error("Failed to read core.ts file:", error);
     } else {
       if (error instanceof Error) {
-        consola.error(error.message);
+        consola.withTag("silgi").error(error.message);
       }
     }
     return {
@@ -1813,7 +1813,7 @@ const prepare = defineCommand({
     }
     await generate();
     await generate();
-    consola.success("Prepare completed");
+    consola.withTag("silgi").success("Prepare completed");
   }
 });
 

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.42";
+const version = "0.8.44";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.8.42";
+const version = "0.8.44";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/presets/_all.gen.mjs

@@ -1,10 +1,10 @@
 import _h3 from "./h3/preset.mjs";
 import _nitro from "./nitro/preset.mjs";
-import _npmpackage from "./npmpackage/preset.mjs";
+import _npmPackage from "./npmPackage/preset.mjs";
 import _nuxt from "./nuxt/preset.mjs";
 export default [
   ..._h3,
   ..._nitro,
-  ..._npmpackage,
+  ..._npmPackage,
   ..._nuxt
 ];

package/dist/runtime/internal/ofetch.d.ts

@@ -1,4 +1,4 @@
-import type { FetchContext, FetchOptions } from 'ofetch';
+import type { FetchContext, FetchOptions, FetchResponse } from 'ofetch';
 import type { SilgiRouterTypes } from 'silgi/types';
 type TrimAfterFourSlashes<T extends string> = T extends `/${infer S1}/${infer S2}/${infer S3}/${infer S4}/${infer _}` ? `/${S1}/${S2}/${S3}/${S4}` : T;
 type AllPaths = SilgiRouterTypes extends {
@@ -9,25 +9,14 @@ type ExtractPathParams<T extends string> = T extends `${infer _Start}:${infer Pa
 } & ExtractPathParams<Rest> : T extends `${infer _Start}:${infer Param}` ? {
     [K in Param]: string;
 } : object;
-type ValidRoute = AllPaths | (string & {});
-type Method<R extends ValidRoute> = TrimAfterFourSlashes<R> extends keyof SilgiRouterTypes ? keyof SilgiRouterTypes[TrimAfterFourSlashes<R>] : never;
-export type FetchResponseData<R extends ValidRoute, M extends Method<R>> = TrimAfterFourSlashes<R> extends keyof SilgiRouterTypes ? SilgiRouterTypes[TrimAfterFourSlashes<R>][M]['output'] : never;
-export type RequestBodyOption<R extends ValidRoute, M extends Method<R>> = TrimAfterFourSlashes<R> extends keyof SilgiRouterTypes ? SilgiRouterTypes[TrimAfterFourSlashes<R>][M] extends {
-    input: infer I;
-} ? {
-    body: I;
-} : {
-    body?: never;
-} : never;
-export type RouterParams<R extends ValidRoute> = ExtractPathParams<R>;
-type SilgiFetchOptions<R extends ValidRoute, M extends Method<R>> = {
-    method: M;
-} & RequestBodyOption<R, M> & (RouterParams<R> extends object ? {
-    params?: RouterParams<R>;
-} : {
-    params?: never;
-}) & Omit<FetchOptions, 'query' | 'body' | 'method'>;
-export type SilgiFetchClient = <R extends ValidRoute, M extends Method<R> = 'get' extends Method<R> ? 'get' : Method<R>>(url: R, options: SilgiFetchOptions<R, M>) => Promise<FetchResponseData<R, M>>;
+export type RouterParams<R extends AllPaths | (string & {})> = ExtractPathParams<R>;
+type SilgiFetchOptions<T, P extends AllPaths | (string & {}), BasePath extends keyof SilgiRouterTypes = TrimAfterFourSlashes<P> extends keyof SilgiRouterTypes ? TrimAfterFourSlashes<P> : never, M extends keyof SilgiRouterTypes[BasePath] = keyof SilgiRouterTypes[BasePath]> = {
+    method?: M;
+    params?: ExtractPathParams<P>;
+    body?: SilgiRouterTypes[BasePath][M]['input'];
+} & Omit<FetchOptions, 'method' | 'body' | 'params'>;
+export type SilgiFetchClient = <T, P extends AllPaths | (string & {}), BasePath extends keyof SilgiRouterTypes = TrimAfterFourSlashes<P> extends keyof SilgiRouterTypes ? TrimAfterFourSlashes<P> : never, M extends keyof SilgiRouterTypes[BasePath] = keyof SilgiRouterTypes[BasePath]>(url: BasePath, options: SilgiFetchOptions<T, P, BasePath, M>) => Promise<FetchResponse<SilgiRouterTypes[BasePath][M]['output']>>;
 export declare function silgiFetchRequestInterceptor(ctx: FetchContext): void;
 export declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
+export declare function silgi$fetch<T, P extends AllPaths | (string & {}), BasePath extends keyof SilgiRouterTypes = TrimAfterFourSlashes<P> extends keyof SilgiRouterTypes ? TrimAfterFourSlashes<P> : never, M extends keyof SilgiRouterTypes[BasePath] = keyof SilgiRouterTypes[BasePath]>(url: P, opts?: SilgiFetchOptions<T, P, BasePath, M>): Promise<FetchResponse<SilgiRouterTypes[BasePath][M]['output']>>;
 export {};

package/dist/runtime/internal/ofetch.mjs

@@ -6,12 +6,20 @@ export function createSilgiFetch(options, localFetch) {
     const finalOpts = {
       ...typeof options === "function" ? options(opts) : options,
       ...opts,
-      method: opts.method || "get"
+      method: opts?.method || "get"
     };
     const $fetch = getFetch(url, finalOpts, localFetch);
     return $fetch(fillPath(url, opts.params), finalOpts);
   };
 }
+export function silgi$fetch(url, opts) {
+  const finalOpts = {
+    ...opts,
+    method: opts?.method || "get"
+  };
+  const $fetch = getFetch(url, finalOpts);
+  return $fetch(fillPath(url, opts.params), finalOpts);
+}
 function getFetch(url, opts, localFetch) {
   if (import.meta.server && localFetch) {
     const isLocalFetch = url[0] === "/" && (!opts.baseURL || opts.baseURL[0] === "/");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.8.42",
+  "version": "0.8.44",
   "private": false,
   "sideEffects": false,
   "exports": {