silgi 0.3.5 → 0.3.7

package/dist/chunks/generate.mjs

@@ -1,11 +1,10 @@
 import { defineCommand } from 'citty';
-import { l as loadSilgiConfig } from '../shared/silgi.2D3gmgW0.mjs';
+import { r as relativeWithDot, l as loadSilgiConfig } from '../shared/silgi.b9yhSIGd.mjs';
 import { createHooks } from 'hookable';
 import ignore from 'ignore';
 import { isAbsolute, resolve, join, relative, dirname, basename, extname } from 'pathe';
 import { promises, existsSync, writeFileSync, readFileSync } from 'node:fs';
 import { readPackageJSON } from 'pkg-types';
-import { r as relativeWithDot } from '../shared/silgi.BNEdIEZH.mjs';
 import { defu } from 'defu';
 import { withTrailingSlash } from 'ufo';
 import { resolvePath, resolve as resolve$1 } from 'mlly';

package/dist/cli/index.mjs

@@ -3,7 +3,7 @@ import consola from 'consola';
 
 const name = "silgi";
 const type = "module";
-const version = "0.3.5";
+const version = "0.3.7";
 const packageManager = "pnpm@9.15.1";
 const sideEffects = false;
 const exports = {
@@ -22,12 +22,12 @@ const exports = {
 		"import": "./dist/ecosystem/nitro/index.mjs"
 	},
 	"./ecosystem/nitro/runtime/*": {
-		types: "./dist/ecosystem/nitro/runtime/*",
-		"import": "./dist/ecosystem/nitro/runtime/*"
+		types: "./dist/ecosystem/nitro/runtime/*.d.ts",
+		"import": "./dist/ecosystem/nitro/runtime/*.mjs"
 	},
 	"./ecosystem/nuxt/runtime/*": {
-		types: "./dist/ecosystem/nuxt/runtime/*",
-		"import": "./dist/ecosystem/nuxt/runtime/*"
+		types: "./dist/ecosystem/nuxt/runtime/*.d.ts",
+		"import": "./dist/ecosystem/nuxt/runtime/*.mjs"
 	},
 	"./nuxt": {
 		types: "./dist/ecosystem/nuxt/module.d.mts",
@@ -79,6 +79,7 @@ const scripts = {
 };
 const peerDependencies = {
 	"@nuxt/kit": "^3.15.3",
+	h3: "^1.14.0",
 	nitropack: "^2.10.4",
 	nuxt: "^3.15.3",
 	typescript: "^5.7.3",
@@ -88,6 +89,9 @@ const peerDependenciesMeta = {
 	"@nuxt/kit": {
 		optional: true
 	},
+	h3: {
+		optional: true
+	},
 	nitropack: {
 		optional: true
 	},
@@ -110,7 +114,6 @@ const dependencies = {
 	eslint: "^9.18.0",
 	esno: "^4.8.0",
 	globby: "^14.0.2",
-	h3: "^1.14.0",
 	hookable: "^5.5.3",
 	ignore: "^7.0.3",
 	jiti: "^2.4.2",
@@ -134,6 +137,7 @@ const devDependencies = {
 	"@nuxt/kit": "^3.15.3",
 	"@types/node": "^22.10.7",
 	"@types/semver": "^7.5.8",
+	h3: "^1.14.0",
 	nitropack: "^2.10.4",
 	nuxt: "^3.15.3",
 	unbuild: "^3.3.1",

package/dist/ecosystem/nitro/index.mjs

@@ -1,7 +1,6 @@
 import { fileURLToPath } from 'node:url';
 import { resolve, dirname, join } from 'pathe';
-import { l as loadSilgiConfig } from '../../shared/silgi.2D3gmgW0.mjs';
-import { r as relativeWithDot } from '../../shared/silgi.BNEdIEZH.mjs';
+import { l as loadSilgiConfig, r as relativeWithDot } from '../../shared/silgi.b9yhSIGd.mjs';
 import 'c12';
 import 'untyped';
 import 'std-env';

package/dist/ecosystem/nuxt/module.mjs

@@ -1,8 +1,7 @@
-import { defineNuxtModule } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addImportsDir } 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 { l as loadSilgiConfig, r as relativeWithDot } from '../../shared/silgi.b9yhSIGd.mjs';
 import 'c12';
 import 'untyped';
 import 'std-env';
@@ -17,6 +16,9 @@ const module = defineNuxtModule({
   },
   defaults: {},
   async setup(options, nuxt) {
+    const { resolve } = createResolver(import.meta.url);
+    const runtimeDir = resolve("./runtime");
+    const composablesDir = resolve(join(runtimeDir, "./composables"));
     const silgi = await loadSilgiConfig({});
     nuxt.options.build.transpile.push("silgi");
     nuxt.options.nitro.modules ||= [];
@@ -24,6 +26,7 @@ const module = defineNuxtModule({
     nuxt.hook("prepare:types", ({ references }) => {
       references.push({ path: relativeWithDot(nuxt.options.buildDir, join(silgi.buildDir, "silgi.d.ts")) });
     });
+    addImportsDir(composablesDir);
   }
 });
 

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

@@ -1,4 +1,4 @@
-import type { SilgiRouterTypes } from '../../../../src/types/global';
+import type { SilgiRouterTypes } from 'silgi';
 import { type UseFetchOptions } from 'nuxt/app';
 export declare function useSilgiFetch<Route extends keyof SilgiRouterTypes, Method extends Extract<keyof SilgiRouterTypes[Route], string>>(url: Route | (() => Route), options?: Omit<UseFetchOptions<SilgiRouterTypes[Route][Method] extends {
     output: any;
@@ -7,4 +7,4 @@ export declare function useSilgiFetch<Route extends keyof SilgiRouterTypes, Meth
     body?: SilgiRouterTypes[Route][Method] extends {
         input: any;
     } ? SilgiRouterTypes[Route][Method]['input'] : never;
-}): import("nuxt/app").AsyncData<any, import("ofetch").FetchError<any> | null>;
+}): import("nuxt/app").AsyncData<import("nuxt/dist/app/composables/asyncData").PickFrom<_ResT, import("nuxt/dist/app/composables/asyncData").KeysOf<DataT>> | null, import("ofetch").FetchError<any> | null>;

package/dist/index.d.mts

@@ -1,6 +1,7 @@
-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.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, S as SilgiOptions, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.ClpvycKI.mjs';
+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 { FetchOptions } from 'ofetch';
+import { LoadConfigOptions } from 'c12';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
 import 'consola';
@@ -71,6 +72,11 @@ type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends ke
 } ? SilgiRouterTypes[Route][Method]['output'] : any>;
 declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
 
+interface LoadSilgiConfigOptions extends Omit<LoadConfigOptions<SilgiOptions>, 'overrides'> {
+    overrides?: Exclude<LoadConfigOptions<SilgiOptions>['overrides'], Promise<any> | void>;
+}
+declare function loadSilgiConfig(opts: LoadSilgiConfigOptions): Promise<SilgiOptions>;
+
 /**
  * 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.
@@ -168,4 +174,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-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 };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-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.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, S as SilgiOptions, x as SilgiStorageBase, t as SilgiURIs, U as URIsTypes, y as silgi } from './shared/silgi.ClpvycKI.js';
+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 { FetchOptions } from 'ofetch';
+import { LoadConfigOptions } from 'c12';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import * as unctx_index from 'unctx/index';
 import 'consola';
@@ -71,6 +72,11 @@ type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends ke
 } ? SilgiRouterTypes[Route][Method]['output'] : any>;
 declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
 
+interface LoadSilgiConfigOptions extends Omit<LoadConfigOptions<SilgiOptions>, 'overrides'> {
+    overrides?: Exclude<LoadConfigOptions<SilgiOptions>['overrides'], Promise<any> | void>;
+}
+declare function loadSilgiConfig(opts: LoadSilgiConfigOptions): Promise<SilgiOptions>;
+
 /**
  * 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.
@@ -168,4 +174,4 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
     };
 };
 
-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 };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiOptions, SilgiRouterTypes, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, createSilgiFetch, defineSilgiModule, loadSilgiConfig, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.mjs

@@ -5,8 +5,8 @@ import { applyDefaults } from 'untyped';
 import { u as useSilgi, l as loadSilgiModuleInstance, p as parseURI, S as SilgiError, a as useStorage, n as normalizeResult, b as SilgiErrorCode, g as generateStorageKey, s as scanAction, c as createStorage, d as silgiCtx, t as tryUseSilgi } from './shared/silgi.mBwNj1W0.mjs';
 export { e as createResolver, f as useHook, h as useShared } from './shared/silgi.mBwNj1W0.mjs';
 import satisfies from 'semver/functions/satisfies.js';
-import { S as SilgiConfigSchema } from './shared/silgi.BNEdIEZH.mjs';
-export { r as relativeWithDot } from './shared/silgi.BNEdIEZH.mjs';
+import { S as SilgiConfigSchema } from './shared/silgi.b9yhSIGd.mjs';
+export { l as loadSilgiConfig, r as relativeWithDot } from './shared/silgi.b9yhSIGd.mjs';
 import { defineEventHandler, getQuery, readBody } from 'h3';
 import 'node:fs';
 import 'pathe';
@@ -18,6 +18,7 @@ import 'unctx';
 import 'node:url';
 import 'mlly';
 import 'pathe/utils';
+import 'c12';
 import 'std-env';
 
 const SEMANTIC_VERSION_RE = /-\d+\.[0-9a-f]+/;

package/dist/shared/{silgi.BNEdIEZH.mjs → silgi.b9yhSIGd.mjs}

@@ -1,6 +1,7 @@
+import { loadConfig } from 'c12';
+import { defineUntypedSchema, applyDefaults } from 'untyped';
 import { resolve, join, relative, basename } from 'pathe';
 import { isDevelopment, isTest, isDebug } from 'std-env';
-import { defineUntypedSchema } from 'untyped';
 
 const common = defineUntypedSchema({
   /**
@@ -430,9 +431,29 @@ const SilgiConfigSchema = {
   ...typescript
 };
 
+async function loadSilgiConfig(opts) {
+  globalThis.defineSilgiConfig = (c) => c;
+  const result = await loadConfig({
+    name: "silgi",
+    configFile: "silgi.config",
+    rcFile: ".silgirc",
+    // extend: { extendKey: ['theme', 'extends', '_extends'] },
+    dotenv: true,
+    globalRc: true,
+    ...opts
+  });
+  delete globalThis.defineSilgiConfig;
+  const { configFile, cwd } = result;
+  const silgiConfig = result.config;
+  silgiConfig.rootDir = silgiConfig.rootDir || cwd;
+  silgiConfig._silgiConfigFile = configFile;
+  silgiConfig._silgiConfigFiles = [configFile];
+  return await applyDefaults(SilgiConfigSchema, silgiConfig);
+}
+
 const RELATIVE_RE = /^([^.])/;
 function relativeWithDot(from, to) {
   return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
 }
 
-export { SilgiConfigSchema as S, relativeWithDot as r };
+export { SilgiConfigSchema as S, loadSilgiConfig as l, relativeWithDot as r };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "sideEffects": false,
   "exports": {
     ".": {
@@ -19,12 +19,12 @@
       "import": "./dist/ecosystem/nitro/index.mjs"
     },
     "./ecosystem/nitro/runtime/*": {
-      "types": "./dist/ecosystem/nitro/runtime/*",
-      "import": "./dist/ecosystem/nitro/runtime/*"
+      "types": "./dist/ecosystem/nitro/runtime/*.d.ts",
+      "import": "./dist/ecosystem/nitro/runtime/*.mjs"
     },
     "./ecosystem/nuxt/runtime/*": {
-      "types": "./dist/ecosystem/nuxt/runtime/*",
-      "import": "./dist/ecosystem/nuxt/runtime/*"
+      "types": "./dist/ecosystem/nuxt/runtime/*.d.ts",
+      "import": "./dist/ecosystem/nuxt/runtime/*.mjs"
     },
     "./nuxt": {
       "types": "./dist/ecosystem/nuxt/module.d.mts",
@@ -62,6 +62,7 @@
   ],
   "peerDependencies": {
     "@nuxt/kit": "^3.15.3",
+    "h3": "^1.14.0",
     "nitropack": "^2.10.4",
     "nuxt": "^3.15.3",
     "typescript": "^5.7.3",
@@ -71,6 +72,9 @@
     "@nuxt/kit": {
       "optional": true
     },
+    "h3": {
+      "optional": true
+    },
     "nitropack": {
       "optional": true
     },
@@ -93,7 +97,6 @@
     "eslint": "^9.18.0",
     "esno": "^4.8.0",
     "globby": "^14.0.2",
-    "h3": "^1.14.0",
     "hookable": "^5.5.3",
     "ignore": "^7.0.3",
     "jiti": "^2.4.2",
@@ -117,6 +120,7 @@
     "@nuxt/kit": "^3.15.3",
     "@types/node": "^22.10.7",
     "@types/semver": "^7.5.8",
+    "h3": "^1.14.0",
     "nitropack": "^2.10.4",
     "nuxt": "^3.15.3",
     "unbuild": "^3.3.1",

package/dist/shared/silgi.2D3gmgW0.mjs

@@ -1,25 +0,0 @@
-import { loadConfig } from 'c12';
-import { applyDefaults } from 'untyped';
-import { S as SilgiConfigSchema } from './silgi.BNEdIEZH.mjs';
-
-async function loadSilgiConfig(opts) {
-  globalThis.defineSilgiConfig = (c) => c;
-  const result = await loadConfig({
-    name: "silgi",
-    configFile: "silgi.config",
-    rcFile: ".silgirc",
-    // extend: { extendKey: ['theme', 'extends', '_extends'] },
-    dotenv: true,
-    globalRc: true,
-    ...opts
-  });
-  delete globalThis.defineSilgiConfig;
-  const { configFile, cwd } = result;
-  const silgiConfig = result.config;
-  silgiConfig.rootDir = silgiConfig.rootDir || cwd;
-  silgiConfig._silgiConfigFile = configFile;
-  silgiConfig._silgiConfigFiles = [configFile];
-  return await applyDefaults(SilgiConfigSchema, silgiConfig);
-}
-
-export { loadSilgiConfig as l };