nuxt-site-config 0.5.4 → 0.5.6

package/dist/{build.d.ts → kit.d.ts}

@@ -1,10 +1,9 @@
-import { S as SiteConfig, a as SiteConfigInput } from './type-3a82b30b.js';
+import { S as SiteConfigContainer, a as SiteConfigInput, b as SiteConfig, A as AssertionModes } from './type-51d86304.js';
 
-declare function initSiteConfig(): Promise<SiteConfig>;
-declare function updateSiteConfig(siteConfig: SiteConfigInput): Promise<void>;
+declare function initSiteConfig(): Promise<SiteConfigContainer | undefined>;
+declare function updateSiteConfig(input: SiteConfigInput): Promise<void>;
 declare function useSiteConfig(): Promise<SiteConfig>;
 
-type AssertionModes = 'prerender' | 'generate' | 'build';
 declare function requireSiteConfig(context: string, requirements: Partial<Record<keyof SiteConfig, string>>, modes: Partial<Record<AssertionModes, boolean>>): void;
 declare function assertSiteConfig(mode: AssertionModes, options?: {
     throwError?: boolean;
@@ -12,6 +11,6 @@ declare function assertSiteConfig(mode: AssertionModes, options?: {
 }): Promise<{
     valid: boolean;
     messages: string[];
-}>;
+} | undefined>;
 
 export { assertSiteConfig, initSiteConfig, requireSiteConfig, updateSiteConfig, useSiteConfig };

package/dist/{build.mjs → kit.mjs}

@@ -50,7 +50,6 @@ const envSiteConfig = {
   locale: envShim.NUXT_PUBLIC_SITE_LANGUAGE || envShim.NUXT_PUBLIC_SITE_LOCALE
 };
 
-let siteConfigContainer;
 async function getPkgJsonContextConfig(rootDir) {
   const pkgJson = await readPackageJSON(void 0, { startingFrom: rootDir });
   if (!pkgJson)
@@ -62,64 +61,69 @@ async function getPkgJsonContextConfig(rootDir) {
 }
 async function initSiteConfig() {
   const nuxt = tryUseNuxt();
+  if (!nuxt)
+    return;
+  let siteConfig = nuxt._siteConfig;
+  if (siteConfig)
+    return;
   const rootDir = nuxt?.options.rootDir || process.cwd();
-  if (!siteConfigContainer) {
-    siteConfigContainer = createSiteConfigContainer();
-    const isNodeEnv = !!process.env.NODE_ENV;
-    siteConfigContainer.push({
-      name: rootDir.split("/").pop(),
-      indexable: isNodeEnv ? process.env.NODE_ENV === "production" : !process.dev
-    });
-    siteConfigContainer.push(await getPkgJsonContextConfig(rootDir));
-    siteConfigContainer.push(envSiteConfig);
-    if (nuxt) {
-      let getRuntimeConfig = function(config, env) {
-        if (process.env[`NUXT_${env}}`])
-          return process.env[`NUXT_${env}}`];
-        if (process.env[`NUXT_PUBLIC_${env}}`])
-          return process.env[`NUXT_PUBLIC_${env}}`];
-        return runtimeConfig[config] || runtimeConfig.public?.[config];
-      };
-      const runtimeConfig = nuxt.options.runtimeConfig;
-      siteConfigContainer.push({
-        url: getRuntimeConfig("siteUrl", "SITE_URL"),
-        name: getRuntimeConfig("siteName", "SITE_NAME"),
-        description: getRuntimeConfig("siteDescription", "SITE_DESCRIPTION"),
-        logo: getRuntimeConfig("siteImage", "SITE_IMAGE"),
-        locale: getRuntimeConfig("siteLanguage", "SITE_LANGUAGE"),
-        indexable: getRuntimeConfig("siteIndexable", "SITE_INDEXABLE")
-      });
-      siteConfigContainer.push(nuxt?.options.runtimeConfig.public.site);
-    }
+  siteConfig = createSiteConfigContainer();
+  const isNodeEnv = !!process.env.NODE_ENV;
+  siteConfig.push({
+    name: rootDir.split("/").pop(),
+    indexable: isNodeEnv ? process.env.NODE_ENV === "production" : !process.dev
+  });
+  siteConfig.push(await getPkgJsonContextConfig(rootDir));
+  siteConfig.push(envSiteConfig);
+  const runtimeConfig = nuxt.options.runtimeConfig;
+  function getRuntimeConfig(config, env) {
+    if (process.env[`NUXT_${env}}`])
+      return process.env[`NUXT_${env}}`];
+    if (process.env[`NUXT_PUBLIC_${env}}`])
+      return process.env[`NUXT_PUBLIC_${env}}`];
+    return runtimeConfig[`site${config}`] || runtimeConfig.public?.[`site${config}`];
   }
-  return siteConfigContainer.get();
+  siteConfig.push({
+    url: getRuntimeConfig("Url", "_URL"),
+    name: getRuntimeConfig("Name", "_NAME"),
+    description: getRuntimeConfig("Description", "_DESCRIPTION"),
+    logo: getRuntimeConfig("Image", "_IMAGE"),
+    locale: getRuntimeConfig("Language", "_LANGUAGE"),
+    indexable: getRuntimeConfig("Indexable", "_INDEXABLE")
+  });
+  siteConfig.push(nuxt?.options.runtimeConfig.public.site);
+  nuxt._siteConfig = siteConfig;
+  return siteConfig;
 }
-async function updateSiteConfig(siteConfig) {
-  if (!siteConfigContainer)
-    await initSiteConfig();
-  siteConfigContainer.push(siteConfig);
+async function updateSiteConfig(input) {
+  (await initSiteConfig())?.push(input);
 }
 async function useSiteConfig() {
-  if (!siteConfigContainer)
-    await initSiteConfig();
-  return siteConfigContainer.get();
+  return (await initSiteConfig())?.get() || {};
 }
 
-const siteConfigAssertions = {};
 function requireSiteConfig(context, requirements, modes) {
+  const nuxt = tryUseNuxt();
+  if (!nuxt)
+    return;
+  const assertions = nuxt._siteConfigAsserts || {};
   Object.keys(modes).forEach((mode) => {
     const key = mode;
     if (!modes[key])
       return;
-    siteConfigAssertions[key] = siteConfigAssertions[key] || [];
-    siteConfigAssertions[key].push({ context, requirements });
+    assertions[key] = assertions[key] || [];
+    assertions[key].push({ context, requirements });
   });
+  nuxt._siteConfigAsserts = assertions;
 }
 async function assertSiteConfig(mode, options) {
+  const nuxt = tryUseNuxt();
+  if (!nuxt)
+    return;
   let valid = true;
   const messages = [];
   const logger = useLogger("nuxt-site-config");
-  const assertions = siteConfigAssertions[mode];
+  const assertions = nuxt._siteConfigAsserts?.[mode] || false;
   if (!assertions)
     return { valid, messages };
   const siteConfig = await useSiteConfig();

package/dist/module.d.ts

@@ -1,5 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { b as SiteConfigContainer, a as SiteConfigInput, S as SiteConfig } from './type-3a82b30b.js';
+import { S as SiteConfigContainer, a as SiteConfigInput, b as SiteConfig } from './type-51d86304.js';
+import { AssertionModes, ModuleAssertion } from '~/src/type';
 
 interface ModuleOptions extends SiteConfigInput {
 }
@@ -22,6 +23,10 @@ declare module '@nuxt/schema' {
         /** Theme configuration */
         site?: SiteConfigInput;
     }
+    interface Nuxt {
+        _siteConfig?: SiteConfigContainer;
+        _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
+    }
 }
 declare module '@nuxt/schema' {
     interface RuntimeNuxtHooks {

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "0.5.4"
+  "version": "0.5.6"
 }

package/dist/module.mjs

@@ -1,5 +1,5 @@
 import { defineNuxtModule, createResolver, addImports, addComponent, addPlugin, addServerHandler } from '@nuxt/kit';
-import { updateSiteConfig, useSiteConfig, assertSiteConfig } from './build.mjs';
+import { updateSiteConfig, useSiteConfig, assertSiteConfig } from './kit.mjs';
 import 'pkg-types';
 import 'defu';
 

package/dist/{type-3a82b30b.d.ts → type-51d86304.d.ts}

@@ -58,5 +58,6 @@ interface SiteConfigContainer {
     push: (config: SiteConfigInput) => void;
     get: () => SiteConfig;
 }
+type AssertionModes = 'prerender' | 'generate' | 'build';
 
-export { SiteConfig as S, SiteConfigInput as a, SiteConfigContainer as b };
+export { AssertionModes as A, SiteConfigContainer as S, SiteConfigInput as a, SiteConfig as b };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "packageManager": "pnpm@8.6.3",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",
@@ -20,9 +20,9 @@
       "require": "./dist/module.cjs",
       "import": "./dist/module.mjs"
     },
-    "./build": {
-      "types": "./dist/build.d.ts",
-      "import": "./dist/build.mjs"
+    "./kit": {
+      "types": "./dist/kit.d.ts",
+      "import": "./dist/kit.mjs"
     }
   },
   "main": "./dist/module.cjs",