tungsten 0.4.11 → 0.4.13

package/dist/RenderedContentNode.js

@@ -1,5 +1,5 @@
-import { $contentNull } from "./symbols.js";
-import { $type } from "./contentNodeSymbols.js";
+import { $contentNull } from './symbols.js';
+import { $type } from './contentNodeSymbols.js';
 // rendered content node symbols
 export const $string = Symbol('string');
 export const $number = Symbol('number');
@@ -18,6 +18,7 @@ export function RenderedContentNodeIsSingle(rcn) {
 export function WideRenderedContentNodeIsRendered(wrcn) {
   return wrcn !== $contentNull && !RenderedContentNodeIsNonRendered(wrcn);
 }
+/* eslint-disable @typescript-eslint/no-unnecessary-condition -- type guards: the null checks stay although the declared unions exclude null */
 export function RenderedContentNodeIsArray(rcn) {
   return Array.isArray(rcn);
 }
@@ -88,7 +89,7 @@ export function makeRenderedContentNodeHtml(newNode, domNode, renderedChildren)
   return {
     ...newNode,
     domNode: domNode,
-    // eslint-disable-line no-type-assertion/no-type-assertion -- casting to TungstenHTMLElement just allows arbitrary keys to be added.
+    // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- casting to TungstenHTMLElement just allows arbitrary keys to be added.
     renderedChildren
   };
 }

package/dist/RenderingNode.js

@@ -1,5 +1,5 @@
-import { ContentNodeIsLiteral } from "./ContentNode.js";
-import { $key, $props, $type } from "./contentNodeSymbols.js";
+import { ContentNodeIsLiteral } from './ContentNode.js';
+import { $key, $props, $type } from './contentNodeSymbols.js';
 export const $component = Symbol('element');
 export const $element = Symbol('element');
 export const $children = Symbol('children');

package/dist/Sass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sass.d.ts","sourceRoot":"","sources":["../src/Sass.ts"],"names":[],"mappings":"AAMA,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM;;;;EAMlC"}
+{"version":3,"file":"Sass.d.ts","sourceRoot":"","sources":["../src/Sass.ts"],"names":[],"mappings":"AAKA,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM;;;;EAMlC"}

