silgi 0.9.6 → 0.9.8

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.9.6";
+const version = "0.9.8";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/cli/prepare.mjs

@@ -859,7 +859,20 @@ async function nitroFramework(silgi, skip = false) {
     packageImport: "silgi/runtime/internal/nitro",
     path: join(runtimeDir, "internal/nitro")
   });
-  silgi.hook("prepare:core.ts", (_data) => {
+  silgi.hook("prepare:createDTSFramework", (data) => {
+    data.importItems["silgi/types"] = {
+      import: [
+        { name: "NitroRuntimeConfig", type: true }
+      ],
+      from: "nitropack/types"
+    };
+    data.customContent?.push(
+      "",
+      'declare module "silgi/types" {',
+      "  interface SilgiRuntimeOptions extends NitroRuntimeConfig {}",
+      "}",
+      ""
+    );
   });
   if (silgi.options.imports !== false) {
     silgi.options.imports.presets ??= [];

package/dist/kit/index.d.mts

@@ -71,6 +71,13 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
+/**
+ * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
+ *
+ * This mirrors the runtime behavior of Nitro.
+ */
+declare function useSilgiRuntimeConfig(): Record<string, any>;
+
 /**
  * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
@@ -100,4 +107,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.d.ts

@@ -71,6 +71,13 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
+/**
+ * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
+ *
+ * This mirrors the runtime behavior of Nitro.
+ */
+declare function useSilgiRuntimeConfig(): Record<string, any>;
+
 /**
  * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
@@ -100,4 +107,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.mjs

@@ -4,12 +4,16 @@ import consola, { consola as consola$1 } from 'consola';
 import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
-import { useSilgi, tryUseSilgiCLI, useSilgiCLI } from 'silgi/core';
+import { useSilgi, tryUseSilgiCLI, useSilgiCLI, tryUseSilgi } from 'silgi/core';
 import { defu } from 'defu';
 import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { existsSync, promises } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
+import process$1 from 'node:process';
+import destr from 'destr';
+import { klona } from 'klona';
+import { snakeCase } from 'scule';
 import { hash } from 'ohash';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
@@ -239,6 +243,57 @@ async function resolveSilgiModule(base, paths) {
   return resolved;
 }
 
+function useSilgiRuntimeConfig() {
+  const silgi = tryUseSilgi();
+  if (!silgi) {
+    return {};
+  }
+  return applyEnv(klona(silgi.options.runtimeConfig), {
+    prefix: "NITRO_",
+    altPrefix: "NUXT_",
+    silgiPrefix: "SILGI_",
+    // TODO: add more prefixes ecosystem-wide
+    envExpansion: silgi.options.experimental?.envExpansion ?? !!process$1.env.NITRO_ENV_EXPANSION
+  });
+}
+function getEnv(key, opts, env = process$1.env) {
+  const envKey = snakeCase(key).toUpperCase();
+  return destr(
+    env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey] ?? env[opts.silgiPrefix + envKey]
+  );
+}
+function _isObject(input) {
+  return typeof input === "object" && !Array.isArray(input);
+}
+function applyEnv(obj, opts, parentKey = "") {
+  for (const key in obj) {
+    const subKey = parentKey ? `${parentKey}_${key}` : key;
+    const envValue = getEnv(subKey, opts);
+    if (_isObject(obj[key])) {
+      if (_isObject(envValue)) {
+        obj[key] = { ...obj[key], ...envValue };
+        applyEnv(obj[key], opts, subKey);
+      } else if (envValue === void 0) {
+        applyEnv(obj[key], opts, subKey);
+      } else {
+        obj[key] = envValue ?? obj[key];
+      }
+    } else {
+      obj[key] = envValue ?? obj[key];
+    }
+    if (opts.envExpansion && typeof obj[key] === "string") {
+      obj[key] = _expandFromEnv(obj[key]);
+    }
+  }
+  return obj;
+}
+const envExpandRx = /\{\{([^{}]*)\}\}/g;
+function _expandFromEnv(value, env = process$1.env) {
+  return value.replace(envExpandRx, (match, key) => {
+    return env[key] || match;
+  });
+}
+
 const RELATIVE_RE = /^([^.])/;
 function relativeWithDot(from, to) {
   return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
@@ -305,4 +360,4 @@ function normalizeTemplate(template, buildDir) {
   return template;
 }
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.9.6";
+const version = "0.9.8";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.9.6";
+const version = "0.9.8";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/types/index.d.mts

@@ -944,6 +944,9 @@ type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 interface SilgiOptions {
     consolaOptions?: Partial<ConsolaOptions>;
     present: PresetNameInput;
+    runtimeConfig: SilgiRuntimeOptions & {
+        [key: string]: any;
+    };
     /**
      * Set to `true` to enable debug mode.
      *

package/dist/types/index.d.ts

@@ -944,6 +944,9 @@ type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 interface SilgiOptions {
     consolaOptions?: Partial<ConsolaOptions>;
     present: PresetNameInput;
+    runtimeConfig: SilgiRuntimeOptions & {
+        [key: string]: any;
+    };
     /**
      * Set to `true` to enable debug mode.
      *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "private": false,
   "sideEffects": false,
   "exports": {
@@ -120,6 +120,7 @@
     "compatx": "^0.1.8",
     "consola": "^3.4.0",
     "defu": "^6.1.4",
+    "destr": "^2.0.3",
     "dev-jiti": "^2.4.2",
     "dot-prop": "^9.0.0",
     "dotenv": "^16.4.7",

package/dist/runtime/nitro/index.d.ts

@@ -1 +0,0 @@
-export { useSilgiNitroRuntimeConfig } from './useRuntimeConfig';

package/dist/runtime/nitro/index.mjs

@@ -1 +0,0 @@
-export { useSilgiNitroRuntimeConfig } from "./useRuntimeConfig.mjs";

package/dist/runtime/nitro/useRuntimeConfig.d.ts

@@ -1 +0,0 @@
-export declare function useSilgiNitroRuntimeConfig(): any;

package/dist/runtime/nitro/useRuntimeConfig.mjs

@@ -1,7 +0,0 @@
-import { useRuntimeConfig } from "nitropack/runtime/internal/config";
-export function useSilgiNitroRuntimeConfig() {
-  if (globalThis.$silgiStatus === "prepare" || globalThis.$silgiStatus === "install" || globalThis.$silgiStatus === "run") {
-    return;
-  }
-  return useRuntimeConfig();
-}