silgi 0.3.0 → 0.3.2

package/dist/chunks/generate.mjs

@@ -575,21 +575,30 @@ async function generateRouterDTS(silgi) {
       params: ${params}
     }`;
         }).join(",\n");
-        return `  '${path}': {
+        return `  '/${path}': {
 ${methodEntries}
   }`;
       });
+      const nitro = [
+        "declare module 'nitropack/types' {",
+        "  interface InternalApi extends RouterTypes {}",
+        "}"
+      ];
       const context = [
         "import type { ExtractInputFromURI, ExtractOutputFromURI, ExtractRouterParamsFromURI } from 'silgi'",
         "",
-        "export type RouterTypes = {",
+        "export interface RouterTypes {",
         routerTypes.join(",\n"),
         "}",
         "",
         "declare module 'silgi' {",
         "  interface SilgiRouterTypes extends RouterTypes {",
         "  }",
-        "}"
+        "}",
+        "",
+        silgi.options.environment === "h3" || silgi.options.environment === "nitrojs" ? nitro.join("\n") : "",
+        "",
+        "export {}"
       ].join("\n");
       const outputPath = resolve(silgi.options.buildDir, "silgi-routes.d.ts");
       await promises.writeFile(outputPath, context);
@@ -1213,9 +1222,9 @@ async function generate$1(mergeConfig) {
   };
   silgi._ignore = ignore(silgi.options.ignoreOptions);
   silgi.hook("prepare:types", (opts) => {
-    opts.references.push({ path: resolve(silgi.options.buildDir, "schema.d.ts") });
-    opts.references.push({ path: resolve(silgi.options.buildDir, "h3.d.ts") });
-    opts.references.push({ path: resolve(silgi.options.buildDir, "silgi-routes.d.ts") });
+    opts.references.push({ path: resolve(silgi.options.buildDir, "./schema.d.ts") });
+    opts.references.push({ path: resolve(silgi.options.buildDir, "./h3.d.ts") });
+    opts.references.push({ path: resolve(silgi.options.buildDir, "./silgi-routes.d.ts") });
   });
   await generateUris(silgi);
   await generateSilgiStorageBaseType(silgi);

package/dist/cli/config.d.mts

@@ -1,7 +1,7 @@
 import * as unstorage from 'unstorage';
 import * as net from 'net';
 import * as consola from 'consola';
-import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions } from '../shared/silgi.DJkQv6rh.mjs';
+import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions } from '../shared/silgi.Bv3UrLx7.mjs';
 import 'hookable';
 import 'ignore';
 import '@standard-schema/spec';

package/dist/cli/config.d.ts

@@ -1,7 +1,7 @@
 import * as unstorage from 'unstorage';
 import * as net from 'net';
 import * as consola from 'consola';
-import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions } from '../shared/silgi.DJkQv6rh.js';
+import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions } from '../shared/silgi.Bv3UrLx7.js';
 import 'hookable';
 import 'ignore';
 import '@standard-schema/spec';

package/dist/cli/index.mjs

@@ -3,7 +3,7 @@ import consola from 'consola';
 
 const name = "silgi";
 const type = "module";
