nuxt-site-config 0.5.6 → 0.5.7

package/dist/kit.d.ts

@@ -1,6 +1,6 @@
-import { S as SiteConfigContainer, a as SiteConfigInput, b as SiteConfig, A as AssertionModes } from './type-51d86304.js';
+import { S as SiteConfigStack, a as SiteConfigInput, b as SiteConfig, A as AssertionModes } from './type-1234fa1d.js';
 
-declare function initSiteConfig(): Promise<SiteConfigContainer | undefined>;
+declare function initSiteConfig(): Promise<SiteConfigStack | undefined>;
 declare function updateSiteConfig(input: SiteConfigInput): Promise<void>;
 declare function useSiteConfig(): Promise<SiteConfig>;
 

package/dist/kit.mjs

@@ -1,17 +1,31 @@
 import { tryUseNuxt, useLogger } from '@nuxt/kit';
 import { readPackageJSON } from 'pkg-types';
-import { defu } from 'defu';
 
-function createSiteConfigContainer() {
+function createSiteConfigStack() {
   const stack = [];
   function push(input) {
+    if (!input._context) {
+      let lastFunctionName = new Error("tmp").stack?.split("\n")[2].split(" ")[5];
+      if (lastFunctionName?.includes("/"))
+        lastFunctionName = "anonymous";
+      input._context = lastFunctionName;
+    }
     stack.push(input);
   }
   function get() {
-    let mergedStack = {};
-    for (const o of stack)
-      mergedStack = defu(o, mergedStack);
-    return normalizeSiteConfig(mergedStack);
+    const siteConfig = {
+      _context: {}
+    };
+    for (const o in stack) {
+      for (const k in stack[o]) {
+        const val = stack[o][k];
+        if (!k.endsWith("context") && typeof val !== "undefined") {
+          siteConfig[k] = val;
+          siteConfig._context[k] = stack[o]._context?.[k] || stack[o]._context || "anonymous";
+        }
+      }
+    }
+    return normalizeSiteConfig(siteConfig);
   }
   return {
     push,
@@ -24,13 +38,13 @@ function normalizeSiteConfig(config) {
     config.indexable = String(config.indexable) !== "false";
   if (typeof config.trailingSlash !== "undefined")
     config.trailingSlash = String(config.trailingSlash) !== "false";
-  delete config._id;
   return config;
 }
 
 const processShim = typeof process !== "undefined" ? process : {};
 const envShim = processShim.env || {};
 const envSiteConfig = {
+  _context: "env",
   url: [
     envShim.NUXT_PUBLIC_VERCEL_URL,
     // vercel
@@ -55,6 +69,7 @@ async function getPkgJsonContextConfig(rootDir) {
   if (!pkgJson)
     return {};
   return {
+    _context: "package.json",
     name: pkgJson.name,
     description: pkgJson.description
   };
@@ -65,11 +80,12 @@ async function initSiteConfig() {
     return;
   let siteConfig = nuxt._siteConfig;
   if (siteConfig)
-    return;
+    return siteConfig;
   const rootDir = nuxt?.options.rootDir || process.cwd();
-  siteConfig = createSiteConfigContainer();
+  siteConfig = createSiteConfigStack();
   const isNodeEnv = !!process.env.NODE_ENV;
   siteConfig.push({
+    _context: "system",
     name: rootDir.split("/").pop(),
     indexable: isNodeEnv ? process.env.NODE_ENV === "production" : !process.dev
   });
@@ -84,6 +100,7 @@ async function initSiteConfig() {
     return runtimeConfig[`site${config}`] || runtimeConfig.public?.[`site${config}`];
   }
   siteConfig.push({
+    _context: "legacyRuntimeConfig",
     url: getRuntimeConfig("Url", "_URL"),
     name: getRuntimeConfig("Name", "_NAME"),
     description: getRuntimeConfig("Description", "_DESCRIPTION"),
@@ -91,15 +108,27 @@ async function initSiteConfig() {
     locale: getRuntimeConfig("Language", "_LANGUAGE"),
     indexable: getRuntimeConfig("Indexable", "_INDEXABLE")
   });
-  siteConfig.push(nuxt?.options.runtimeConfig.public.site);
+  siteConfig.push({
+    _context: "runtimeConfig",
+    ...nuxt?.options.runtimeConfig.public.site || {}
+  });
   nuxt._siteConfig = siteConfig;
   return siteConfig;
 }
+async function getSiteConfigStack() {
+  const lastFunctionName = new Error("tmp").stack?.split("\n")[2].split(" ")[5];
+  const container = await initSiteConfig();
+  if (!container)
+    throw new Error(`Site config isn't initialized. Make sure you're calling \`${lastFunctionName}\` within the Nuxt context.`);
+  return container;
+}
 async function updateSiteConfig(input) {
-  (await initSiteConfig())?.push(input);
+  const container = await getSiteConfigStack();
+  container.push(input);
 }
 async function useSiteConfig() {
-  return (await initSiteConfig())?.get() || {};
+  const container = await getSiteConfigStack();
+  return container.get();
 }
 
 function requireSiteConfig(context, requirements, modes) {

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { S as SiteConfigContainer, a as SiteConfigInput, b as SiteConfig } from './type-51d86304.js';
+import { S as SiteConfigStack, a as SiteConfigInput, b as SiteConfig } from './type-1234fa1d.js';
 import { AssertionModes, ModuleAssertion } from '~/src/type';
 
 interface ModuleOptions extends SiteConfigInput {
@@ -9,7 +9,7 @@ interface ModulePublicRuntimeConfig {
 }
 declare module 'h3' {
     interface H3EventContext {
-        siteConfig: SiteConfigContainer;
+        siteConfig: SiteConfigStack;
     }
 }
 declare module 'nuxt/schema' {
@@ -24,7 +24,7 @@ declare module '@nuxt/schema' {
         site?: SiteConfigInput;
     }
     interface Nuxt {
-        _siteConfig?: SiteConfigContainer;
+        _siteConfig?: SiteConfigStack;
         _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
     }
 }

package/dist/module.json

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

package/dist/module.mjs

@@ -1,7 +1,6 @@
 import { defineNuxtModule, createResolver, addImports, addComponent, addPlugin, addServerHandler } from '@nuxt/kit';
 import { updateSiteConfig, useSiteConfig, assertSiteConfig } from './kit.mjs';
 import 'pkg-types';
-import 'defu';
 
 const module = defineNuxtModule({
   meta: {
@@ -22,7 +21,10 @@ const module = defineNuxtModule({
       });
     });
     nuxt.hook("modules:done", async () => {
-      await updateSiteConfig(config);
+      await updateSiteConfig({
+        _context: "nuxt:config:site",
+        ...config
+      });
       const siteConfig = await useSiteConfig();
       await nuxt.callHook("site-config:resolve", siteConfig);
       nuxt.options.runtimeConfig.public.site = siteConfig;

package/dist/runtime/composables/updateSiteConfig.mjs

@@ -1,10 +1,10 @@
 import { useNuxtApp, useRequestEvent } from "#imports";
 export function updateSiteConfig(input = {}) {
   if (process.server) {
-    const container2 = useRequestEvent().context.siteConfig;
-    container2.push(input);
+    const stack2 = useRequestEvent().context.siteConfig;
+    stack2.push(input);
     return;
   }
-  const container = useNuxtApp().$siteConfig;
-  container.push(input);
+  const stack = useNuxtApp().$siteConfig;
+  stack.push(input);
 }

package/dist/runtime/composables/useSiteConfig.mjs

@@ -4,9 +4,9 @@ import {
 } from "#imports";
 export function useSiteConfig() {
   if (process.server) {
-    const container2 = useRequestEvent().context.siteConfig;
-    return container2.get();
+    const stack2 = useRequestEvent().context.siteConfig;
+    return stack2.get();
   }
-  const container = useNuxtApp().$siteConfig;
-  return container.get();
+  const stack = useNuxtApp().$siteConfig;
+  return stack.get();
 }

package/dist/runtime/nitro/composables/updateSiteConfig.mjs

@@ -1,5 +1,5 @@
-import { createSiteConfigContainer } from "../../siteConfig/index.mjs";
+import { createSiteConfigStack } from "../../siteConfig/index.mjs";
 export function updateSiteConfig(e, input) {
-  e.context.siteConfig = e.context.siteConfig || createSiteConfigContainer();
+  e.context.siteConfig = e.context.siteConfig || createSiteConfigStack();
   e.context.siteConfig.push(input);
 }

package/dist/runtime/nitro/composables/useSiteConfig.mjs

@@ -1,5 +1,5 @@
-import { createSiteConfigContainer } from "../../siteConfig/index.mjs";
+import { createSiteConfigStack } from "../../siteConfig/index.mjs";
 export function useSiteConfig(e) {
-  e.context.siteConfig = e.context.siteConfig || createSiteConfigContainer();
+  e.context.siteConfig = e.context.siteConfig || createSiteConfigStack();
   return e.context.siteConfig.get();
 }

package/dist/runtime/plugins/siteConfig.mjs

@@ -1,27 +1,27 @@
-import { createSiteConfigContainer } from "../siteConfig/index.mjs";
+import { createSiteConfigStack } from "../siteConfig/index.mjs";
 import { defineNuxtPlugin, useRequestEvent, useState } from "#imports";
 export default defineNuxtPlugin({
   name: "nuxt-site-config",
   enforce: "pre",
   // or 'post'
   async setup(nuxtApp) {
-    let siteConfigContainer;
+    let siteConfigStack;
     if (process.server) {
-      siteConfigContainer = useRequestEvent().context.siteConfig;
+      siteConfigStack = useRequestEvent().context.siteConfig;
       nuxtApp.hooks.hook("app:rendered", () => {
         useState("site-config", () => useRequestEvent().context.siteConfig.get());
       });
     }
-    if (!siteConfigContainer)
-      siteConfigContainer = createSiteConfigContainer();
+    if (!siteConfigStack)
+      siteConfigStack = createSiteConfigStack();
     if (process.client) {
       const state = useState("site-config");
       if (state)
-        siteConfigContainer.push(state.value);
+        siteConfigStack.push(state.value);
     }
     return {
       provide: {
-        siteConfig: siteConfigContainer
+        siteConfig: siteConfigStack
       }
     };
   }

package/dist/runtime/siteConfig/env.mjs

@@ -1,6 +1,7 @@
 const processShim = typeof process !== "undefined" ? process : {};
 const envShim = processShim.env || {};
 export const envSiteConfig = {
+  _context: "env",
   url: [
     envShim.NUXT_PUBLIC_VERCEL_URL,
     // vercel

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

@@ -1,2 +1,2 @@
-export * from './container';
+export * from './stack';
 export * from './util';

package/dist/runtime/siteConfig/index.mjs

@@ -1,2 +1,2 @@
-export * from "./container.mjs";
+export * from "./stack.mjs";
 export * from "./util.mjs";

package/dist/runtime/siteConfig/stack.d.ts

@@ -0,0 +1,2 @@
+import type { SiteConfigStack } from '../../type';
+export declare function createSiteConfigStack(): SiteConfigStack;

package/dist/runtime/siteConfig/stack.mjs

@@ -0,0 +1,32 @@
+import { normalizeSiteConfig } from ".//index.mjs";
+export function createSiteConfigStack() {
+  const stack = [];
+  function push(input) {
+    if (!input._context) {
+      let lastFunctionName = new Error("tmp").stack?.split("\n")[2].split(" ")[5];
+      if (lastFunctionName?.includes("/"))
+        lastFunctionName = "anonymous";
+      input._context = lastFunctionName;
+    }
+    stack.push(input);
+  }
+  function get() {
+    const siteConfig = {
+      _context: {}
+    };
+    for (const o in stack) {
+      for (const k in stack[o]) {
+        const val = stack[o][k];
+        if (!k.endsWith("context") && typeof val !== "undefined") {
+          siteConfig[k] = val;
+          siteConfig._context[k] = stack[o]._context?.[k] || stack[o]._context || "anonymous";
+        }
+      }
+    }
+    return normalizeSiteConfig(siteConfig);
+  }
+  return {
+    push,
+    get
+  };
+}

package/dist/runtime/siteConfig/util.d.ts

@@ -1,4 +1,2 @@
 import type { SiteConfig, SiteConfigInput } from '../../type';
-export declare function normalizeSiteConfig(config: SiteConfigInput & {
-    _id?: number;
-}): SiteConfig;
+export declare function normalizeSiteConfig(config: SiteConfigInput): SiteConfig;

package/dist/runtime/siteConfig/util.mjs

@@ -3,6 +3,5 @@ export function normalizeSiteConfig(config) {
     config.indexable = String(config.indexable) !== "false";
   if (typeof config.trailingSlash !== "undefined")
     config.trailingSlash = String(config.trailingSlash) !== "false";
-  delete config._id;
   return config;
 }

package/dist/{type-51d86304.d.ts → type-1234fa1d.d.ts}

@@ -42,8 +42,16 @@ interface SiteConfig {
      * Used by: nuxt-schema-org, nuxt-seo-kit
      */
     logo?: string;
+    /**
+     * The mapping of the context of each site config value being set.
+     */
+    _context: Partial<Record<Exclude<keyof SiteConfig, '_meta'>, string>>;
 }
 interface SiteConfigInput {
+    /**
+     * A description of the context which added the config.
+     */
+    _context?: string;
     url?: string;
     name?: string;
     description?: string;
@@ -54,10 +62,10 @@ interface SiteConfigInput {
     indexable?: boolean | string;
     trailingSlash?: boolean | string;
 }
-interface SiteConfigContainer {
-    push: (config: SiteConfigInput) => void;
+interface SiteConfigStack {
+    push: (config: SiteConfigInput | SiteConfig) => void;
     get: () => SiteConfig;
 }
 type AssertionModes = 'prerender' | 'generate' | 'build';
 
-export { AssertionModes as A, SiteConfigContainer as S, SiteConfigInput as a, SiteConfig as b };
+export { AssertionModes as A, SiteConfigStack as S, SiteConfigInput as a, SiteConfig as b };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "packageManager": "pnpm@8.6.3",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",

package/dist/runtime/siteConfig/container.d.ts

@@ -1,2 +0,0 @@
-import type { SiteConfigContainer } from '../../type';
-export declare function createSiteConfigContainer(): SiteConfigContainer;

package/dist/runtime/siteConfig/container.mjs

@@ -1,18 +0,0 @@
-import { defu } from "defu";
-import { normalizeSiteConfig } from ".//index.mjs";
-export function createSiteConfigContainer() {
-  const stack = [];
-  function push(input) {
-    stack.push(input);
-  }
-  function get() {
-    let mergedStack = {};
-    for (const o of stack)
-      mergedStack = defu(o, mergedStack);
-    return normalizeSiteConfig(mergedStack);
-  }
-  return {
-    push,
-    get
-  };
-}