vike 0.4.170 → 0.4.171-commit-4e9d13c

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -271,7 +271,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -502,7 +501,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     (0, utils_js_1.assert)(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -939,6 +938,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/cjs/shared/getPageFiles/getExports.js

@@ -32,6 +32,18 @@ function getPageContextExports(pageFiles, pageConfig) {
         });
     });
     // V1 design
+    const source = {};
+    const sources = {};
+    const addSrc = (src, configName) => {
+        source[configName] = src;
+        sources[configName] ?? (sources[configName] = []);
+        sources[configName].push(src);
+    };
+    const from = {
+        configsOverridable: {},
+        configsCumulative: {},
+        configsComputed: {}
+    };
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
@@ -46,6 +58,39 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'cumulative') {
+                const src = {
+                    type: 'configsCumulative',
+                    values: configValue.value.map((value, i) => {
+                        const definedAtFile = configValue.definedAtData[i];
+                        (0, utils_js_1.assert)(definedAtFile);
+                        const definedAt = (0, getConfigDefinedAt_js_1.getDefinedAtString)(definedAtFile, configName);
+                        return {
+                            value,
+                            definedAt
+                        };
+                    })
+                };
+                addSrc(src, configName);
+                from.configsCumulative[configName] = src;
+            }
+            if (configValue.type === 'classic') {
+                const src = {
+                    type: 'configsOverridable',
+                    value: configValue.value,
+                    definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsOverridable[configName] = src;
+            }
+            if (configValue.type === 'computed') {
+                const src = {
+                    type: 'configsComputed',
+                    value: configValue.value
+                };
+                addSrc(src, configName);
+                from.configsComputed[configName] = src;
+            }
             // TODO/v1-release: remove
             const exportName = configName;
             exportsAll[exportName] = exportsAll[exportName] ?? [];
@@ -75,9 +120,12 @@ function getPageContextExports(pageFiles, pageConfig) {
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
     const pageContextExports = {
+        from,
+        source,
+        sources,
+        // TODO/eventually: deprecate/remove every prop below
         config,
         configEntries,
-        // TODO/v1-release: remove
         exports,
         exportsAll,
         pageExports

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.170';
+const PROJECT_VERSION = '0.4.171-commit-4e9d13c';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -266,7 +266,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -497,7 +496,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     assert(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -933,6 +932,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${pc.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -19,6 +19,9 @@ declare function loadUserFilesServerSide(pageContext: {
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
+    source: import("../../../shared/getPageFiles/getExports.js").Source;
+    sources: import("../../../shared/getPageFiles/getExports.js").Sources;
+    from: import("../../../shared/getPageFiles/getExports.js").From;
     config: Record<string, unknown>;
     configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
     exports: Record<string, unknown>;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -61,6 +61,9 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: import("../../../shared/getPageFiles/getExports.js").Source;
+        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
+        from: import("../../../shared/getPageFiles/getExports.js").From;
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -108,6 +111,9 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: import("../../../shared/getPageFiles/getExports.js").Source;
+        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
+        from: import("../../../shared/getPageFiles/getExports.js").From;
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -156,6 +162,9 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: import("../../../shared/getPageFiles/getExports.js").Source;
+        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
+        from: import("../../../shared/getPageFiles/getExports.js").From;
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -203,6 +212,9 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: import("../../../shared/getPageFiles/getExports.js").Source;
+        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
+        from: import("../../../shared/getPageFiles/getExports.js").From;
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;

package/dist/esm/shared/getPageFiles/getExports.d.ts

@@ -2,6 +2,9 @@ export { getPageContextExports };
 export type { ExportsAll };
 export type { PageContextExports };
 export type { ConfigEntries };
+export type { From };
+export type { Sources };
+export type { Source };
 import type { FileType } from './fileTypes.js';
 import type { PageConfigRuntimeLoaded } from './../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
@@ -27,6 +30,9 @@ type ConfigEntries = Record<string, {
     configDefinedByFile: string | null;
 }[]>;
 type PageContextExports = {
+    source: Source;
+    sources: Sources;
+    from: From;
     config: Record<string, unknown>;
     configEntries: ConfigEntries;
     exports: Record<string, unknown>;
@@ -34,4 +40,34 @@ type PageContextExports = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
+type From = {
+    configsOverridable: Record<string, // configName
+    SourceConfigsOverridable>;
+    configsCumulative: Record<string, // configName
+    SourceConfigsCumulative>;
+    configsComputed: Record<string, // configName
+    SourceConfigsComputed>;
+};
+type Source = Record<string, // configName
+SourceAny>;
+type Sources = Record<string, // configName
+SourceAny[]>;
+type SourceAny = SourceConfigs;
+type SourceConfigs = SourceConfigsOverridable | SourceConfigsCumulative | SourceConfigsComputed;
+type SourceConfigsOverridable = {
+    type: 'configsOverridable';
+    value: unknown;
+    definedAt: string;
+};
+type SourceConfigsCumulative = {
+    type: 'configsCumulative';
+    values: {
+        value: unknown;
+        definedAt: string;
+    }[];
+};
+type SourceConfigsComputed = {
+    type: 'configsComputed';
+    value: unknown;
+};
 declare function getPageContextExports(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageContextExports;

package/dist/esm/shared/getPageFiles/getExports.js

@@ -2,7 +2,7 @@ export { getPageContextExports };
 import { isScriptFile, isTemplateFile } from '../../utils/isScriptFile.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser } from '../utils.js';
 import { assertDefaultExports, forbiddenDefaultExports } from './assert_exports_old_design.js';
-import { getConfigDefinedAtOptional } from '../page-configs/getConfigDefinedAt.js';
+import { getConfigDefinedAtOptional, getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from '../page-configs/helpers.js';
 import pc from '@brillout/picocolors';
 function getPageContextExports(pageFiles, pageConfig) {
@@ -27,6 +27,18 @@ function getPageContextExports(pageFiles, pageConfig) {
         });
     });
     // V1 design
+    const source = {};
+    const sources = {};
+    const addSrc = (src, configName) => {
+        source[configName] = src;
+        sources[configName] ?? (sources[configName] = []);
+        sources[configName].push(src);
+    };
+    const from = {
+        configsOverridable: {},
+        configsCumulative: {},
+        configsComputed: {}
+    };
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
@@ -41,6 +53,39 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'cumulative') {
+                const src = {
+                    type: 'configsCumulative',
+                    values: configValue.value.map((value, i) => {
+                        const definedAtFile = configValue.definedAtData[i];
+                        assert(definedAtFile);
+                        const definedAt = getDefinedAtString(definedAtFile, configName);
+                        return {
+                            value,
+                            definedAt
+                        };
+                    })
+                };
+                addSrc(src, configName);
+                from.configsCumulative[configName] = src;
+            }
+            if (configValue.type === 'classic') {
+                const src = {
+                    type: 'configsOverridable',
+                    value: configValue.value,
+                    definedAt: getDefinedAtString(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsOverridable[configName] = src;
+            }
+            if (configValue.type === 'computed') {
+                const src = {
+                    type: 'configsComputed',
+                    value: configValue.value
+                };
+                addSrc(src, configName);
+                from.configsComputed[configName] = src;
+            }
             // TODO/v1-release: remove
             const exportName = configName;
             exportsAll[exportName] = exportsAll[exportName] ?? [];
@@ -70,9 +115,12 @@ function getPageContextExports(pageFiles, pageConfig) {
     assert(!('default' in exports));
     assert(!('default' in exportsAll));
     const pageContextExports = {
+        from,
+        source,
+        sources,
+        // TODO/eventually: deprecate/remove every prop below
         config,
         configEntries,
-        // TODO/v1-release: remove
         exports,
         exportsAll,
         pageExports

package/dist/esm/shared/types.d.ts

@@ -8,7 +8,7 @@ export { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
 export { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
 import type { PageContextUrlComputedPropsInternal, PageContextUrlComputedPropsClient, PageContextUrlComputedPropsServer } from './addUrlComputedProps.js';
-import type { ConfigEntries, ExportsAll } from './getPageFiles/getExports.js';
+import type { ConfigEntries, ExportsAll, From, Source, Sources } from './getPageFiles/getExports.js';
 import type { Config } from './page-configs/Config.js';
 import type { PageContextConfig } from './page-configs/Config/PageContextConfig.js';
 import type { AbortStatusCode } from './route/abort.js';
@@ -88,6 +88,12 @@ type PageContextBuiltInCommon<Data> = {
      * https://vike.dev/errors
      */
     errorWhileRendering?: unknown;
+    /** @experimental https://github.com/vikejs/vike/issues/1268 */
+    from: From;
+    /** @experimental https://github.com/vikejs/vike/issues/1268 */
+    source: Source;
+    /** @experimental https://github.com/vikejs/vike/issues/1268 */
+    sources: Sources;
     /** @deprecated */
     url: string;
     /** @deprecated */

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.170";
+declare const PROJECT_VERSION: "0.4.171-commit-4e9d13c";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.170";
+    projectVersion: "0.4.171-commit-4e9d13c";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.170';
+const PROJECT_VERSION = '0.4.171-commit-4e9d13c';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.170",
+  "version": "0.4.171-commit-4e9d13c",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -195,7 +195,7 @@
     "fast-glob": "^3.3.2",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
-    "@brillout/release-me": "^0.2.2",
+    "@brillout/release-me": "^0.3.4",
     "@types/estree": "^1.0.5",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",