-const version = "0.3.0";
+const version = "0.3.2";
 const packageManager = "pnpm@9.15.1";
 const sideEffects = false;
 const exports = {
@@ -99,6 +99,7 @@ const dependencies = {
 	klona: "^2.0.6",
 	mlly: "^1.7.4",
 	nitropack: "^2.10.4",
+	ofetch: "^1.4.1",
 	pathe: "^2.0.2",
 	"pkg-types": "^1.3.1",
 	scule: "^1.3.0",

package/dist/ecosystem/nuxt/module.mjs

@@ -1,5 +1,11 @@
 import { defineNuxtModule } from '@nuxt/kit';
 import { resolvePath } from 'mlly';
+import { join } from 'pathe';
+import { l as loadSilgiConfig } from '../../shared/silgi.2D3gmgW0.mjs';
+import { r as relativeWithDot } from '../../shared/silgi.BNEdIEZH.mjs';
+import 'c12';
+import 'untyped';
+import 'std-env';
 
 const module = defineNuxtModule({
   meta: {
@@ -11,9 +17,13 @@ const module = defineNuxtModule({
   },
   defaults: {},
   async setup(options, nuxt) {
+    const silgi = await loadSilgiConfig({});
     nuxt.options.build.transpile.push("silgi");
     nuxt.options.nitro.modules ||= [];
     nuxt.options.nitro.modules.push(await resolvePath("silgi/ecosystem/nitro"));
+    nuxt.hook("prepare:types", ({ references }) => {
+      references.push({ path: relativeWithDot(nuxt.options.buildDir, join(silgi.buildDir, "silgi.d.ts")) });
+    });
   }
 });
 

package/dist/index.d.mts

@@ -1,5 +1,6 @@
-import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SilgiServiceInterface, g as DefaultNamespaces, h as Silgi, i as SilgiOperation, j as MergedSilgiSchema, k as ServiceType, l as SilgiSchema, R as RequiredServiceType, m as SilgiModuleShared } from './shared/silgi.DJkQv6rh.mjs';
-export { F as Awaitable, G as CreateScope, D as DeepPartial, C as DefaultHooks, A as DefaultMethods, E as ExtendShared, t as ExtractInputFromURI, u as ExtractOutputFromURI, v as ExtractRouterParamsFromURI, r as SilgiDefaultShared, n as SilgiEvent, z as SilgiHook, o as SilgiModuleMethods, a as SilgiModuleOptions, p as SilgiModules, q as SilgiNamespaces, S as SilgiOptions, y as SilgiRouterTypes, w as SilgiStorageBase, s as SilgiURIs, U as URIsTypes, x as silgi } from './shared/silgi.DJkQv6rh.mjs';
+import { b as SilgiConfig, c as SilgiHelper, d as SilgiRouterTypes, 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.Bv3UrLx7.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, S as SilgiOptions, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.Bv3UrLx7.mjs';
+import { FetchOptions } from 'ofetch';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
 import 'consola';
@@ -54,6 +55,20 @@ declare class SilgiError extends Error {
     static isSilgiError(error: unknown): error is SilgiError;
 }
 
+type RequestBodyOption<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
+    input: any;
+} ? {
+    body: SilgiRouterTypes[Route][Method]['input'];
+} : {
+    body?: never;
+};
+type DefaultMethod<Route extends keyof SilgiRouterTypes> = 'get' extends keyof SilgiRouterTypes[Route] ? 'get' : keyof SilgiRouterTypes[Route];
+type OpenFetchOptions<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>> = Partial<{
+    method: Method;
+}> & RequestBodyOption<Route, Method> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
+type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>>(url: Route, options?: OpenFetchOptions<Route, Method>) => Promise<SilgiRouterTypes[Route][Method]['output']>;
+declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
+
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
  * any hooks that are provided, and calling an optional setup function for full control.
@@ -151,4 +166,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SilgiServiceInterface, g as DefaultNamespaces, h as Silgi, i as SilgiOperation, j as MergedSilgiSchema, k as ServiceType, l as SilgiSchema, R as RequiredServiceType, m as SilgiModuleShared } from './shared/silgi.DJkQv6rh.js';
-export { F as Awaitable, G as CreateScope, D as DeepPartial, C as DefaultHooks, A as DefaultMethods, E as ExtendShared, t as ExtractInputFromURI, u as ExtractOutputFromURI, v as ExtractRouterParamsFromURI, r as SilgiDefaultShared, n as SilgiEvent, z as SilgiHook, o as SilgiModuleMethods, a as SilgiModuleOptions, p as SilgiModules, q as SilgiNamespaces, S as SilgiOptions, y as SilgiRouterTypes, w as SilgiStorageBase, s as SilgiURIs, U as URIsTypes, x as silgi } from './shared/silgi.DJkQv6rh.js';
+import { b as SilgiConfig, c as SilgiHelper, d as SilgiRouterTypes, 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.Bv3UrLx7.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, S as SilgiOptions, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.Bv3UrLx7.js';
+import { FetchOptions } from 'ofetch';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
 import 'consola';
@@ -54,6 +55,20 @@ declare class SilgiError extends Error {
     static isSilgiError(error: unknown): error is SilgiError;
 }
 
+type RequestBodyOption<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
+    input: any;
+} ? {
+    body: SilgiRouterTypes[Route][Method]['input'];
+} : {
+    body?: never;
+};
+type DefaultMethod<Route extends keyof SilgiRouterTypes> = 'get' extends keyof SilgiRouterTypes[Route] ? 'get' : keyof SilgiRouterTypes[Route];
+type OpenFetchOptions<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>> = Partial<{
+    method: Method;
+}> & RequestBodyOption<Route, Method> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
+type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>>(url: Route, options?: OpenFetchOptions<Route, Method>) => Promise<SilgiRouterTypes[Route][Method]['output']>;
+declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
+
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
  * any hooks that are provided, and calling an optional setup function for full control.
@@ -151,4 +166,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.mjs

@@ -375,6 +375,29 @@ async function createSilgi(config) {
   return silgi.options.helper;
 }
 
+function createSilgiFetch(options, localFetch) {
+  return (url, opts = {}) => {
+    opts = typeof options === "function" ? options(opts) : { ...options, ...opts };
+    if (!opts.method)
+      opts.method = "get";
+    const $fetch = getFetch(url, opts, localFetch);
+    return $fetch(fillPath(url, opts?.path), opts);
+  };
+}
+function getFetch(url, opts, localFetch) {
+  if (import.meta.server && localFetch) {
+    const isLocalFetch = url[0] === "/" && (!opts.baseURL || opts.baseURL[0] === "/");
+    if (isLocalFetch)
+      return localFetch;
+  }
+  return globalThis.$fetch;
+}
+function fillPath(path, params = {}) {
+  for (const [k, v] of Object.entries(params))
+    path = path.replace(`{${k}}`, encodeURIComponent(String(v)));
+  return path;
+}
+
 function defineSilgiModule(definition) {
   if (definition) {
     return _defineSilgiModule(definition);
@@ -469,4 +492,4 @@ function createSchema(silgiType) {
   return silgiType;
 }
 
-export { SilgiError, SilgiHelper, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, silgi, silgiCtx, tryUseSilgi, useSilgi };
+export { SilgiError, SilgiHelper, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, silgi, silgiCtx, tryUseSilgi, useSilgi };

package/dist/shared/{silgi.DJkQv6rh.d.mts → silgi.Bv3UrLx7.d.mts}

@@ -805,4 +805,4 @@ interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'sche
 }
 type SilgiFunction = typeof silgi;
 
-export { type DefaultMethods as A, type BaseSchemaType as B, type DefaultHooks as C, type DeepPartial as D, type ExtendShared as E, type Awaitable as F, type CreateScope as G, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SilgiServiceInterface as f, type DefaultNamespaces as g, type Silgi as h, type SilgiOperation as i, type MergedSilgiSchema as j, type ServiceType as k, type SilgiSchema as l, type SilgiModuleShared as m, type SilgiEvent as n, type SilgiModuleMethods as o, type SilgiModules as p, type SilgiNamespaces as q, type SilgiDefaultShared as r, type SilgiURIs as s, type ExtractInputFromURI as t, type ExtractOutputFromURI as u, type ExtractRouterParamsFromURI as v, type SilgiStorageBase as w, silgi as x, type SilgiRouterTypes as y, type SilgiHook as z };
+export { type DefaultMethods as A, type BaseSchemaType as B, type DefaultHooks as C, type DeepPartial as D, type ExtendShared as E, type Awaitable as F, type CreateScope as G, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type SilgiRouterTypes as d, type ModuleDefinition as e, type SilgiModule as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergedSilgiSchema as k, type ServiceType as l, type SilgiSchema as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiDefaultShared as s, type SilgiURIs as t, type ExtractInputFromURI as u, type ExtractOutputFromURI as v, type ExtractRouterParamsFromURI as w, type SilgiStorageBase as x, silgi as y, type SilgiHook as z };

package/dist/shared/{silgi.DJkQv6rh.d.ts → silgi.Bv3UrLx7.d.ts}

@@ -805,4 +805,4 @@ interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'sche
 }
 type SilgiFunction = typeof silgi;
 
-export { type DefaultMethods as A, type BaseSchemaType as B, type DefaultHooks as C, type DeepPartial as D, type ExtendShared as E, type Awaitable as F, type CreateScope as G, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SilgiServiceInterface as f, type DefaultNamespaces as g, type Silgi as h, type SilgiOperation as i, type MergedSilgiSchema as j, type ServiceType as k, type SilgiSchema as l, type SilgiModuleShared as m, type SilgiEvent as n, type SilgiModuleMethods as o, type SilgiModules as p, type SilgiNamespaces as q, type SilgiDefaultShared as r, type SilgiURIs as s, type ExtractInputFromURI as t, type ExtractOutputFromURI as u, type ExtractRouterParamsFromURI as v, type SilgiStorageBase as w, silgi as x, type SilgiRouterTypes as y, type SilgiHook as z };
+export { type DefaultMethods as A, type BaseSchemaType as B, type DefaultHooks as C, type DeepPartial as D, type ExtendShared as E, type Awaitable as F, type CreateScope as G, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type SilgiRouterTypes as d, type ModuleDefinition as e, type SilgiModule as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergedSilgiSchema as k, type ServiceType as l, type SilgiSchema as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiDefaultShared as s, type SilgiURIs as t, type ExtractInputFromURI as u, type ExtractOutputFromURI as v, type ExtractRouterParamsFromURI as w, type SilgiStorageBase as x, silgi as y, type SilgiHook as z };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "sideEffects": false,
   "exports": {
     ".": {
@@ -82,6 +82,7 @@
     "klona": "^2.0.6",
     "mlly": "^1.7.4",
     "nitropack": "^2.10.4",
+    "ofetch": "^1.4.1",
     "pathe": "^2.0.2",
     "pkg-types": "^1.3.1",
     "scule": "^1.3.0",