tungsten 0.1.71 → 0.1.73

package/dist/Framework.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Framework.d.ts","sourceRoot":"","sources":["../src/Framework.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAA+B,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AA4BxD,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,uBAAuB,CAAA;IAChC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAA;IACnC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,UAAU,CAAA;IAEjB,IAAI,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAOxC,KAAK,CAAC,IAAI,EAAE,IAAI;IAmBhB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY;IAwBhC,SAAS;YAID,aAAa;YAab,cAAc;YASd,mBAAmB;YAcnB,MAAM;IAKd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IAuBrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAuH7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CAyDhD"}
+{"version":3,"file":"Framework.d.ts","sourceRoot":"","sources":["../src/Framework.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAA+B,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AA4BxD,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,uBAAuB,CAAA;IAChC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAA;IACnC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,UAAU,CAAA;IAEjB,IAAI,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAQxC,KAAK,CAAC,IAAI,EAAE,IAAI;IAmBhB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY;IAwBhC,SAAS;YAID,aAAa;YAab,cAAc;YASd,mBAAmB;YAcnB,MAAM;IAKd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAwH7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CAyDhD"}

package/dist/Framework.js

@@ -21,8 +21,6 @@ import { throwError } from "./throwError.js";
 //import { devBundle } from './build/devBundle.jsx'
 import { existsSync, readFileSync, openSync, closeSync, writeFileSync, copyFileSync } from 'fs';
 import { parseIni } from "./parseIni.js";
-import sxyLoaderConfig from "../sxy-loader.config.js";
-import { createLoad } from 'sxy-loader';
 import { getEnvSchemas } from "./env/getEnvSchemas.js";
 import { injectEnv } from "./env/injectEnv.js";
 //import { ValueOf } from 'sxy-lib'
@@ -42,11 +40,12 @@ export class Framework {
     _defineProperty(this, "prodServer", void 0);
   }
   async init() {
-    const configOrUndefined = await this.getUserConfig();
-    if (configOrUndefined === undefined) {
-      throwError('Framework.init()', 'config is undefined');
-    }
-    return configOrUndefined;
+    // const configOrUndefined = await this.getUserConfig()
+    // if (configOrUndefined === undefined) {
+    //     throwError('Framework.init()', 'config is undefined')
+    // }
+    // return configOrUndefined
+    return this.getUserConfig();
   }
   async build(mode) {
     if (mode === 'dev') {
@@ -140,8 +139,10 @@ export class Framework {
     const initialProcessEnv = {
       ...process.env
     };
-    const load = await createLoad(import.meta.url, sxyLoaderConfig);
-    await loadEnvsDev(this.config, load, initialProcessEnv, false);
+    //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+    // !REVIEW! why do we need to load envs here?
+    //await loadEnvsDev(this.config, load, initialProcessEnv, false)
+    await loadEnvsDev(this.config, -1, initialProcessEnv, false);
     this.devServer = new DevServer(this, this.config, this.compilationInfo);
     return this.devServer;
   }
@@ -163,7 +164,7 @@ export class Framework {
     global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
     // Load schemas
     const envSchemas = await getEnvSchemas(config);
-    let someEnvLoaded = false;
+    let someEnvLoaded = false; // eslint-disable-line no-type-assertion/no-type-assertion -- widening
     //const envsLoadedMessages: string[] = []
     function loadEnv(fileName, filePath, prefix = '') {
       const env = parseIni(readFileSync(filePath, 'utf-8'));

package/dist/Instance/Instance.d.ts

@@ -8,6 +8,7 @@ import { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
 import { type RouteKey } from '../routing/RouteTypes.js';
 import type { Routes } from '../routing/Routes.js';
 import { StoreSubscriptionsMap } from 'tungsten/Store/StoreSubscriptions.types.js';
+import { RedirectCode } from '../routing/RedirectCode.js';
 export declare class Instance {
     location: string;
     reqRes: ReqRes | null;
@@ -30,7 +31,8 @@ export declare class Instance {
     constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes, routes: Routes, internalStore: TrueStore<InternalStoreSchema>, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: GlobalData, matchedRouteInfo: MatchedRouteInfo);
     getRoutes: () => Routes;
     updateLocation: (location: string) => void;
-    goto: (location: RouteKey) => Promise<void>;
+    goto: (routeKey: RouteKey) => Promise<void>;
+    redirect: (url: string, code?: RedirectCode) => void;
     setDefaultTitle: (defaultTitle: string) => void;
     setTitle: (title: string) => void;
     setTitleToDefault: () => void;

package/dist/Instance/Instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAOlF,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,GAAI,UAAU,MAAM,UAMjC;IACD,IAAI,GAAU,UAAU,QAAQ,mBA0C/B;IASD,eAAe,GAAI,cAAc,MAAM,UAEtC;IACD,QAAQ,GAAI,OAAO,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAKlF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAKzD,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,GAAI,UAAU,MAAM,UAMjC;IACD,IAAI,GAAU,UAAU,QAAQ,mBA6D/B;IASD,QAAQ,GAAI,KAAK,MAAM,EAAE,OAAM,YAAkB,UAQhD;IACD,eAAe,GAAI,cAAc,MAAM,UAEtC;IACD,QAAQ,GAAI,OAAO,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}

package/dist/Instance/Instance.js

@@ -8,7 +8,11 @@ import { throwError } from "../throwError.js";
 import { StringIsValidRouteKey } from "../routing/RouteTypes.js";
 import { isProd } from "../isProd.js";
 import { WebRedirect } from "../routing/WebRedirect.js";
-import { RedirectComponent } from "../components/RedirectComponent.js";
+import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
+import { WebRedirectComponent } from "../components/WebRedirectComponent.js";
+import { isServer } from "../isServer.js";
+import { ContentNodeIsClassComponent } from "../ContentNode.js";
+import { $props, $type } from "../contentNodeSymbols.js";
 export class Instance {
   constructor(_location, instanceConfig, reqRes, appRoutes, routes,
   //globalData: GlobalData,
@@ -45,10 +49,10 @@ export class Instance {
       this.location = location;
       this.internalStore.location.set(location);
     });
-    _defineProperty(this, "goto", async location => {
+    _defineProperty(this, "goto", async routeKey => {
       // get route data
       this.navigating = true;
-      const matchedRouteInfo = await routing(location, this.getRoutes());
+      const matchedRouteInfo = await routing(routeKey, this.getRoutes());
       //console.log('matchedRouteInfo', location, matchedRouteInfo)
       //console.log('matched route info', this.matchedRouteInfo)
       // data here is the result of the route data function
@@ -58,27 +62,37 @@ export class Instance {
         return;
       } else if (matchedRouteInfo.data instanceof WebRedirect) {
         throwError('Instance.goto', 'WebRedirect not yet implemented');
+        this.redirect;
         //const redirect = matchedRouteInfo.data
         //this.goto(redirect.to)
         //return
       }
       // handle Redirect components
-      if (matchedRouteInfo.content instanceof RedirectComponent
-      //&& matchedRouteInfo.content.__tungstenComponentType === 'redirect'
-      ) {
-        this.goto(matchedRouteInfo.content.props.to);
-        return;
+      // if (
+      //     matchedRouteInfo.content instanceof RedirectComponent
+      //     //&& matchedRouteInfo.content.__tungstenComponentType === 'redirect'
+      // ) {
+      if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
+        if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
+          this.goto(matchedRouteInfo.content[$props].to);
+          return;
+        } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
+          console.log('Content is a WebRedirectComponent - perform a hard redirect');
+          this.redirect(matchedRouteInfo.content[$props].to);
+          return;
+        }
       }
+      console.log('updating route info to', matchedRouteInfo);
       //console.log('instance goto')
       //console.log('siteBasePath', this.config.siteBasePath) 
       //console.log('location', location) 
       //console.log('final dest', this.config.siteBasePath + location)
       this.matchedRouteInfo = matchedRouteInfo;
       const publicUrl = isProd && this.config.staticSite === true // add .html suffix for static sites
-      ? location === '/' ? '/' : location + '.html' : location;
+      ? routeKey === '/' ? '/' : routeKey + '.html' : routeKey;
       if (isClient) window.history.pushState(null, '', this.config.siteBasePath + publicUrl);
       this.setTitleToDefault();
-      this.updateLocation(location); // this.internalStore.set('location', to)
+      this.updateLocation(routeKey); // this.internalStore.set('location', to)
       //this.finishedNavigating()
     });
     // postNavigationQueue: (() => void)[] = []
@@ -89,6 +103,15 @@ export class Instance {
     //         func()
     //     }
     // }
+    _defineProperty(this, "redirect", (url, code = 302) => {
+      if (this.reqRes) {
+        console.assert(isServer, 'reqRes is set, expected isServer to be truth');
+        this.reqRes.res.redirect(code, url);
+      } else {
+        console.assert(isClient, 'reqRes is not set, expected isClient to be truthy');
+        window.location.replace(url);
+      }
+    });
     _defineProperty(this, "setDefaultTitle", defaultTitle => {
       this.defaultTitle = defaultTitle;
     });

package/dist/Servers/DevServer.d.ts

@@ -1,5 +1,6 @@
 import type { Server } from 'http';
 import express from 'express';
+import 'esm-reload';
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { CompilationInfo } from '../build/CompilationInfo.js';
 import type { ApiRoutes } from '../api/ApiRoutes.js';
@@ -20,6 +21,8 @@ export declare class DevServer extends TungstenServer {
     server?: Server;
     reqId: number;
     firstRender: boolean;
+    iterationCount: number;
+    serverIterationCount: number;
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, initialProcessEnv?: Record<string, string>);
     private addServerMiddleware;
     private handleRequestApi;

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;AAGlF,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;AAOpD,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;gBAEvB,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAmHlD,OAAO,CAAC,mBAAmB,CAoE1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAkMpB;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAehD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAEH;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;AAElF,OAAO,YAAY,CAAA;AAEnB,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;AAiBrD,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;gBAE5B,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAqHlD,OAAO,CAAC,mBAAmB,CAuE1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAwMpB;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAehD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAEH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -3,6 +3,7 @@ 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 } from 'path';
+import 'esm-reload'; // V important ES module cache control
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
 import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder } from "../settings.js";
 import { rootToHtmlDev as renderRootToHtmlDev } from "../render/rootToHtmlDev.js";
@@ -17,8 +18,6 @@ import { log } from "../appOutput.js";
 import { throwError } from "../throwError.js";
 import { getRoutesDev } from "../getRoutesDevs.js";
 import { getComponentDev } from "../getComponentDev.js";
-import sxyLoaderConfig from "../../sxy-loader.config.js";
-import { createLoad } from 'sxy-loader';
 import { routing } from "./routing.js";
 import { globalDataFunc } from "../routing/registerGlobalData.js";
 import { TungstenServer } from "./TungstenServer.js";
@@ -26,6 +25,7 @@ import { portError } from "./portError.js";
 import { loadEnvsDev } from "./loadEnvsDev.js";
 import { initStores } from "./initStores.js";
 import { MatchedRoute } from "../routing/MatchedRoute.js";
+import { iterationQueryString } from "../iterationQueryString.js";
 //import cookieParser from 'cookie-parser'
 function debug(...texts) {
   // console.log(...texts)
@@ -46,6 +46,8 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "server", void 0);
     _defineProperty(this, "reqId", void 0);
     _defineProperty(this, "firstRender", true);
+    _defineProperty(this, "iterationCount", 0);
+    _defineProperty(this, "serverIterationCount", 0);
     _defineProperty(this, "addServerMiddleware", serverMiddleware => {
       //console.log('addServerMiddleware')
       const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
@@ -75,14 +77,17 @@ export class DevServer extends TungstenServer {
         // code
         // [*] const middlewares = await middlewaresPromise
         try {
-          const load = await createLoad(import.meta.url, sxyLoaderConfig);
+          //const load = await createLoad(import.meta.url, sxyLoaderConfig)
           const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
-          const middlewareModule = await load(fullFilePath);
+          //const middlewareModule = await load(fullFilePath)
+          const middlewareModule = await import(iterationQueryString(fullFilePath, this.serverIterationCount++));
           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
-          if (!Array.isArray(middlewares)) throwError('addServerMiddleware', `Expected middlewares to be an array`);
+          if (!Array.isArray(middlewares)) {
+            throwError('addServerMiddleware', `Expected middlewares to be an array`);
+          }
           if (!(0 in middlewares)) throwError('addServerMiddleware', `No middleware entry at index 0`);
           const firstMiddleware = middlewares[0];
           if (!(typeof firstMiddleware === 'function')) {
@@ -137,6 +142,7 @@ export class DevServer extends TungstenServer {
       try {
         const _firstRender = this.firstRender;
         this.firstRender = false;
+        const iteration = this.iterationCount++;
         //console.log('received a frontend req', req.originalUrl, res.locals.reqId)
         //// I think we need to pass req, (res?) to the app
         //// so that it can set response codes
@@ -154,8 +160,9 @@ export class DevServer extends TungstenServer {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
         globalDataFunc.value = undefined;
-        const load = await createLoad(import.meta.url, sxyLoaderConfig);
-        await loadEnvsDev(this.config, load, this.initialProcessEnv, false);
+        //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+        //await loadEnvsDev(this.config, load, this.initialProcessEnv, false)
+        await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
         // we are delaying instance creation until after we load the app code, to lets things initialise?
         const reqRes = {
           req,
@@ -165,7 +172,8 @@ export class DevServer extends TungstenServer {
         const serverDataLoading = {
           value: false
         };
-        const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(async appRoutes => {
+        //const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(
+        const routingPromise = getRoutesDev(this.compilationInfo, this.config, iteration).then(async appRoutes => {
           const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
           // load data, and do routing
           return promiseAllObj({
@@ -215,7 +223,8 @@ export class DevServer extends TungstenServer {
             RootComponentClass
           } = await promiseAllObj({
             routing: routingPromise,
-            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+            //RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration)
           })
           // .catch(e => {
           //     cliError('ROUTING AND ROOT ERR')
@@ -359,14 +368,16 @@ export class DevServer extends TungstenServer {
         const targetOrigin = req.protocol + '://' + String(req.header('host'));
         const target = targetOrigin + req.url;
         const origin = req.header('origin');
-        // request log
-        let message = 'Received request at ' + target;
-        if (origin !== undefined) {
-          message += ' from ' + String(req.header('origin'));
-          // should we use referrer as a backup option?
-          // not sure what that is
+        if (tungstenPrivateEnv.DEBUG === true) {
+          // request log
+          let message = 'Received request at ' + target;
+          if (origin !== undefined) {
+            message += ' from ' + String(req.header('origin'));
+            // should we use referrer as a backup option?
+            // not sure what that is
+          }
+          cliOut(message);
         }
-        cliOut(message);
         if (this.config.suppressOriginMismatchWarning !== true) {
           // origin-target mismatch warning
           if (origin !== undefined && origin === this.location && origin !== targetOrigin) {

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

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,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;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAWrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAuH7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA6GjF;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE,IAAI;CAKP"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,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;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AASrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAuH7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA6GjF;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE,IAAI;CAKP"}

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

@@ -1 +1 @@
-{"version":3,"file":"TungstenServer.d.ts","sourceRoot":"","sources":["../../src/Servers/TungstenServer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAgB1D,qBAAa,cAAc;IACvB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAyC/F"}
+{"version":3,"file":"TungstenServer.d.ts","sourceRoot":"","sources":["../../src/Servers/TungstenServer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB1D,qBAAa,cAAc;IACvB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAoD/F"}

package/dist/Servers/TungstenServer.js

@@ -1,7 +1,8 @@
 import { ContentNodeIsClassComponent } from "../ContentNode.js";
 import { RoutingRedirect } from "../routing/RoutingRedirect.js";
 import { cliTodo } from "../cliOutput.js";
-import { RedirectComponent } from "../components/RedirectComponent.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";
 function debug(...texts) {
@@ -28,12 +29,20 @@ export class TungstenServer {
     // console.log('$type', (matchedRouteInfo as any).content[$type])
     //console.log('content[$type]', matchedRouteInfo.content[$type])
     //console.log('instanceof', matchedRouteInfo.content instanceof RedirectComponent)
-    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content) && (matchedRouteInfo.content[$type] === RedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RedirectComponent)) {
-      cliTodo('consider type of RedirectComponent props');
-      const code = matchedRouteInfo.content[$props].code || 302;
-      const to = matchedRouteInfo.content[$props].to;
-      res.redirect(code, to);
-      return true;
+    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
+      if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        res.redirect(code, to);
+        return true;
+      } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        res.redirect(code, to);
+        return true;
+      }
     }
     return false;
   }

package/dist/Servers/hono/TungstenServerHono.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAQ,OAAO,EAAE,MAAM,MAAM,CAAA;AAsBpC,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAyC/F"}
+{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAQ,OAAO,EAAE,MAAM,MAAM,CAAA;AAuBpC,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CA6C/F"}

package/dist/Servers/hono/TungstenServerHono.js

@@ -3,9 +3,10 @@ import { Hono } from 'hono';
 import { ContentNodeIsClassComponent } from "../../ContentNode.js";
 import { RoutingRedirect } from "../../routing/RoutingRedirect.js";
 import { cliTodo } from "../../cliOutput.js";
-import { RedirectComponent } from "../../components/RedirectComponent.js";
+import { RouteRedirectComponent } from "../../components/RouteRedirectComponent.js";
 import { $props, $type } from "../../contentNodeSymbols.js";
 import { WebRedirect } from "../../routing/WebRedirect.js";
+import { throwError } from "../../throwError.js";
 const app = new Hono();
 app.get(async c => {
   const id = c.req.param('id');
@@ -36,12 +37,16 @@ export class TungstenServerHono {
     // console.log('$type', (matchedRouteInfo as any).content[$type])
     //console.log('content[$type]', matchedRouteInfo.content[$type])
     //console.log('instanceof', matchedRouteInfo.content instanceof RedirectComponent)
-    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content) && (matchedRouteInfo.content[$type] === RedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RedirectComponent)) {
-      cliTodo('consider type of RedirectComponent props');
-      const code = matchedRouteInfo.content[$props].code || 302;
-      const to = matchedRouteInfo.content[$props].to;
-      c.redirect(to, code);
-      return true;
+    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
+      if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        c.redirect(to, code);
+        return true;
+      } else {
+        throwError('TungstenServerHono', 'Need to check for WebRedirectComponent here');
+      }
     }
     return false;
   }

package/dist/Servers/initStores.js

@@ -4,7 +4,7 @@ import { createStores } from "../Store/createStores.js";
 export function initStores(location, reqResOrNull, globalData, matchedRouteInfo, serverDataLoading = null) {
   const storeSubscriptions = new Map();
   const internalStoreSubscribedElements = new Map();
-  const internalStore = makeStore(new InternalStoreSchema(location), internalStoreSubscribedElements, serverDataLoading);
+  const internalStore = makeStore(new InternalStoreSchema(location, matchedRouteInfo), internalStoreSubscribedElements, serverDataLoading);
   storeSubscriptions.set(internalStore, internalStoreSubscribedElements);
   const stores = createStores(reqResOrNull, matchedRouteInfo, globalData, storeSubscriptions, serverDataLoading);
   return {

package/dist/Servers/loadEnvsDev.d.ts

@@ -1,9 +1,8 @@
-import type { Load } from 'sxy-loader';
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 type ProcessEnv = {
     [x: string]: string | undefined;
     TZ?: string;
 };
-export declare function loadEnvsDev(config: FrameworkConfigComplete, load: Load, initialProcessEnv: ProcessEnv, _firstLoad: boolean): Promise<void>;
+export declare function loadEnvsDev(config: FrameworkConfigComplete, iteration: number, initialProcessEnv: ProcessEnv, _firstLoad: boolean): 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,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,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,EAC/B,IAAI,EAAE,IAAI,EACV,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,iBAkGtB"}
+{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,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,iBAmGtB"}

package/dist/Servers/loadEnvsDev.js

@@ -7,12 +7,15 @@ import { cliLog, cliOut } from "../cliOutput.js";
 import { injectEnv } from "../env/injectEnv.js";
 import { throwError } from 'tungsten/throwError.js';
 import { tungstenCorePrivateEnvSchema } from "./tungstenCorePrivateEnvSchema.js";
-export async function loadEnvsDev(config, load, initialProcessEnv, _firstLoad) {
+export async function loadEnvsDev(config,
+//load: Load,
+iteration, initialProcessEnv, _firstLoad) {
   //console.log('loadEnvsDev')
   const tempEnv = {
     ...initialProcessEnv
   };
-  const envSchemas = await getEnvSchemasDev(config, load);
+  // const envSchemas = await getEnvSchemasDev(config, load)
+  const envSchemas = await getEnvSchemasDev(config, iteration);
   const projectDir = process.cwd();
   const envLocation = join(projectDir, '.env');
   const privateEnvLocation = join(projectDir, '.env.private');

package/dist/Store/InternalStoreSchema.d.ts

@@ -1,5 +1,7 @@
+import type { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
 export declare class InternalStoreSchema {
     location: string;
-    constructor(location: string);
+    matchedRouteInfo: MatchedRouteInfo;
+    constructor(location: string, matchedRouteInfo: MatchedRouteInfo);
 }
 //# sourceMappingURL=InternalStoreSchema.d.ts.map

package/dist/Store/InternalStoreSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;gBACJ,QAAQ,EAAE,MAAM;CAG/B"}
+{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;gBACtB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE"}

package/dist/Store/InternalStoreSchema.js

@@ -2,8 +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); }
 export class InternalStoreSchema {
-  constructor(location) {
+  constructor(location, matchedRouteInfo) {
     _defineProperty(this, "location", void 0);
+    _defineProperty(this, "matchedRouteInfo", void 0);
     this.location = location;
+    this.matchedRouteInfo = matchedRouteInfo;
   }
 }

package/dist/_client/client.js

@@ -2,7 +2,6 @@
 import { hydrate } from 'tungsten';
 // @ts-ignore -- ignore module not found, will be generated later
 import instanceConfig from "../.tungsten.config.js";
-console.log('app config', instanceConfig);
 // wrap the async code in an async IIFE to help rollup
 const clientPromise = (async () => {
   //const isProd = window.__tungsten_prod__ = appConfig.prod

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

@@ -1 +1 @@
-{"version":3,"file":"getApiRoutes.d.ts","sourceRoot":"","sources":["../../src/api/getApiRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAK5D,wBAAsB,YAAY,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,sBAavG"}
+{"version":3,"file":"getApiRoutes.d.ts","sourceRoot":"","sources":["../../src/api/getApiRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAK5D,wBAAsB,YAAY,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,sBAevG"}

package/dist/api/getApiRoutes.js

@@ -3,7 +3,9 @@ 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`);
+  if (typeof config.apiRoutes !== 'string') {
+    throw new TungstenError(`getApiRoutes() error - config.apiRoutes is not valid`);
+  }
   const apiRoutesFileFull = join(compilationInfo.location, config.apiRoutes);
   //console.log('rootComponentFileFull', 'xxx', 'config.rootComponent', config.rootComponent)
   //console.log('rootComponentFileFull', apiRoutesFileFull, 'config.rootComponent', config.apiRoutes)

package/dist/api/getExport.d.ts

@@ -1,2 +1,3 @@
-export declare function getExport(filePath: string, relFile: string, dev?: boolean): Promise<any>;
+import { Mode } from '../Mode.js';
+export declare function getExport(filePath: string, relFile: string, mode?: Mode): Promise<any>;
 //# sourceMappingURL=getExport.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAUA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAuB5F"}
+{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOjC,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,18 +1,18 @@
-import { createLoad } from 'sxy-loader';
 import { basename } from 'path';
 import { fixExtension } from "../fixExtension.js";
 import { TungstenError } from "../TungstenError.js";
-import sxyLoaderConfig from "../../sxy-loader.config.js";
+import { iterationQueryString } from "../iterationQueryString.js";
 //let load //// !! future improvement
-export async function getExport(filePath, relFile, dev = false) {
+let exportIteration = 0;
+export async function getExport(filePath, relFile, mode = 'prod') {
   const fileName = basename(relFile);
   filePath = 'file://' + fixExtension(filePath);
   //console.log(filePath)
   let module;
-  if (dev) {
+  if (mode === 'dev') {
     //if ( ! load ) load = await createLoad(import.meta.url, sxyLoaderConfig) //// !! future improvement
-    const load = await createLoad(import.meta.url, sxyLoaderConfig);
-    module = await load(filePath);
+    //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+    module = await import(iterationQueryString(filePath, exportIteration++));
   } else {
     module = await import(filePath); // import the module
   }

package/dist/api/getExportDev.js

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

package/dist/babelPlugins/BabelFakeType.d.ts

@@ -0,0 +1,6 @@
+import { parse } from '@babel/core';
+export type BabelFake = {
+    types: any;
+    parse: typeof parse;
+};
+//# sourceMappingURL=BabelFakeType.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BabelFakeType.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelFakeType.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,MAAM,SAAS,GAAG;IACpB,KAAK,EAAE,GAAG,CAAA;IACV,KAAK,EAAE,OAAO,KAAK,CAAA;CACtB,CAAA"}

package/dist/babelPlugins/BabelFakeType.js

@@ -0,0 +1,3 @@
+// //import {  } from '@babel/types/lib/builders/generated/index.js'
+// //import { type } from '@babel/generator'
+export {};

package/dist/babelPlugins/BabelTransformBindDirect.d.ts

@@ -1,6 +1,6 @@
-import type { Babel } from './Babel.type.js';
 import { NodePath, types } from '@babel/core';
-export declare function MakeBabelTransformBindDirect(): (babel: Babel) => {
+import { BabelFake } from './BabelFakeType.js';
+export declare function MakeBabelTransformBindDirect(): (babel: BabelFake) => {
     name: string;
     visitor: {
         JSXAttribute(path: NodePath<types.JSXAttribute>, state: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformBindDirect.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformBindDirect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA2C7C,wBAAgB,4BAA4B,KACC,OAAO,KAAK;;;2BAKtB,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,GAAG;;EAkS1E"}
+{"version":3,"file":"BabelTransformBindDirect.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformBindDirect.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AA0C9C,wBAAgB,4BAA4B,KACC,OAAO,SAAS;;;2BAK1B,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,GAAG;;EAmT1E"}