tungsten 0.7.1 → 0.8.0

package/dist/bin/commands/devmon.js

@@ -5,7 +5,7 @@ import { spawn } from 'node:child_process';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import chokidar from 'chokidar';
-import { cliError } from '../../cliOutput.js';
+import { cliInfo } from '../../cliOutput.js';
 import { getFrameworkDir } from '../../getFrameworkDir.js';
 import { cliArgs } from '../args.js';
 // devmon reads none of its arguments itself - it passes them straight through to the dev child
@@ -41,7 +41,7 @@ function startDev(devArgs) {
 function restartOnRebuild() {
   if (restartWanted) return; // one is already on its way down
   restartWanted = true;
-  cliError('tungsten framework rebuilt - restarting tungsten dev');
+  cliInfo('tungsten framework rebuilt - restarting tungsten dev');
   child?.kill();
 }
 startDev(initialArgs);

package/dist/bin/vendorHook.js

@@ -3,12 +3,13 @@ import { existsSync, readFileSync, statSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { cliWarn } from '../cliOutput.js';
+import { JSONparse } from '../json.js';
 export function registerVendorHook() {
   const packageDir = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
   const vendorDir = join(packageDir, 'vendor');
   const manifestPath = join(vendorDir, 'manifest.json');
   if (!existsSync(manifestPath)) return 'none';
-  const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- our own file
+  const manifest = JSONparse(readFileSync(manifestPath, 'utf8')); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- our own file
   const lockfile = join(packageDir, 'pnpm-lock.yaml');
   // a linked checkout whose dependencies moved on: fall back rather than run a stale bundle
   if (manifest.lockfile !== undefined && existsSync(lockfile)) {

package/dist/build/assetVersions.js

@@ -9,7 +9,8 @@ export function fileVersion(file) {
   if (statSync(file, {
     throwIfNoEntry: false
   })?.isFile() !== true) return undefined;
-  return createHash('sha256').update(readFileSync(file)).digest('hex').slice(0, 16);
+  const content = readFileSync(file);
+  return createHash('sha256').update(content).digest('hex').slice(0, 16);
 }
 export function readAssetVersions(bundleLocation, buildLocation) {
   const versions = {};

package/dist/build/babel.user.common.config.d.ts

@@ -1,12 +1,10 @@
-import type { PluginItem } from '@babel/core';
+import type { PluginItem, TransformOptions } from '@babel/core';
 export declare function loadTypescriptPreset(): Promise<void>;
 export declare function typescriptPreset(): PluginItem;
-declare const userCommonConfig: {
-    ignore: RegExp[];
-    babelrc: false;
-    configFile: false;
+export type UserBabelConfig = Omit<TransformOptions, 'presets' | 'plugins'> & {
     presets: PluginItem[];
     plugins: PluginItem[];
 };
+declare const userCommonConfig: UserBabelConfig;
 export default userCommonConfig;
 //# sourceMappingURL=babel.user.common.config.d.ts.map

package/dist/build/compileJavascript.js

@@ -1,4 +1,4 @@
-import { join, dirname, isAbsolute } from 'path';
+import { join, dirname } from 'path';
 import { pathToFileURL } from 'url';
 import chokidar from 'chokidar';
 import { transformSync as babelTransformSync } from '@babel/core';
@@ -6,6 +6,7 @@ import fs, { promises as fsPromises } from 'fs';
 import serializeJavascript from 'serialize-javascript';
 import slash from '../slash.js';
 import { glob } from '../glob.js';
+import { ignoreGlobs } from './ignoreGlobs.js';
 import { devRawBuildFolder, packagesCacheFolder, prodRawBuildFolder, stylesCacheFolder } from '../settings.js';
 import { frameworkVersion } from './frameworkDestLocation.js';
 import { loadTypescriptPreset } from './babel.user.common.config.js';
@@ -16,6 +17,7 @@ import { cliOut, cliLog, cliError, cliWarn } from '../cliOutput.js';
 import { createTimeProfiler, isProfiling, tallied } from '../timeProfiler.js';
 import { tallyBabel } from './tallyBabel.js';
 import { TungstenError } from '../TungstenError.js';
+import { StyleCompileError } from '../babelPlugins/StyleCompileError.js';
 import { getFrameworkDir } from '../getFrameworkDir.js';
 import { PromiseSettledResultIsPromiseRejectedResult } from './PromiseSettledResultIsPromiseRejectedResult.js';
 import { JSONstringify } from '../json.js';
@@ -126,8 +128,13 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       failedFiles.delete(file);
     } catch (e) {
       failedFiles.add(file);
-      cliError(`Tungsten: Error transforming project file ${file}`);
-      cliLog(e);
+      if (e instanceof StyleCompileError) {
+        cliError(`Tungsten: Sass compilation error in project file ${file}`);
+        cliLog(`${e.message}\n`);
+      } else {
+        cliError(`Tungsten: Error transforming project file ${file}`);
+        cliLog(e);
+      }
       throw e;
     }
   }
@@ -251,33 +258,11 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   const ignored = [];
   ignored.push(slash(`${buildLocation}/**`));
   if (typescript) ignored.push(slash(`${codeLocation}/**/*.d.ts`));
-  if (appConfig.ignoreDirs !== undefined && appConfig.ignoreDirs !== '') {
-    const ignoreDirs = typeof appConfig.ignoreDirs === 'string' ? [appConfig.ignoreDirs] : appConfig.ignoreDirs;
-    ignored.push(...ignoreDirs.map(folder => slash(`${codeLocation}/${folder}/**`)));
-  }
-  // patterns are relative to the code dir, like the dirs above and the selections below; raw they
-  // resolved against the cwd, so `client/testing/**` never matched <code>/client/testing/…
-  const fromCodeDir = pattern => isAbsolute(pattern) ? slash(pattern) : slash(`${codeLocation}/${pattern}`);
-  if (appConfig.ignorePatterns !== undefined && appConfig.ignorePatterns !== '') {
-    if (Array.isArray(appConfig.ignorePatterns)) {
-      for (const pattern of appConfig.ignorePatterns) {
-        ignored.push(fromCodeDir(pattern));
-      }
-    } else {
-      ignored.push(fromCodeDir(appConfig.ignorePatterns));
-    }
-  }
+  ignored.push(...ignoreGlobs(codeLocation, appConfig.ignoreDirs, appConfig.ignorePatterns));
   // test files are a category, not noise: excluded here like ignoreDirs/ignorePatterns, but a
   // test compile (`tungsten compile --tests`) wants them, where it would never want the ignored
   if (options.tests !== true) {
-    if (appConfig.testDirs !== undefined && appConfig.testDirs !== '') {
-      const testDirs = typeof appConfig.testDirs === 'string' ? [appConfig.testDirs] : appConfig.testDirs;
-      ignored.push(...testDirs.map(folder => slash(`${codeLocation}/${folder}/**`)));
-    }
-    if (appConfig.testPatterns !== undefined && appConfig.testPatterns !== '') {
-      const testPatterns = Array.isArray(appConfig.testPatterns) ? appConfig.testPatterns : [appConfig.testPatterns];
-      ignored.push(...testPatterns.map(fromCodeDir));
-    }
+    ignored.push(...ignoreGlobs(codeLocation, appConfig.testDirs, appConfig.testPatterns));
   }
   // Which sources each pipeline compiles. Unset, client is everything and raw is nothing; a file
   // may be in both. Dirs and patterns are relative to codeDir. The ignores are not applied

package/dist/build/componentStylesCache.js

@@ -2,7 +2,7 @@ import { createHash } from 'crypto';
 import fs from 'fs';
 import { join } from 'path';
 import { frameworkVersion } from './frameworkDestLocation.js';
-import { JSONstringify } from '../json.js';
+import { JSONparse, JSONstringify } from '../json.js';
 const sha1 = data => createHash('sha1').update(data).digest('hex');
 const blockHash = (language, rawStyles) => sha1(`${language}\0${rawStyles}`);
 const fileHash = file => {
@@ -21,7 +21,7 @@ export function makeComponentStylesCache(cacheDir, fresh = false) {
       if (cacheDir === undefined || fresh) return undefined;
       let record;
       try {
-        record = JSON.parse(fs.readFileSync(recordFile(cacheDir, moduleName), 'utf8')); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- fields checked below
+        record = JSONparse(fs.readFileSync(recordFile(cacheDir, moduleName), 'utf8')); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- fields checked below
       } catch {
         return undefined;
       }

package/dist/build/frameworkDestLocation.js

@@ -4,7 +4,8 @@ import { TungstenError } from '../TungstenError.js';
 import { getFrameworkDir } from '../getFrameworkDir.js';
 import { frameworkDistFolder, packagesFolder } from '../settings.js';
 import { makePackageIdentifier } from './packageIdentifier.js';
-const packageJson = JSON.parse(
+import { JSONparse } from '../json.js';
+const packageJson = JSONparse(
 // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 readFileSync(join(getFrameworkDir(), 'package.json'), 'utf8'));
 if (packageJson.version === undefined) {

package/dist/build/ignoreGlobs.d.ts

@@ -0,0 +1,2 @@
+export declare function ignoreGlobs(codeLocation: string, dirs: string | readonly string[] | undefined, patterns: string | readonly string[] | undefined): string[];
+//# sourceMappingURL=ignoreGlobs.d.ts.map

package/dist/build/ignoreGlobs.js

@@ -0,0 +1,8 @@
+import { isAbsolute } from 'path';
+import slash from '../slash.js';
+// a config's dirs and patterns, relative to the code dir, as watcher globs
+export function ignoreGlobs(codeLocation, dirs, patterns) {
+  const list = value => value === undefined || value === '' ? [] : typeof value === 'string' ? [value] : value;
+  const fromCodeDir = pattern => isAbsolute(pattern) ? slash(pattern) : slash(`${codeLocation}/${pattern}`);
+  return [...list(dirs).map(folder => slash(`${codeLocation}/${folder}/**`)), ...list(patterns).map(fromCodeDir)];
+}

package/dist/build/makeBabelRawConfig.d.ts

@@ -1,3 +1,3 @@
-import type { TransformOptions } from '@babel/core';
-export declare function makeBabelRawConfig(typescript: boolean): TransformOptions;
+import { type UserBabelConfig } from './babel.user.common.config.js';
+export declare function makeBabelRawConfig(typescript: boolean): UserBabelConfig;
 //# sourceMappingURL=makeBabelRawConfig.d.ts.map

package/dist/build/makeBabelUserDevConfig.d.ts

@@ -1,5 +1,5 @@
-import type { TransformOptions } from '@babel/core';
 import type { ImportAliases } from './ImportAliases.js';
 import { type DependencyGraph, type PackageInfo } from '../babelPlugins/BabelTransformPackageImports.js';
-export declare function makeBabelUserDevConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, buildLocation: string, buildCodeLocation: string, packagesCacheLocation: string, stylesCacheLocation: string | undefined, fresh: boolean, skipPackageCompilationFiles: ReadonlySet<string>, oldDependencyGraph: DependencyGraph, dependencyGraph: DependencyGraph, importAliases: ImportAliases, promises: Promise<PackageInfo | undefined>[], watchStyles?: boolean, hmr?: boolean, packages?: boolean): TransformOptions;
+import { type UserBabelConfig } from './babel.user.common.config.js';
+export declare function makeBabelUserDevConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, buildLocation: string, buildCodeLocation: string, packagesCacheLocation: string, stylesCacheLocation: string | undefined, fresh: boolean, skipPackageCompilationFiles: ReadonlySet<string>, oldDependencyGraph: DependencyGraph, dependencyGraph: DependencyGraph, importAliases: ImportAliases, promises: Promise<PackageInfo | undefined>[], watchStyles?: boolean, hmr?: boolean, packages?: boolean): UserBabelConfig;
 //# sourceMappingURL=makeBabelUserDevConfig.d.ts.map

package/dist/build/makeBabelUserProdConfig.d.ts

@@ -1,3 +1,3 @@
-import type { TransformOptions } from '@babel/core';
-export declare function makeBabelUserProdConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, watchStyles?: boolean): TransformOptions;
+import { type UserBabelConfig } from './babel.user.common.config.js';
+export declare function makeBabelUserProdConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, watchStyles?: boolean): UserBabelConfig;
 //# sourceMappingURL=makeBabelUserProdConfig.d.ts.map

package/dist/build/rollup.user.prod.config.js

@@ -7,7 +7,7 @@ import jsonModule from '@rollup/plugin-json';
 import { bundleBabelOptions } from './bundleBabelOptions.js';
 import { rollupExtractComponentStylesheets } from './rollupExtractComponentStylesheets.js';
 import { rollupProdConstants } from './rollupProdConstants.js';
-import { JSONstringify } from '../json.js';
+import { JSONparse, JSONstringify } from '../json.js';
 const json = typeof jsonModule === 'function' ? jsonModule : jsonModule.default;
 function replaceProductionNodeEnv() {
   return {
@@ -23,7 +23,7 @@ function replaceProductionNodeEnv() {
 }
 // the app config's `targets`, handed over by bundle.ts; unset means the framework default
 const targetsEnv = process.env.TUNGSTEN_TARGETS;
-const targets = targetsEnv === undefined ? undefined : JSON.parse(targetsEnv); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- written by bundle.ts
+const targets = targetsEnv === undefined ? undefined : JSONparse(targetsEnv); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- written by bundle.ts
 const rollupConfig = {
   plugins: [json(), nodeResolve(), commonjs(),
   // must be before babel

package/dist/build/tallyBabel.d.ts

@@ -1,3 +1,3 @@
-import type { TransformOptions } from '@babel/core';
-export declare function tallyBabel(config: TransformOptions): void;
+import type { UserBabelConfig } from './babel.user.common.config.js';
+export declare function tallyBabel(config: UserBabelConfig): void;
 //# sourceMappingURL=tallyBabel.d.ts.map

package/dist/build/tallyBabel.js

@@ -7,5 +7,5 @@ const coreTallies = {
 };
 export function tallyBabel(config) {
   config.wrapPluginVisitorMethod = (alias, _type, visit) => (path, state) => tallied(`babel: ${alias}`, () => visit(path, state));
-  config.plugins = [...(config.plugins ?? []), coreTallies];
+  config.plugins = [...config.plugins, coreTallies];
 }

package/dist/clone.js

@@ -1,3 +1,4 @@
+// not used internally, but exported
 import { map as objectMap } from 'sxy-lib/objects.js';
 export function clone(x) {
   if (typeof x === 'object' && x !== null) {

package/dist/componentHelpers.d.ts

@@ -5,7 +5,7 @@ import type { GlobalData } from './routing/registerGlobalData.js';
 import type { NetworkedData } from './routing/routingRegistry.js';
 export type ComponentHelpers = {
     fileUrl: (path: `/${string}`) => string;
-    readonly routes: Routes;
+    getRoutes: <R extends Routes<any> = Routes>() => R;
     readonly context: Context;
     readonly globalData: GlobalData;
     readonly allRoutesData: GlobalData | undefined;

package/dist/componentHelpers.js

@@ -2,10 +2,9 @@ import { fileUrl } from './fileVersions.js';
 export function makeComponentHelpers(component) {
   return {
     fileUrl: path => fileUrl(path, component.__instance),
-    //getRoutes: () => component.__instance.getRoutes(),
-    get routes() {
-      return component.__instance.routes;
-    },
+    //get routes() { return component.__instance.routes },
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the caller names the type
+    getRoutes: () => component.__instance.routes,
     //getContext: () => component.__instance.context,
     get context() {
       return component.__instance.context;

package/dist/componentProxyHandlers.js

@@ -500,7 +500,8 @@ function proxyArray(arr, element, adopted = new WeakMap()) {
   const existing = adopted.get(raw);
   if (existing) return existing;
   arr = adoptIntoState(arr);
-  const proxy = new Proxy(arr, getStateArrayProxyHandler(element));
+  const handler = getStateArrayProxyHandler(element);
+  const proxy = new Proxy(arr, handler);
   adopted.set(raw, proxy);
   proxyArrayContent(element, arr, adopted);
   return proxy;

package/dist/components/NativeHtml.d.ts

@@ -5,6 +5,6 @@ export interface NativeHtmlProps {
 }
 export declare class NativeHtml extends TungstenSimpleComponent<NativeHtmlProps> {
     static __opaque: boolean;
-    content: () => ContentNodeHtml | ContentNodeHtml[];
+    content: () => ContentNodeHtml[] | ContentNodeHtml;
 }
 //# sourceMappingURL=NativeHtml.d.ts.map

package/dist/components/bindable/BindableInputTyped.d.ts

@@ -13,7 +13,9 @@ type BasicProps = {
     value?: string;
     placeholder?: string;
 };
-type BindableInputTypedProps<T, O extends Obj, K extends KeysOfType<T, O>> = BasicProps & (T extends string ? {
+type BindableInputTypedProps<T, O extends Obj, K extends KeysOfType<T, O>> = BasicProps & ([
+    T
+] extends [string] ? {
     bind?: ExplicityTypedBindVariable<T, O, K>;
     convert?: ConvertFuncString<InputKeyboardEvent, O[K]> | undefined;
 } : {

package/dist/components/bindable/BindableInputTypedLegacy.d.ts

@@ -15,7 +15,9 @@ type BasicProps = {
 };
 type BindableInputTypedProps<T, K extends string | number | symbol, O extends {
     [Key in K]: T;
-}> = BasicProps & (T extends string ? {
+}> = BasicProps & ([
+    T
+] extends [string] ? {
     bind?: ExplicityTypedBindVariableLegacy<T, K, O>;
     convert?: ConvertFuncString<InputKeyboardEvent, O[K]> | undefined;
 } : {

package/dist/components/bindable/bindableHtmlElements.d.ts

@@ -13,9 +13,6 @@ export declare const bindableHtmlElementsNumber: {
     progress: boolean;
 };
 export declare const bindableHtmlElements: {
-    li: boolean;
-    meter: boolean;
-    progress: boolean;
     button: boolean;
     data: boolean;
     input: boolean;
@@ -23,5 +20,8 @@ export declare const bindableHtmlElements: {
     param: boolean;
     select: boolean;
     textarea: boolean;
+    li: boolean;
+    meter: boolean;
+    progress: boolean;
 };
 //# sourceMappingURL=bindableHtmlElements.d.ts.map

package/dist/components/library/RichTextEditor/RichTextEditor.d.ts

@@ -1,7 +1,7 @@
 import type { TypedBindVariable } from '../../bindable/BindVariable.js';
 import type { ExtendedChangeEvent, ExtendedClipboardEvent, ExtendedFormEvent, ExtendedKeyboardEvent, ExtendedMouseEvent } from '../../../../types/jsx/html.events.js';
 import { TungstenStatefulComponent } from '../../../Components.jsx';
-declare const trackedCommands: readonly ["bold", "italic", "underline", "strikeThrough", "subscript", "superscript", "insertUnorderedList", "insertOrderedList"];
+declare const trackedCommands: readonly ['bold', 'italic', 'underline', 'strikeThrough', 'subscript', 'superscript', 'insertUnorderedList', 'insertOrderedList'];
 type TrackedCommand = (typeof trackedCommands)[number];
 type Props<TreeO extends object, TreeK extends keyof TreeO, HtmlO extends object, HtmlK extends keyof HtmlO> = {
     className?: string;

package/dist/components/library/RichTextEditor/StoredContentNode.d.ts

@@ -1,5 +1,10 @@
+import type { Json } from '../../../Json.type.js';
 export type StoredContentNode = string | number | null | StoredContentNode[] | {
     tag: string;
-    props: Record<string, unknown>;
+    props: StoredNodeProps;
+};
+export type StoredNodeProps = {
+    [key: string]: Json;
+    children?: StoredContentNode;
 };
 //# sourceMappingURL=StoredContentNode.d.ts.map

package/dist/components/library/RichTextEditor/contentTree.js

@@ -2,6 +2,26 @@ import { $props, $type } from '../../../contentNodeSymbols.js';
 import { ContentNodeIsArray, ContentNodeIsFragment, ContentNodeIsHtml, ContentNodeIsLiteral, ContentNodeIsNonRendered } from '../../../ContentNode.js';
 import { filterContentNode } from '../../../rawHtml/filterContentNode.js';
 import { safeHtmlAllowList } from '../../../rawHtml/safeHtmlAllowList.js';
+// as JSON.stringify writes it: no functions, undefined, class instances or non-finite numbers
+function isJson(value) {
+  if (value === null || typeof value === 'string' || typeof value === 'boolean') return true;
+  if (typeof value === 'number') return Number.isFinite(value);
+  if (Array.isArray(value)) return value.every(isJson);
+  if (typeof value !== 'object') return false;
+  const prototype = Object.getPrototypeOf(value);
+  return (prototype === Object.prototype || prototype === null) && Object.values(value).every(isJson);
+}
+const isJsonMap = value => typeof value === 'object' && value !== null && !Array.isArray(value);
+// NodeProps' named members, by what a value must be to fill one; a ref has no stored form
+const namedPropFits = {
+  value: value => value === null || typeof value !== 'object',
+  ref: () => false,
+  __zoneHtml: value => typeof value === 'string',
+  __opaque: value => typeof value === 'boolean',
+  dangerouslySetInnerHTML: value => isJsonMap(value) && typeof value.__html === 'string'
+};
+// a prop that is stored, and read back, as itself
+const storableProp = (key, value) => isJson(value) && (namedPropFits[key]?.(value) ?? true);
 /**
  * Converts a Tungsten content tree into the JSON-safe StoredContentNode shape
  * for persistence/transport. Only host HTML nodes are supported — the shape
@@ -20,12 +40,14 @@ export function serializeContentTree(node) {
     children,
     ...attributes
   } = node[$props];
+  const props = {};
+  for (const [key, value] of Object.entries(attributes)) {
+    if (storableProp(key, value)) props[key] = value;
+  }
+  if (children !== undefined) props.children = serializeContentTree(children);
   return {
     tag: node[$type],
-    props: children === undefined ? attributes : {
-      ...attributes,
-      children: serializeContentTree(children)
-    }
+    props
   };
 }
 /**
@@ -33,7 +55,9 @@ export function serializeContentTree(node) {
  * the column is reproduced faithfully, including markup that must not survive
  * to a render — filtering is `deserializeContentTree`'s job, in one pass over
  * the finished tree, so that this stays a plain structural inverse of
- * `serializeContentTree`.
+ * `serializeContentTree`. The one exception is a prop that can't be what it
+ * names, such as an object stored as `value`: serializeContentTree never
+ * writes one, so it is left out.
  */
 function rebuildContentTree(stored) {
   if (stored === null) return null;
@@ -43,15 +67,11 @@ function rebuildContentTree(stored) {
     children,
     ...attributes
   } = stored.props;
-  const props = {
-    ...attributes
-  };
-  if (children !== undefined) {
-    // Storage round-trip boundary: `children` holds whatever
-    // serializeContentTree put there.
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    props.children = rebuildContentTree(children);
+  const props = {};
+  for (const [key, value] of Object.entries(attributes)) {
+    if (storableProp(key, value)) props[key] = value;
   }
+  if (children !== undefined) props.children = rebuildContentTree(children);
   // Lowercased to match what parseHtml produces, so a hand-edited row cannot
   // present a tag the allow list would then fail to recognise.
   return {

package/dist/env/setPrivateEnvValidator.js

@@ -1,4 +1,4 @@
-global.__tungstenPrivateEnvValidator = undefined;
+globalThis.__tungstenPrivateEnvValidator = undefined;
 export function setPrivateEnvValidator(validator) {
-  global.__tungstenPrivateEnvValidator = validator;
+  globalThis.__tungstenPrivateEnvValidator = validator;
 }

package/dist/env/setPublicEnvValidator.d.ts

@@ -1,6 +1,6 @@
 import type { StandardSchema } from '../standardSchema.js';
-export type TungstenPublicEnvValidatorFunction = () => TungstenPrivateEnv;
-export type TungstenPublicEnvValidator = TungstenPublicEnvValidatorFunction | StandardSchema<TungstenPrivateEnv>;
+export type TungstenPublicEnvValidatorFunction = () => TungstenPublicEnv;
+export type TungstenPublicEnvValidator = TungstenPublicEnvValidatorFunction | StandardSchema<TungstenPublicEnv>;
 declare global {
     var __tungstenPublicEnvValidator: TungstenPublicEnvValidator | undefined;
 }

package/dist/env/setPublicEnvValidator.js

@@ -1,4 +1,4 @@
-global.__tungstenPublicEnvValidator = undefined;
+globalThis.__tungstenPublicEnvValidator = undefined;
 export function setPublicEnvValidator(validator) {
-  global.__tungstenPublicEnvValidator = validator;
+  globalThis.__tungstenPublicEnvValidator = validator;
 }

package/dist/fileVersions.js

@@ -22,7 +22,11 @@ export function versionAttributes(attributes, source) {
   for (const [name, value] of Object.entries(attributes)) {
     if (typeof value !== 'string') continue;
     const lower = name.toLowerCase();
-    if (urlAttributes.has(lower)) attributes[name] = versionUrl(value, source);else if (lower === 'srcset') attributes[name] = versionSrcset(value, source);
+    if (urlAttributes.has(lower)) {
+      attributes[name] = versionUrl(value, source);
+    } else if (lower === 'srcset') {
+      attributes[name] = versionSrcset(value, source);
+    }
   }
   return attributes;
 }

package/dist/findProjectDir.js

@@ -2,6 +2,7 @@ import { dirname, join } from 'path';
 import { existsSync, readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { TungstenError } from './TungstenError.js';
+import { JSONparse } from './json.js';
 // find-package-json in-house: every package.json from startLocation up to the root
 function* packageJsonFinder(startLocation) {
   let dir = startLocation;
@@ -9,7 +10,7 @@ function* packageJsonFinder(startLocation) {
     const filename = join(dir, 'package.json');
     if (existsSync(filename)) yield {
       filename,
-      value: JSON.parse(readFileSync(filename, 'utf8'))
+      value: JSONparse(readFileSync(filename, 'utf8'))
     };
     const parent = dirname(dir);
     if (parent === dir) return;

package/dist/findUserConfig.d.ts

@@ -1,6 +1,6 @@
 export declare function findUserConfig(projectDir: string, volume?: 'silent' | 'noisy'): Promise<{
     data: unknown;
-    moduleType: "module" | "commonjs";
+    moduleType: "commonjs" | "module";
     location: string;
 } | null>;
 //# sourceMappingURL=findUserConfig.d.ts.map

package/dist/frameworkConfigSchema.d.ts

@@ -4,8 +4,6 @@ import type { SiteBasePath } from './render/HeadData.js';
 export interface BabelOptions extends BabelParserOptions {
 }
 export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent", [v.ObjectSchema<{
-    readonly useRootComponent: v.ExactOptionalSchema<v.LiteralSchema<true, undefined>, undefined>;
-    readonly rootComponent: v.StringSchema<undefined>;
     readonly codeDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copy: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copyExclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
@@ -37,6 +35,8 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
         readonly targets: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     }, undefined>, undefined>;
     readonly serverMiddleware: v.ExactOptionalSchema<v.TupleSchema<[v.StringSchema<undefined>, v.StringSchema<undefined>, v.StringSchema<undefined>], undefined>, undefined>;
+    readonly serverIgnoreDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly serverIgnorePatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly apiRoutes: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly apiPath: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly suppressNoHeadWarning: v.ExactOptionalSchema<v.BooleanSchema<undefined>, undefined>;
@@ -52,9 +52,9 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
         readonly staleWhileRevalidate: v.ExactOptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 0, undefined>]>, undefined>;
     }, undefined>], undefined>, undefined>;
     readonly registration: v.ExactOptionalSchema<v.PicklistSchema<["register", "pipeline"], undefined>, undefined>;
+    readonly useRootComponent: v.ExactOptionalSchema<v.LiteralSchema<true, undefined>, undefined>;
+    readonly rootComponent: v.StringSchema<undefined>;
 }, undefined>, v.ObjectSchema<{
-    readonly useRootComponent: v.LiteralSchema<false, undefined>;
-    readonly serverSideRouting: v.ExactOptionalSchema<v.LiteralSchema<true, undefined>, undefined>;
     readonly codeDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copy: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copyExclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
@@ -86,6 +86,8 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
         readonly targets: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     }, undefined>, undefined>;
     readonly serverMiddleware: v.ExactOptionalSchema<v.TupleSchema<[v.StringSchema<undefined>, v.StringSchema<undefined>, v.StringSchema<undefined>], undefined>, undefined>;
+    readonly serverIgnoreDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly serverIgnorePatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly apiRoutes: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly apiPath: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly suppressNoHeadWarning: v.ExactOptionalSchema<v.BooleanSchema<undefined>, undefined>;
@@ -100,6 +102,8 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
         readonly staleWhileRevalidate: v.ExactOptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 0, undefined>]>, undefined>;
     }, undefined>], undefined>, undefined>;
     readonly registration: v.ExactOptionalSchema<v.PicklistSchema<["register", "pipeline"], undefined>, undefined>;
+    readonly useRootComponent: v.LiteralSchema<false, undefined>;
+    readonly serverSideRouting: v.ExactOptionalSchema<v.LiteralSchema<true, undefined>, undefined>;
 }, undefined>], undefined>;
 export type FrameworkConfig = v.InferOutput<typeof frameworkConfigValidator>;
 export declare function unknownConfigKeys(config: unknown): string[];

package/dist/frameworkConfigSchema.js

@@ -53,6 +53,8 @@ const frameworkConfigBaseEntries = {
     targets: v.exactOptional(stringOrStrings)
   })),
   serverMiddleware: v.exactOptional(v.tuple([v.string(), v.string(), v.string()])),
+  serverIgnoreDirs: v.exactOptional(stringOrStrings),
+  serverIgnorePatterns: v.exactOptional(stringOrStrings),
   apiRoutes: v.exactOptional(v.string()),
   apiPath: v.exactOptional(v.string()),
   suppressNoHeadWarning: v.exactOptional(v.boolean()),

package/dist/getRoutes.js

@@ -6,10 +6,6 @@ import { importDevModuleWithRetry } from './importDevModuleWithRetry.js';
 import { importModule } from './importModule.js';
 import { routesLocationParts } from './routesLocationParts.js';
 import { resolveAppRoutes } from './routing/resolveAppRoutes.js';
-// future - add a loose check on the routes object
-function IsAppRoutesShaped(v) {
-  return true;
-}
 export async function getRoutes(compilationInfo, config,
 //load: Load | null = null,
 iteration = null, mode = 'prod') {

package/dist/hydrate/hydrate.js

@@ -79,13 +79,14 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig, fileVers
   let globalData;
   if (stub) {
     // as a client navigation fetches: the global data beside routing
-    const [fetched, routed] = await Promise.all([globalDataFunc.value?.(null, context, networkedData) ?? {}, stubRouting(location, to => routing(to, routes, context, networkedData), instanceConfig)]);
+    const fetchData = globalDataFunc.value;
+    const routed = await stubRouting(location, to => routing(to, routes, context, networkedData), instanceConfig, fetchData && (async to => fetchData(null, context, networkedData, to)));
     if (routed === null) return;
     ({
       location,
       matchedRouteInfo
     } = routed);
-    globalData = fetched;
+    globalData = routed.allRoutesData ?? {}; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- the framework brands what it builds
   } else {
     matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
     globalData = __tungsten_global_data__;

package/dist/hydrate/hydrateGlobalData.d.ts

@@ -6,5 +6,8 @@ declare global {
     let __tungsten_networked_data__: BrandedNetworkedData;
     let __tungsten_matched_route_info__: NetworkMatchedRouteInfo;
     let __tungsten_route_data__: unknown;
+    let __tungsten_error_info__: {
+        message: string;
+    } | undefined;
 }
 //# sourceMappingURL=hydrateGlobalData.d.ts.map

package/dist/hydrate/stubRouting.d.ts

@@ -3,6 +3,7 @@ import type { MatchedRouteInfo } from '../routing/MatchedRouteInfo.js';
 export type StubRouted = {
     location: string;
     matchedRouteInfo: MatchedRouteInfo;
+    allRoutesData: unknown;
 };
-export declare function stubRouting(location: string, route: (location: string) => Promise<MatchedRouteInfo>, instanceConfig: InstanceConfig): Promise<StubRouted | null>;
+export declare function stubRouting(location: string, route: (location: string) => Promise<MatchedRouteInfo>, instanceConfig: InstanceConfig, allRoutesData?: (location: string) => Promise<unknown>): Promise<StubRouted | null>;
 //# sourceMappingURL=stubRouting.d.ts.map