silgi 0.37.33 → 0.37.35

package/dist/build.mjs

@@ -9,6 +9,7 @@ import 'silgi';
 import './cli/build.mjs';
 import 'hookable';
 import 'silgi/kit';
+import 'silgi/runtime';
 import 'silgi/runtime/meta';
 import 'unimport';
 import '@clack/prompts';
@@ -29,7 +30,6 @@ import 'globby';
 import 'oxc-parser';
 import 'ignore';
 import 'klona';
-import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import './cli/types.mjs';

package/dist/cli/build.mjs

@@ -1,8 +1,9 @@
 import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
-import { useSilgiCLI, replaceRuntimeValues, updateRuntimeStorage, silgiCLICtx, autoImportTypes } from 'silgi';
+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 { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import * as p from '@clack/prompts';
@@ -21,7 +22,6 @@ import { globby } from 'globby';
 import { parseAsync } from 'oxc-parser';
 import ignore from 'ignore';
 import { klona } from 'klona';
-import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
 import { snakeCase } from 'scule';
 import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
@@ -1437,7 +1437,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     adapters: {}
   };
   await prepareEnv(options);
-  updateRuntimeStorage(silgi.options.runtimeConfig);
+  sharedRuntimeConfig(silgi.options.runtimeConfig);
   if (silgiCLICtx.tryUse()) {
     silgiCLICtx.unset();
     silgiCLICtx.set(silgi);
@@ -1508,7 +1508,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
   }
   await registerModuleExportScan(silgi);
   await writeScanFiles(silgi);
-  updateRuntimeStorage(silgi.options.runtimeConfig);
+  sharedRuntimeConfig(silgi.options.runtimeConfig);
   return silgi;
 }
 

package/dist/cli/index.mjs

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

package/dist/cli/init.mjs

@@ -10,6 +10,7 @@ import './build.mjs';
 import 'hookable';
 import 'silgi';
 import 'silgi/kit';
+import 'silgi/runtime';
 import 'silgi/runtime/meta';
 import 'unimport';
 import 'dotenv';
@@ -26,7 +27,6 @@ import 'globby';
 import 'oxc-parser';
 import 'ignore';
 import 'klona';
-import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import './types.mjs';

package/dist/cli/install.mjs

@@ -10,6 +10,7 @@ import 'pathe';
 import './build.mjs';
 import 'hookable';
 import 'silgi';
+import 'silgi/runtime';
 import 'silgi/runtime/meta';
 import 'unimport';
 import '@clack/prompts';
@@ -29,7 +30,6 @@ import 'globby';
 import 'oxc-parser';
 import 'ignore';
 import 'klona';
-import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import './types.mjs';

package/dist/cli/watch.mjs

@@ -12,6 +12,7 @@ import 'silgi';
 import './build.mjs';
 import 'hookable';
 import 'silgi/kit';
+import 'silgi/runtime';
 import 'silgi/runtime/meta';
 import 'unimport';
 import '@clack/prompts';
@@ -31,7 +32,6 @@ import 'globby';
 import 'oxc-parser';
 import 'ignore';
 import 'klona';
-import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import './types.mjs';

package/dist/core/index.d.mts

@@ -278,8 +278,6 @@ declare function tryUseSilgiCLI(): SilgiCLI | null;
 
 declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
-/** async local storage for the name of the current silgi instance */
-declare const asyncRuntimeStorage: UseContext<SilgiRuntimeConfig>;
 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;
@@ -309,4 +307,4 @@ declare function tryUseRuntime(): SilgiRuntimeConfig | null;
 
 declare const autoImportTypes: string[];
 
