silgi 0.37.36 → 0.37.38

package/dist/cli/build.mjs

@@ -3,7 +3,7 @@ import { createHooks, createDebugger } from 'hookable';
 import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
 import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
 import { isPresents, addTemplate, addCoreFile, genEnsureSafeVar, writeFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, addImports, baseHeaderBannerComment, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, toArray, isDirectory } from 'silgi/kit';
-import { useSilgiRuntimeConfig, initRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
+import { useRuntimeConfig, initRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import * as p from '@clack/prompts';
@@ -1169,7 +1169,7 @@ async function writeScanFiles(silgi) {
 
 async function createStorageCLI(silgi) {
   const storage = createStorage();
-  const runtime = useSilgiRuntimeConfig();
+  const runtime = useRuntimeConfig();
   const mounts = klona({
     ...silgi.options.storage,
     ...silgi.options.devStorage
@@ -1413,6 +1413,7 @@ async function scanDir(silgi, dir, name) {
 
 async function createSilgiCLI(config = {}, opts = {}) {
   const options = await loadOptions(config, opts);
+  await prepareEnv(options);
   const hooks = createHooks();
   const silgi = {
     scannedURIs: /* @__PURE__ */ new Map(),
@@ -1434,9 +1435,9 @@ async function createSilgiCLI(config = {}, opts = {}) {
     hook: hooks.hook,
     async updateConfig(_config) {
     },
-    adapters: {}
+    adapters: {},
+    useLocalConfig: () => useRuntimeConfig(void 0, options.runtimeConfig, true)
   };
-  await prepareEnv(options);
   sharedRuntimeConfig(silgi.options.runtimeConfig);
   if (silgiCLICtx.tryUse()) {
     silgiCLICtx.unset();
@@ -1622,14 +1623,14 @@ async function prepareConfigs(silgi) {
   await silgi.callHook("prepare:configs.ts", _data);
   const importData = [
     "import type { SilgiRuntimeOptions, SilgiRuntimeConfig, SilgiOptions } from 'silgi/types'",
-    "import { useSilgiRuntimeConfig } from 'silgi/runtime'",
+    "import { useRuntimeConfig } from 'silgi/runtime'",
     "",
     `export const runtimeConfig: SilgiRuntimeConfig = ${genObjectFromRawEntries(
       Object.entries(_data.runtimeConfig).map(([key, value]) => [key, genEnsureSafeVar(value)]),
       ""
     )}`,
     "",
-    "export const localRuntimeConfig = useSilgiRuntimeConfig(undefined, runtimeConfig)",
+    "export const localConfig = useRuntimeConfig(undefined, runtimeConfig)",
     ""
   ];
   delete _data.runtimeConfig;

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.37.36";
+const version = "0.37.38";
 const packageJson = {
 	version: version};
 

package/dist/core/index.d.mts

@@ -279,8 +279,6 @@ declare function tryUseSilgiCLI(): SilgiCLI | null;
 declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
 declare function updateRuntimeStorage(runtime: any): void;
-/** Direct access to the silgi context with asyncLocalStorage - see https://github.com/unjs/unctx. */
-declare const getRuntimeCtx: () => SilgiRuntimeConfig | null;
 /**
  * Get access to silgi instance.
  *
@@ -291,20 +289,7 @@ declare const getRuntimeCtx: () => SilgiRuntimeConfig | null;
  * ```
  */
 declare function useRuntime(): SilgiRuntimeConfig;
-/**
- * Get access to Runtime instance.
- *
- * Returns null if Runtime instance is unavailable.
- * @example
- * ```js
- * const runtime = tryUseRuntime()
- * if (runtime) {
- *  // Do something
- * }
- * ```
- */
-declare function tryUseRuntime(): SilgiRuntimeConfig | null;
 
 declare const autoImportTypes: string[];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -2,7 +2,7 @@ import { createConsola } from 'consola';
 import { defu } from 'defu';
 import { createHooks } from 'hookable';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { useSilgiRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
+import { useRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
 import { getContext, createContext } from 'unctx';
 import { Buffer } from 'node:buffer';
 import { klona } from 'klona';
@@ -187,7 +187,7 @@ function replaceRuntimeValues(obj, runtime) {
 
 async function createStorage(silgi) {
   const storage = createStorage$1();
-  const runtime = useSilgiRuntimeConfig();
+  const runtime = useRuntimeConfig();
   const mounts = klona({
     ...silgi.options.storage,
     ...silgi.options.devStorage
@@ -322,7 +322,7 @@ async function createSilgi(config) {
   silgi.shared.storage = (...data) => {
     return useSilgiStorage(...data);
   };
-  silgi.shared.useRuntimeConfig = useSilgiRuntimeConfig;
+  silgi.shared.useRuntimeConfig = useRuntimeConfig;
   if (silgiCtx.tryUse()) {
     silgiCtx.unset();
     silgiCtx.set(silgi);
@@ -976,7 +976,6 @@ function updateRuntimeStorage(runtime) {
     asyncRuntimeStorage.set(runtime);
   }
 }
-const getRuntimeCtx = () => asyncRuntimeStorage.tryUse();
 function useRuntime() {
   const instance = asyncRuntimeStorage.tryUse();
   if (!instance) {
@@ -984,9 +983,6 @@ function useRuntime() {
   }
   return instance;
 }
-function tryUseRuntime() {
-  return asyncRuntimeStorage.tryUse();
-}
 
 const autoImportTypes = [
   "ExtractInputFromURI",
@@ -995,4 +991,4 @@ const autoImportTypes = [
   "ExtractQueryParamsFromURI"
 ];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
 import 'silgi/types';
 import '@standard-schema/spec';
 import 'unstorage';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage } from './core/index.mjs';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from './_chunks/silgiApp.mjs';
 import 'consola';
 import 'defu';

package/dist/runtime/index.d.mts

@@ -1,3 +1,3 @@
-export { initRuntimeConfig, sharedRuntimeConfig, useSilgiRuntimeConfig }  from "./internal/config.mjs";
+export { initRuntimeConfig, sharedRuntimeConfig, useRuntimeConfig }  from "./internal/config.mjs";
 export { defineSilgiPlugin }  from "./internal/plugin.mjs";
 export { mergeDeep }  from "./internal/defu.mjs";

package/dist/runtime/index.mjs

@@ -1,3 +1,3 @@
-export { initRuntimeConfig, sharedRuntimeConfig, useSilgiRuntimeConfig }  from "./internal/config.mjs";
+export { initRuntimeConfig, sharedRuntimeConfig, useRuntimeConfig }  from "./internal/config.mjs";
 export { defineSilgiPlugin }  from "./internal/plugin.mjs";
 export { mergeDeep }  from "./internal/defu.mjs";

package/dist/runtime/internal/config.d.mts

@@ -1,7 +1,7 @@
 import type { EnvOptions, SilgiEvent, SilgiRuntimeConfig } from 'silgi/types';
 export declare function updateEnvOptions(runtime: SilgiRuntimeConfig): EnvOptions;
 export declare function sharedRuntimeConfig(runtime: SilgiRuntimeConfig, force?: boolean): SilgiRuntimeConfig;
-export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent, localRuntimeConfig?: SilgiRuntimeConfig): SilgiRuntimeConfig;
+export declare function useRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent, localRuntimeConfig?: SilgiRuntimeConfig, force?: boolean): SilgiRuntimeConfig;
 export declare function initRuntimeConfig(envOptions?: EnvOptions, inlineRuntimeConfig?: Record<string, any>): Readonly<Record<string, any>>;
 export declare function updateRuntimeConfig(runtimeConfig: Record<string, unknown>): void;
 export declare function applyEnv(obj: Record<string, any>, opts: EnvOptions, parentKey?: string): Record<string, any>;

package/dist/runtime/internal/config.mjs

@@ -23,9 +23,9 @@ export function sharedRuntimeConfig(runtime, force) {
   updateRuntimeStorage(inlineRuntimeConfig);
   return inlineRuntimeConfig;
 }
-export function useSilgiRuntimeConfig(event, localRuntimeConfig) {
+export function useRuntimeConfig(event, localRuntimeConfig, force) {
   if (localRuntimeConfig) {
-    return sharedRuntimeConfig(localRuntimeConfig);
+    return sharedRuntimeConfig(localRuntimeConfig, force);
   }
   const runtime = useRuntime();
   if (!event) {

package/dist/types/index.d.mts

@@ -10,15 +10,15 @@ import { PresetName, PresetOptions, PresetNameInput } from 'silgi/presets';
 import { ResolvedServiceDefinition as ResolvedServiceDefinition$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, BuildSilgi as BuildSilgi$1, SilgiSchema as SilgiSchema$1, SilgiEvent as SilgiEvent$1, RouteConfigService as RouteConfigService$1, SilgiRuntimeActions as SilgiRuntimeActions$1, StorageConfig as StorageConfig$1, Commands as Commands$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
 import { Adapter, TablesSchema, InferModelTypes } from 'unadapter/types';
 import { UnimportPluginOptions } from 'unimport/unplugin';
-import * as h3 from 'h3';
-import { HTTPMethod as HTTPMethod$1, Session, H3Event } from 'h3';
-import * as nitropack_types from 'nitropack/types';
-import { NitroRuntimeConfig } from 'nitropack/types';
 import { Defu } from 'defu';
 import * as next from 'next';
 import { NextConfig } from 'next';
 import { Stats } from 'node:fs';
+import * as h3 from 'h3';
+import { HTTPMethod as HTTPMethod$1, Session } from 'h3';
+import * as nitropack_types from 'nitropack/types';
 import { ESMImport, ESMCodeGenOptions } from 'knitwork';
+import { useRuntimeConfig } from 'silgi/runtime';
 import { Unimport } from 'unimport';
 import { Storage, TransactionOptions, BuiltinDriverName, StorageValue } from 'unstorage';
 import { ServerRequest } from 'srvx';
@@ -26,10 +26,24 @@ import { StandardSchemaV1 } from '@standard-schema/spec';
 import { NitroApp } from 'nitropack';
 import { RouterContext } from 'rou3';
 import { silgiFetch } from 'silgi';
-import { useSilgiRuntimeConfig } from 'silgi/runtime';
 import { ProviderName } from 'std-env';
 import { FetchOptions, FetchResponse } from 'ofetch';
 
+interface SilgiRuntimeMethods {
+}
+type CommandType = 'run' | 'prepare' | 'install' | 'dev' | 'init';
+interface SilgiRouterTypes {
+}
+interface DefaultHooks {
+}
+type DeepPartial<T> = T extends (...args: any[]) => any ? T : T extends Record<string, any> ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+type DeepRequired<T> = T extends (...args: any[]) => any ? T : T extends Record<string, any> ? {
+    [P in keyof T]-?: DeepRequired<T[P]>;
+} : T;
+type Awaitable<T> = T | Promise<T>;
+
 interface SilgiCompatibilityIssue {
     name: string;
     message: string;
@@ -85,6 +99,7 @@ interface SilgiCLI {
     callHook: SilgiCLI['hooks']['callHook'];
     addHooks: SilgiCLI['hooks']['addHooks'];
     storage: Storage;
+    useLocalConfig: typeof useRuntimeConfig;
     unimport?: Unimport;
     logger: ConsolaInstance;
     close: () => Promise<void>;
@@ -592,7 +607,7 @@ interface StorageKeyParams<TInput = unknown> {
 
 interface SilgiRuntimeShareds extends SilgiRuntimeSharedsExtend {
     storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
-    useRuntimeConfig: typeof useSilgiRuntimeConfig;
+    useRuntimeConfig: typeof useRuntimeConfig;
     $fetch: typeof silgiFetch;
     silgi: Silgi;
 }
@@ -875,35 +890,6 @@ interface SilgiModule<TOptions extends ModuleOptionsCustom = ModuleOptionsCustom
     getMeta?: () => Promise<ModuleMeta>;
 }
 
-interface SilgiRuntimeMethods {
-}
-type CommandType = 'run' | 'prepare' | 'install' | 'dev' | 'init';
-interface SilgiRouterTypes {
-}
-interface DefaultHooks {
-}
-type DeepPartial<T> = T extends (...args: any[]) => any ? T : T extends Record<string, any> ? {
-    [P in keyof T]?: DeepPartial<T[P]>;
-} : T;
-type DeepRequired<T> = T extends (...args: any[]) => any ? T : T extends Record<string, any> ? {
-    [P in keyof T]-?: DeepRequired<T[P]>;
-} : T;
-type Awaitable<T> = T | Promise<T>;
-declare global {
-    var $silgiStatus: CommandType;
-    var _silgi_runtime: SilgiRuntimeOptions;
-    namespace NodeJS {
-        interface Global {
-            $silgiStatus: CommandType;
-            _silgi_runtime: SilgiRuntimeOptions;
-        }
-    }
-    var __silgi__: {
-        useRuntimeConfig?: <T extends NitroRuntimeConfig = NitroRuntimeConfig>(event?: H3Event) => T;
-        [key: string]: any;
-    };
-}
-
 type SilgiPreset = (SilgiCLIConfig & {
     _meta?: SilgiPresetMeta;
 }) | (() => SilgiCLIConfig & {

package/package.json

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