package/dist/Sass.js

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+// to be used as a return type, once the exact type has been determined
 export function Sass(styles) {
   return {
     'classes': undefined,

package/dist/Script.js

@@ -2,7 +2,7 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { TungstenSimpleComponent } from "./Components.js";
-import { jsx as _jsx } from "tungsten/jsxRuntime.js";
+import { jsx as _jsx } from "tungsten/jsx-runtime";
 export class Script extends TungstenSimpleComponent {
   constructor(...args) {
     super(...args);

package/dist/Servers/DevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAMlF,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAW3C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAMrC,OAAO,EAAE,UAAU,EAAkB,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAqBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;IAIrD,OAAO,CAAC,MAAM,CAA2C;gBAErD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAgIlD,OAAO,CAAC,mBAAmB,CAyE1B;IAKD,OAAO,CAAC,sBAAsB,CAQ7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAO1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CA+NpB;IAaD,OAAO,CAAC,mBAAmB,CAsC1B;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAMH;CAGJ"}
+{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAQlF,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAW3C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,OAAO,EAAE,UAAU,EAAkB,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAqBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;IAIrD,OAAO,CAAC,MAAM,CAA2C;gBAErD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAgIlD,OAAO,CAAC,mBAAmB,CA2E1B;IAKD,OAAO,CAAC,sBAAsB,CAQ7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAK1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CA+NpB;IAaD,OAAO,CAAC,mBAAmB,CAsC1B;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAMH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -3,36 +3,39 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import express from 'express';
 import { join, relative } from 'path';
-import slash from 'slash';
+import { fixExtension } from '../fixExtension.js';
+import { serverModuleLocation } from '../serverModuleLocation.js';
+import slash from '../slash.js';
 // moduleReloader (V important ES module cache control) is not imported here - Framework imports
 // DevServer on the prod path too, so it is registered in createDevServer() instead
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
-import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
-import { rootToHtmlDev as renderRootToHtmlDev } from "../render/rootToHtmlDev.js";
-import { Instance } from "../Instance/Instance.js";
-import { TungstenError } from "../TungstenError.js";
-import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
-import { cliNews, cliOut, cliWarn, cliLog, cliError } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder, frameworkCssFolder } from '../settings.js';
+import { rootToHtmlDev as renderRootToHtmlDev } from '../render/rootToHtmlDev.js';
+import { Instance } from '../Instance/Instance.js';
+import { TungstenError } from '../TungstenError.js';
+import { makeInstanceConfigFromFrameworkConfig } from '../makeInstanceConfigFromFrameworkConfig.js';
+import { cliNews, cliOut, cliWarn, cliLog, cliError } from '../cliOutput.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { existsSync } from 'fs';
-import { getApiRoutes } from "../api/getApiRoutes.js";
-import { standardizeWebPath } from "../standardizeWebPath.js";
-import { log } from "../appOutput.js";
-import { throwError } from "../throwError.js";
-import { getRoutesDev } from "../getRoutesDevs.js";
-import { getComponentDev } from "../getComponentDev.js";
-import { serveStatic } from "./serveStatic.js";
+import { getApiRoutes } from '../api/getApiRoutes.js';
+import { standardizeWebPath } from '../standardizeWebPath.js';
+import { log } from '../appOutput.js';
+import { throwError } from '../throwError.js';
+import { getRoutesDev } from '../getRoutesDevs.js';
+import { getComponentDev } from '../getComponentDev.js';
+import { serveStatic } from './serveStatic.js';
+// old loading method
 import { routing } from "./routing.js";
-import { globalDataFunc } from "../routing/registerGlobalData.js";
+import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { TungstenServer } from "./TungstenServer.js";
-import { portError } from "./portError.js";
-import { loadEnvsDev } from "./loadEnvsDev.js";
-import { initStores } from "./initStores.js";
-import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
-import { MatchedRoute } from "../routing/MatchedRoute.js";
-import { iterationQueryString } from "../iterationQueryString.js";
-import { onReloadEvent } from "../hmr/liveReloadHub.js";
-import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
-import { devErrorPageAutoRetryScript } from "./devErrorPageAutoRetry.js";
+import { portError } from './portError.js';
+import { loadEnvsDev } from './loadEnvsDev.js';
+import { initStores } from './initStores.js';
+import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
+import { MatchedRoute } from '../routing/MatchedRoute.js';
+import { iterationQueryString } from '../iterationQueryString.js';
+import { onReloadEvent } from '../hmr/liveReloadHub.js';
+import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
+import { devErrorPageAutoRetryScript } from './devErrorPageAutoRetry.js';
 //import cookieParser from 'cookie-parser'
 function debug(...texts) {
   // console.log(...texts)
@@ -76,7 +79,7 @@ export class DevServer extends TungstenServer {
       //         + ` when trying to load server middleware`
       //     )
       // }
-      // const middlewares = middlewareModule[middlewareExportName] as RequestHandler[] // eslint-disable-line no-type-assertion/no-type-assertion
+      // const middlewares = middlewareModule[middlewareExportName] as RequestHandler[] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       // this.app.use(path, middlewares)
       // return
       this.app.use(path, async (req, res, next) => {
@@ -91,13 +94,13 @@ export class DevServer extends TungstenServer {
         // [*] const middlewares = await middlewaresPromise
         try {
           //const load = await createLoad(import.meta.url, sxyLoaderConfig)
-          const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
+          const fullFilePath = 'file://' + serverModuleLocation(this.compilationInfo.projectDir, 'dev', this.compilationInfo.codeLocation, middlewareFile);
           //const middlewareModule = await load(fullFilePath)
           const middlewareModule = await importDevModuleWithRetry(iterationQueryString(fullFilePath, this.serverIterationCount++, 'middleware'));
           if (!(middlewareExportName in middlewareModule)) {
             throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile}` + ` when trying to load server middleware`);
           }
-          const middlewares = middlewareModule[middlewareExportName]; // eslint-disable-line no-type-assertion/no-type-assertion
+          const middlewares = middlewareModule[middlewareExportName]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
           if (!Array.isArray(middlewares)) {
             throwError('addServerMiddleware', `Expected middlewares to be an array`);
           }
@@ -171,11 +174,9 @@ export class DevServer extends TungstenServer {
       }, DevServer.reloadDebounceMs);
     });
     _defineProperty(this, "sourceFileToUrlPath", file => {
-      let rel = slash(relative(this.compilationInfo.codeLocation, file));
-      // compileJavascript strips the trailing 'x' off '.jsx' when writing the compiled
-      // output (the file no longer contains literal JSX after the babel transform) - match
-      // that here so the URL points at the file that's actually served.
-      if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
+      // compileJavascript writes every compiled source as .js - match that here so the URL
+      // points at the file that's actually served
+      const rel = fixExtension(slash(relative(this.compilationInfo.codeLocation, file)));
       return `/${this.compilationInfo.codeSubPath}/${rel}`;
     });
     _defineProperty(this, "handleRequestApi", async (req, res, next) => {

package/dist/Servers/ProdServer.js

@@ -4,23 +4,23 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import express from 'express';
 import { join } from 'path';
 import { existsSync } from 'fs';
-import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
-import { rootToHtml as renderRootToHtml } from "../render/rootToHtml.js";
-import { contentToHtml as renderContentToHtml } from "../render/contentToHtml.js";
-import { Instance } from "../Instance/Instance.js";
-import { cliOut, cliWarn, cliLog, cliNews, cliDebug } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import { TungstenError } from "../TungstenError.js";
-import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
+import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder, frameworkCssFolder } from '../settings.js';
+import { rootToHtml as renderRootToHtml } from '../render/rootToHtml.js';
+import { contentToHtml as renderContentToHtml } from '../render/contentToHtml.js';
+import { Instance } from '../Instance/Instance.js';
+import { cliOut, cliWarn, cliLog, cliNews, cliDebug } from '../cliOutput.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { TungstenError } from '../TungstenError.js';
+import { makeInstanceConfigFromFrameworkConfig } from '../makeInstanceConfigFromFrameworkConfig.js';
 //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
-import { standardizeWebPath } from "../standardizeWebPath.js";
-import { throwError } from "../throwError.js";
-import { serveStatic } from "./serveStatic.js";
+import { standardizeWebPath } from '../standardizeWebPath.js';
+import { throwError } from '../throwError.js';
+import { serveStatic } from './serveStatic.js';
 import { routing } from "./routing.js";
-import { globalDataFunc } from "../routing/registerGlobalData.js";
+import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { TungstenServer } from "./TungstenServer.js";
-import { portError } from "./portError.js";
-import { initStores } from "./initStores.js";
-import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
+import { portError } from './portError.js';
+import { initStores } from './initStores.js';
+import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
 function debug(...texts) {
   // console.log(...texts)
 }
@@ -352,7 +352,7 @@ export class ProdServer extends TungstenServer {
       //const port = (portOverride !== undefined) ? portOverride : port
       // eslint-disable-next-line no-console
       this.server = this.app.listen(port, () => {
-        const serverAddress = this.server.address(); // eslint-disable-line @typescript-eslint/no-non-null-assertion, no-type-assertion/no-type-assertion
+        const serverAddress = this.server.address(); // eslint-disable-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unsafe-type-assertion
         this.location = `${proto}://${host}:${serverAddress.port}`;
         if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${this.location}`);
         resolve(this.location);

package/dist/Servers/StaticSiteServer.js

@@ -2,10 +2,10 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import express from 'express';
-import { serveStatic } from "./serveStatic.js";
+import { serveStatic } from './serveStatic.js';
 import { join } from 'path';
-import { staticSiteFolder } from "../settings.js";
-import { cliNews } from "../cliOutput.js";
+import { staticSiteFolder } from '../settings.js';
+import { cliNews } from '../cliOutput.js';
 export class StaticSiteServer {
   // to do
   constructor(config) {
@@ -19,7 +19,7 @@ export class StaticSiteServer {
       return new Promise(resolve => {
         const staticSiteServer = this; // eslint-disable-line @typescript-eslint/no-this-alias
         this.server = this.app.listen(0, function () {
-          const port = this.address().port; // eslint-disable-line no-type-assertion/no-type-assertion
+          const port = this.address().port; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
           const location = staticSiteServer.location = `http://localhost:${port}${staticSiteServer.config.siteBasePath}`;
           cliNews(`Static preview ready at ${location}`);
           resolve(location);

package/dist/Servers/TungstenServer.js

@@ -1,10 +1,10 @@
-import { ContentNodeIsClassComponent } from "../ContentNode.js";
-import { RoutingRedirect } from "../routing/RoutingRedirect.js";
-import { cliTodo } from "../cliOutput.js";
+import { ContentNodeIsClassComponent } from '../ContentNode.js';
+import { RoutingRedirect } from '../routing/RoutingRedirect.js';
+import { cliTodo } from '../cliOutput.js';
 import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
 import { WebRedirectComponent } from "../components/WebRedirectComponent.js";
-import { $props, $type } from "../contentNodeSymbols.js";
-import { WebRedirect } from "../routing/WebRedirect.js";
+import { $props, $type } from '../contentNodeSymbols.js';
+import { WebRedirect } from '../routing/WebRedirect.js';
 function debug(...texts) {
   // console.log(...texts)
 }

package/dist/Servers/devErrorPageAutoRetry.js

@@ -8,7 +8,7 @@
 // still, in fact, a self-resolving situation. If the error that reached the error page still
 // looks like that same transient shape, embed a tiny script that auto-reloads a few times before
 // giving up - capped via sessionStorage so a genuine, permanent error doesn't loop forever.
-import { isTransientDevModuleError } from "../importDevModuleWithRetry.js";
+import { isTransientDevModuleError } from '../importDevModuleWithRetry.js';
 const sessionStorageKey = 'tungstenDevErrorRetryCount';
 export const maxAutoRetryAttempts = 8;
 const retryDelayMs = 500;

package/dist/Servers/initStores.js

@@ -1,6 +1,6 @@
-import { InternalStoreSchema } from "../Store/InternalStoreSchema.js";
-import { makeStore } from "../Store/makeStore.js";
-import { createStores } from "../Store/createStores.js";
+import { InternalStoreSchema } from '../Store/InternalStoreSchema.js';
+import { makeStore } from '../Store/makeStore.js';
+import { createStores } from '../Store/createStores.js';
 export function initStores(location, reqResOrNull, globalData, matchedRouteInfo, serverDataLoading = null) {
   const storeSubscriptions = new Map();
   const internalStoreSubscribedElements = new Map();

package/dist/Servers/loadEnvsDev.d.ts

@@ -3,6 +3,6 @@ type ProcessEnv = {
     [x: string]: string | undefined;
     TZ?: string;
 };
-export declare function loadEnvsDev(config: FrameworkConfigComplete, iteration: number, initialProcessEnv: ProcessEnv, _firstLoad: boolean, useTestEnvFiles?: boolean): Promise<void>;
+export declare function loadEnvsDev(config: FrameworkConfigComplete, iteration: number, initialProcessEnv: ProcessEnv, _firstLoad: boolean, useTestEnvFiles?: boolean, buildCodeFolder?: string): Promise<void>;
 export {};
 //# sourceMappingURL=loadEnvsDev.d.ts.map

package/dist/Servers/loadEnvsDev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAUpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,iBA8H1B"}
+{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAUpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,EAEvB,eAAe,CAAC,EAAE,MAAM,iBA8H3B"}

package/dist/Servers/loadEnvsDev.js

@@ -1,23 +1,25 @@
 import { join } from 'path';
 import { readFile as readFilePromise, access as accessPromise } from 'fs/promises';
 import { remap as objectRemap, filter as objectFilter } from 'sxy-lib/objects.js';
-import { getEnvSchemasDev } from "../env/getEnvSchemas.js";
+import { getEnvSchemasDev } from '../env/getEnvSchemas.js';
 import dotenv from 'dotenv';
-import { cliLog, cliOut } from "../cliOutput.js";
-import { addToEnv } from "../env/addToEnv.js";
+import { cliLog, cliOut } from '../cliOutput.js';
+import { addToEnv } from '../env/addToEnv.js';
 import { throwError } from 'tungsten/throwError.js';
-import { tungstenCorePrivateEnvSchema } from "./tungstenCorePrivateEnvSchema.js";
-import { tungstenCorePublicEnvSchema } from "./tungstenCorePublicEnvSchema.js";
-import { checkIsObject, validate } from "../standardSchema.js";
+import { tungstenCorePrivateEnvSchema } from './tungstenCorePrivateEnvSchema.js';
+import { tungstenCorePublicEnvSchema } from './tungstenCorePublicEnvSchema.js';
+import { checkIsObject, validate } from '../standardSchema.js';
 export async function loadEnvsDev(config,
 //load: Load,
-iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
+iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false,
+// where the compiled env schemas module is, when not the dev build (a test run's own compile)
+buildCodeFolder) {
   //console.log('loadEnvsDev')
   const tempEnv = {
     ...initialProcessEnv
   };
   // const envSchemas = await getEnvSchemasDev(config, load)
-  const envSchemas = await getEnvSchemasDev(config, iteration);
+  const envSchemas = await getEnvSchemasDev(config, iteration, buildCodeFolder);
   const projectDir = process.cwd();
   const envLocation = join(projectDir, '.env');
   const privateEnvLocation = join(projectDir, '.env.private');

package/dist/Servers/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAIjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA+D9B"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAIjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA+D9B"}

package/dist/Servers/routing.js

@@ -1,7 +1,7 @@
 import { Default404 } from "../routing/Default404.js";
-import { matchPath } from "../routing/matchPath.js";
-import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
-import { jsx as _jsx } from "tungsten/jsxRuntime.js";
+import { matchPath } from '../routing/matchPath.js';
+import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
+import { jsx as _jsx } from "tungsten/jsx-runtime";
 export async function routing(location, routes, serverDataLoading = null) {
   let defaultRoute, _404Route, errorRoute;
   // try the current path against each defined route
@@ -9,7 +9,7 @@ export async function routing(location, routes, serverDataLoading = null) {
   // this is assuming an array
   // should check whether we have an array, fragment, or single element instead
   for (const [_path, route] of Object.entries(routes)) {
-    const path = _path; // eslint-disable-line no-type-assertion/no-type-assertion -- TS fails to infer type of path correctly
+    const path = _path; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- TS fails to infer type of path correctly
     if (path === 'default') {
       defaultRoute = route;
       continue;

package/dist/Store/Store.js

@@ -226,7 +226,7 @@ export class Store {
         if (IsObject(o)) {
             throw new TungstenError(`Store.increment() error: data for ${key} is not an object. Is type ${typeof o} instead`)
         }
-        Object.assign(this.data[key] as GenericObject, object) // eslint-disable-line no-type-assertion/no-type-assertion -- TS won't let me typecheck within this.data
+        Object.assign(this.data[key] as GenericObject, object) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- TS won't let me typecheck within this.data
         this.push(key)
     }
     push(key: string) {

package/dist/Store/TypeSafeStore.js

@@ -229,7 +229,7 @@ export class TypeSafeStore<Schema extends object> {
         if (IsObject(o)) {
             throw new TungstenError(`Store.increment() error: data for ${key} is not an object. Is type ${typeof o} instead`)
         }
-        Object.assign(this.data[key] as GenericObject, object) // eslint-disable-line no-type-assertion/no-type-assertion -- TS won't let me typecheck within this.data
+        Object.assign(this.data[key] as GenericObject, object) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- TS won't let me typecheck within this.data
         this.push(key)
     }
     push(key: string) {

package/dist/Store/createStores.js

@@ -1,5 +1,5 @@
-import { makeStore } from "./makeStore.js";
-import { storeSchemas } from "./storeCreators.js";
+import { makeStore } from './makeStore.js';
+import { storeSchemas } from './storeCreators.js';
 export function createStores(reqRes, matchedRouteInfo, globalData, storeSubscriptionsMap, serverDataLoading = null) {
   const stores = storeSchemas.map(Schema => {
     const subscribedElements = new Map();

package/dist/Store/makeStore.js

@@ -6,8 +6,8 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-import { objectMap } from "../objectMap.js";
-import { isBrowser } from "../isBrowser.js";
+import { objectMap } from '../objectMap.js';
+import { isBrowser } from '../isBrowser.js';
 var _key = /*#__PURE__*/new WeakMap();
 var _value = /*#__PURE__*/new WeakMap();
 var _subscribedElements = /*#__PURE__*/new WeakMap();
@@ -119,5 +119,5 @@ export class StoreValue {
 export function makeStore(schema, subscribedElements, serverDataLoading = null) {
   //const Class = (isServer) ? StoreValueServer : StoreValue
   const store = objectMap(schema, (key, value) => serverDataLoading ? new StoreValueServer(key, value, subscribedElements, serverDataLoading) : new StoreValue(key, value, subscribedElements));
-  return store; // eslint-disable-line no-type-assertion/no-type-assertion -- not sure, just want to get rid of squigglies
+  return store; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- not sure, just want to get rid of squigglies
 }

package/dist/Store/registerStore.js

@@ -1,12 +1,12 @@
-import { storeSchemas } from "./storeCreators.js";
-import { Instance } from "../Instance/Instance.js";
+import { storeSchemas } from './storeCreators.js';
+import { Instance } from '../Instance/Instance.js';
 export function registerStore(StoreSchema) {
   //console.log('registering store', StoreSchema.name)
   const position = 0;
   storeSchemas[0] = StoreSchema;
   return {
     getComponentStore: element => {
-      const store = element.__instance.stores[position]; // eslint-disable-line no-type-assertion/no-type-assertion -- we set this schema above
+      const store = element.__instance.stores[position]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- we set this schema above
       const proxiedStore = element.__proxyStore(store);
       return proxiedStore;
     },

package/dist/TElement.js

@@ -17,7 +17,7 @@ export {};
 //         this.parentProxy = new Proxy(parent, {
 //             get: function(obj: AnyComponent, key: string | symbol) {
 //                 global.__T_CurrentElement = this
-//                 return (obj as AnyComponent & Record<string | symbol, unknown>)[key] // eslint-disable-line no-type-assertion/no-type-assertion -- TS being difficult, whatcha gonna do?
+//                 return (obj as AnyComponent & Record<string | symbol, unknown>)[key] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- TS being difficult, whatcha gonna do?
 //             },
 //         })
 //         this.type = type

package/dist/TungstenApp.js

@@ -2,9 +2,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /// WIP
-import { cliLog } from "./cliOutput.js";
-import { Framework } from "./Framework.js";
-import { throwError } from "./throwError.js";
+import { cliLog } from './cliOutput.js';
+import { Framework } from './Framework.js';
+import { throwError } from './throwError.js';
 export class TungstenApp {
   constructor(options) {
     _defineProperty(this, "rootComponent", void 0);
@@ -29,8 +29,12 @@ export class TungstenApp {
       if (dev) cliLog('Starting Tungsten in Development mode');else cliLog('Starting Tungsten in Production mode');
       if (this.rootComponent === undefined) throwError('TungstenApp', 'No root component set.' + ' You must set a root component in the option objects of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setRootComponent()');
       if (this.appRoutes === undefined) throwError('TungstenApp', 'No routes set.' + ' You must set your application routes in the options object of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setRoutes()');
-      if (this.rootComponent === undefined) throwError('TungstenApp', 'No Private Env Validator set.' + ' You must set a private env validator in the options object of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setPrivateEnvValidator()');
-      if (this.rootComponent === undefined) throwError('TungstenApp', 'No Public Env Validator set.' + ' You must set a public env validator in the options object of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setPublicEnvValidator()');
+      if (this.privateEnvValidator === undefined) throwError(
+      // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- validator types are `never` placeholders for now
+      'TungstenApp', 'No Private Env Validator set.' + ' You must set a private env validator in the options object of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setPrivateEnvValidator()');
+      if (this.publicEnvValidator === undefined) throwError(
+      // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- as above
+      'TungstenApp', 'No Public Env Validator set.' + ' You must set a public env validator in the options object of the TungstenApp constructor, ' + ' or by calling set tungstenApp.setPublicEnvValidator()');
       // start stuff
       const framework = new Framework();
       await framework.init();

package/dist/TungstenStyleObject.js

@@ -1 +1 @@
-export { CssNames as TungstenStyleObject } from "./CssNames.js";
+export { CssNames as TungstenStyleObject } from './CssNames.js';

package/dist/__deproxy.js

@@ -1,5 +1,5 @@
-import { $original } from "./componentProxyHandlers.js";
-import { NoDeproxy } from "./NoDeproxy.js";
+import { $original } from './componentProxyHandlers.js';
+import { NoDeproxy } from './NoDeproxy.js';
 // doesn't this need to be deep?
 export function __deproxy(possibleProxy) {
   console.log('__deproxy called, this function may not be adequate');

package/dist/_client/client.js

@@ -1,7 +1,7 @@
 //import { helpers } from './cjsHelpers.js'
 import { hydrate } from 'tungsten';
 // @ts-ignore -- ignore module not found, will be generated later
-import instanceConfig from "../.tungsten.config.js";
+import instanceConfig from '../.tungsten.config.js';
 // wrap the async code in an async IIFE to help rollup
 const clientPromise = (async () => {
   //const isProd = window.__tungsten_prod__ = appConfig.prod
@@ -11,11 +11,11 @@ const clientPromise = (async () => {
   // is this causing a slowdown?
   // need to change this to static imports via build steps
   let routes;
-  const promises = [import("./routes.js").then(mod => routes = mod.routes)];
+  const promises = [import('./routes.js').then(mod => routes = mod.routes)];
   let RootComponent = null;
   if (instanceConfig.useRootComponent) {
     // rollup is failing to handle this when useRootComponent is false
-    promises.push(import("./RootComponent.js").then(({
+    promises.push(import('./RootComponent.js').then(({
       module,
       filename
     }) => RootComponent = 'default' in module ? module.default : module[filename]) // could probably do with better error handling/reporting

package/dist/alive.js

@@ -1,4 +1,4 @@
-import { NoDeproxy } from "./NoDeproxy.js";
+import { NoDeproxy } from './NoDeproxy.js';
 export function alive(v) {
   return new NoDeproxy(v);
 }

package/dist/api/getApiRoutes.js

@@ -1,7 +1,7 @@
 import { join } from 'path';
-import { TungstenError } from "../TungstenError.js";
-import { getExportDev } from "./getExportDev.js";
-import { getExport } from "./getExport.js";
+import { TungstenError } from '../TungstenError.js';
+import { getExportDev } from './getExportDev.js';
+import { getExport } from './getExport.js';
 export async function getApiRoutes(config, compilationInfo, mode) {
   if (typeof config.apiRoutes !== 'string') {
     throw new TungstenError(`getApiRoutes() error - config.apiRoutes is not valid`);

package/dist/api/getExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQjC,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,IAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAuBpG"}
+{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQjC,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,IAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAuBpG"}

package/dist/api/getExport.js

@@ -1,8 +1,9 @@
+// old loading method
 import { basename } from 'path';
-import { fixExtension } from "../fixExtension.js";
-import { TungstenError } from "../TungstenError.js";
-import { iterationQueryString } from "../iterationQueryString.js";
-import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
+import { fixExtension } from '../fixExtension.js';
+import { TungstenError } from '../TungstenError.js';
+import { iterationQueryString } from '../iterationQueryString.js';
+import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
 //let load //// !! future improvement
 let exportIteration = 0;
 export async function getExport(filePath, relFile, mode = 'prod') {

package/dist/api/getExportDev.js

@@ -1,4 +1,4 @@
-import { getExport } from "./getExport.js";
+import { getExport } from './getExport.js';
 export function getExportDev(filePathFull, relFile) {
   return getExport(filePathFull, relFile, 'dev');
 }

package/dist/appOutput.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { isClient } from "./isClient.js";
+import { isClient } from './isClient.js';
 export function log(...texts) {
   console.log(...texts);
 }

package/dist/auth/index.js

@@ -1,2 +1,2 @@
-export * from "./hashPassword.js";
-export * from "./checkPassword.js";
+export * from './hashPassword.js';
+export * from './checkPassword.js';

package/dist/babelPlugins/BabelAddDevCacheBust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelAddDevCacheBust.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelAddDevCacheBust.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAuBnG,wBAAgB,wBAAwB;;eAKjB,SAAS;;gCAKQ,QAAQ,CAAC,iBAAiB,CAAC;qCAItB,QAAQ,CAAC,sBAAsB,CAAC;mCAIlC,QAAQ,CAAC,oBAAoB,CAAC;;EAOxE"}
+{"version":3,"file":"BabelAddDevCacheBust.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelAddDevCacheBust.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AA2BnG,wBAAgB,wBAAwB;;eAKjB,SAAS;;gCAKQ,QAAQ,CAAC,iBAAiB,CAAC;qCAItB,QAAQ,CAAC,sBAAsB,CAAC;mCAIlC,QAAQ,CAAC,oBAAoB,CAAC;;EAOxE"}

package/dist/babelPlugins/BabelAddDevCacheBust.js

@@ -1,5 +1,5 @@
 // RS: this is unsuitable for test
-// and dubious during dev. Removing it for now
+// and dubious during dev. Removing it from test for now
 // will have to revisit HMR
 // BabelAddDevCacheBust
 // exports MakeBabelAddDevCacheBust (function)
@@ -29,9 +29,11 @@
 // plugins actually end up running in.
 import { dirname, join } from 'path';
 import fs from 'fs';
+// a `.js` specifier names the compiled file; on disk in codeLocation it may be .js, .jsx, or with
+// typescript: true, .ts/.tsx
 function resolveOnDiskMtime(fromDir, specifier) {
   if (!specifier.startsWith('.')) return undefined;
-  const candidates = specifier.endsWith('.jsx') ? [specifier, specifier.slice(0, -1)] : specifier.endsWith('.js') ? [specifier, `${specifier.slice(0, -3)}.jsx`] : [];
+  const candidates = specifier.endsWith('.jsx') ? [specifier, specifier.slice(0, -1)] : specifier.endsWith('.js') ? ['.js', '.jsx', '.ts', '.tsx'].map(extension => `${specifier.slice(0, -3)}${extension}`) : specifier.endsWith('.ts') || specifier.endsWith('.tsx') ? [specifier] : [];
   for (const candidate of candidates) {
     const abs = join(fromDir, candidate);
     if (fs.existsSync(abs)) return fs.statSync(abs).mtimeMs;