-export { SilgiError, asyncRuntimeStorage, 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, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -2,39 +2,14 @@ import { createConsola } from 'consola';
 import { defu } from 'defu';
 import { createHooks } from 'hookable';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { sharedRuntimeConfig, useSilgiRuntimeConfig } from 'silgi/runtime';
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { createContext, getContext } from 'unctx';
+import { useSilgiRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
+import { getContext, createContext } from 'unctx';
 import { Buffer } from 'node:buffer';
 import { klona } from 'klona';
 import { createStorage as createStorage$1, builtinDrivers, prefixStorage } from 'unstorage';
 import { FastURL, FastResponse } from 'srvx';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
-
-const asyncRuntimeStorage = createContext({
-  asyncContext: true,
-  AsyncLocalStorage
-});
-function updateRuntimeStorage(runtime) {
-  if (asyncRuntimeStorage.tryUse()) {
-    asyncRuntimeStorage.unset();
-    asyncRuntimeStorage.set(runtime);
-  } else {
-    asyncRuntimeStorage.set(runtime);
-  }
-  sharedRuntimeConfig(runtime, true);
-}
-const getRuntimeCtx = () => asyncRuntimeStorage.tryUse();
-function useRuntime() {
-  const instance = asyncRuntimeStorage.tryUse();
-  if (!instance) {
-    throw new Error("Runtime instance is unavailable!");
-  }
-  return instance;
-}
-function tryUseRuntime() {
-  return asyncRuntimeStorage.tryUse();
-}
+import { AsyncLocalStorage } from 'node:async_hooks';
 
 const silgiCtx = getContext("silgi");
 function useSilgi() {
@@ -308,7 +283,7 @@ async function createSilgi(config) {
     captureError: config.captureError ?? (() => {
     })
   };
-  updateRuntimeStorage(silgi.options.runtimeConfig);
+  sharedRuntimeConfig(silgi.options.runtimeConfig);
   if (!silgi.router) {
     silgi.router = createRouter();
   }
@@ -989,6 +964,30 @@ function storageMount(silgi) {
   };
 }
 
+const asyncRuntimeStorage = createContext({
+  asyncContext: true,
+  AsyncLocalStorage
+});
+function updateRuntimeStorage(runtime) {
+  if (asyncRuntimeStorage.tryUse()) {
+    asyncRuntimeStorage.unset();
+    asyncRuntimeStorage.set(runtime);
+  } else {
+    asyncRuntimeStorage.set(runtime);
+  }
+}
+const getRuntimeCtx = () => asyncRuntimeStorage.tryUse();
+function useRuntime() {
+  const instance = asyncRuntimeStorage.tryUse();
+  if (!instance) {
+    throw new Error("Runtime instance is unavailable!");
+  }
+  return instance;
+}
+function tryUseRuntime() {
+  return asyncRuntimeStorage.tryUse();
+}
+
 const autoImportTypes = [
   "ExtractInputFromURI",
   "ExtractOutputFromURI",
@@ -996,4 +995,4 @@ const autoImportTypes = [
   "ExtractQueryParamsFromURI"
 ];
 
-export { SilgiError, asyncRuntimeStorage, 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, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { SilgiError, asyncRuntimeStorage, 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, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, 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,13 +1,13 @@
-export { SilgiError, asyncRuntimeStorage, 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, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, 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';
 import 'hookable';
 import 'rou3';
 import 'silgi/runtime';
-import 'node:async_hooks';
 import 'unctx';
 import 'node:buffer';
 import 'klona';
 import 'unstorage';
 import 'srvx';
+import 'node:async_hooks';

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

@@ -1,6 +1,6 @@
 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 sharedRuntimeConfig(runtime: SilgiRuntimeConfig, force?: boolean): SilgiRuntimeConfig;
 export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent, localRuntimeConfig?: SilgiRuntimeConfig): SilgiRuntimeConfig;
 export declare function initRuntimeConfig(envOptions?: EnvOptions, inlineRuntimeConfig?: Record<string, any>): Readonly<Record<string, any>>;
 export declare function updateRuntimeConfig(runtimeConfig: Record<string, unknown>): void;

package/dist/runtime/internal/config.mjs

@@ -2,7 +2,7 @@ import { defu } from "defu";
 import destr from "destr";
 import { klona } from "klona";
 import { snakeCase } from "scule";
-import { asyncRuntimeStorage, useRuntime, useSilgi } from "silgi";
+import { updateRuntimeStorage, useRuntime, useSilgi } from "silgi";
 export function updateEnvOptions(runtime) {
   const envOptions = {
     prefix: "NITRO_",
@@ -12,20 +12,16 @@ export function updateEnvOptions(runtime) {
   };
   return envOptions;
 }
-let inlineRuntimeConfig = {};
+let inlineRuntimeConfig;
 export function sharedRuntimeConfig(runtime, force) {
-  if (Object.keys(inlineRuntimeConfig).length && !force) {
+  updateRuntimeStorage(inlineRuntimeConfig);
+  if (inlineRuntimeConfig && !force) {
     return inlineRuntimeConfig;
   }
   inlineRuntimeConfig = _deepFreeze(
     applyEnv(klona(runtime ?? {}), updateEnvOptions(runtime))
   );
-  if (asyncRuntimeStorage.tryUse()) {
-    asyncRuntimeStorage.unset();
-    asyncRuntimeStorage.set(inlineRuntimeConfig);
-  } else {
-    asyncRuntimeStorage.set(inlineRuntimeConfig);
-  }
+  updateRuntimeStorage(inlineRuntimeConfig);
   return inlineRuntimeConfig;
 }
 export function useSilgiRuntimeConfig(event, localRuntimeConfig) {

package/package.json

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