tungsten 0.1.72 → 0.2.0

package/dist/RenderingNode.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"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"}

package/dist/RenderingNode.js

@@ -1,63 +0,0 @@
-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');
-export const $placeholder = Symbol('placeholder');
-export function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode, element, renderingChildren, placeholder) {
-  const n = {
-    [$type]: contentNode[$type],
-    //[$component]: component,
-    [$props]: {
-      children: renderingChildren
-    }
-  };
-  if (placeholder) n[$placeholder] = placeholder;
-  return n;
-}
-export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, element, renderingChildren, placeholder) {
-  const n = {
-    [$type]: contentNode[$type],
-    //[$component]: component,
-    [$props]: {
-      children: renderingChildren
-    }
-  };
-  if (placeholder) n[$placeholder] = placeholder;
-  return n;
-}
-export function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode, element, renderingChildren) {
-  return {
-    [$type]: $placeholder,
-    [$component]: contentNode[$type],
-    //[$component]: component,
-    [$props]: {
-      children: renderingChildren
-    }
-  };
-}
-export function RenderingNodeIsElement(item) {
-  return typeof item === 'object' && item !== null && !Array.isArray(item);
-}
-export function RenderingNodeIsHtml(item) {
-  return RenderingNodeIsElement(item) && RenderingNodeElementIsHtml(item);
-}
-export function RenderingNodeElementIsHtml(item) {
-  return typeof item[$type] === 'string';
-}
-export function RenderingNodeElementIsComponent(item) {
-  //: item is ContentNodeComponentAny {
-  return typeof item[$type] === 'function';
-}
-// export function RenderingNodeElementIsPlaceholder(item: RenderingNodeElement): item is RenderingNodePlaceholder {
-//     return item[$type] === $placeholder
-// }
-export function RenderingNodeIsLiteral(item) {
-  return ContentNodeIsLiteral(item);
-}
-export function RenderingNodeIsNonRendered(item) {
-  return item === null || item === undefined || typeof item === 'boolean';
-}
-export function RenderingNodeIsRendered(item) {
-  return !RenderingNodeIsNonRendered(item);
-}

package/dist/ReqRes.d.ts

@@ -1,7 +0,0 @@
-import { Request, Response } from 'express';
-export type ReqRes = {
-    req: Request;
-    res: Response;
-};
-export type ReqResOrNull = ReqRes | null;
-//# sourceMappingURL=ReqRes.d.ts.map

package/dist/ReqRes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ReqRes.d.ts","sourceRoot":"","sources":["../src/ReqRes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE3C,MAAM,MAAM,MAAM,GAAG;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,QAAQ,CAAA;CAAE,CAAA;AACpD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,IAAI,CAAA"}

package/dist/ReqRes.js

@@ -1 +0,0 @@
-export {};

package/dist/Sass.d.ts

@@ -1,6 +0,0 @@
-export declare function Sass(styles: string): {
-    classes: undefined;
-    elements: undefined;
-    styles: undefined;
-};
-//# sourceMappingURL=Sass.d.ts.map

package/dist/Sass.d.ts.map

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

package/dist/Sass.js

@@ -1,8 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-export function Sass(styles) {
-  return {
-    'classes': undefined,
-    'elements': undefined,
-    'styles': undefined
-  };
-}

package/dist/Script.d.ts

@@ -1,8 +0,0 @@
-import { TungstenSimpleComponent, TungstenComponentPropsBase } from './Components.jsx';
-export interface ScriptProps extends TungstenComponentPropsBase {
-    children?: string;
-}
-export declare class Script extends TungstenSimpleComponent<ScriptProps> {
-    content: () => import("./ContentNode.js").ContentNode;
-}
-//# sourceMappingURL=Script.d.ts.map

package/dist/Script.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Script.d.ts","sourceRoot":"","sources":["../src/Script.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAEtF,MAAM,WAAW,WAAY,SAAQ,0BAA0B;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,qBAAa,MAAO,SAAQ,uBAAuB,CAAC,WAAW,CAAC;IAC5D,OAAO,+CAEN;CACJ"}

package/dist/Script.js

@@ -1,14 +0,0 @@
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-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";
-export class Script extends TungstenSimpleComponent {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "content", () => _jsx("script", {
-      type: "module",
-      src: this.props.children
-    }));
-  }
-}

package/dist/ServerRpcFunction.type.d.ts

@@ -1,2 +0,0 @@
-export type ServerRpcFunction = (...args: any[]) => Promise<any>;
-//# sourceMappingURL=ServerRpcFunction.type.d.ts.map

package/dist/ServerRpcFunction.type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServerRpcFunction.type.d.ts","sourceRoot":"","sources":["../src/ServerRpcFunction.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA"}

package/dist/ServerRpcFunction.type.js

@@ -1 +0,0 @@
-export {};

package/dist/Servers/DevServer.d.ts

@@ -1,33 +0,0 @@
-import type { Server } from 'http';
-import express from 'express';
-import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
-import type { CompilationInfo } from '../build/CompilationInfo.js';
-import type { ApiRoutes } from '../api/ApiRoutes.js';
-import { Framework } from '../Framework.js';
-import { ReqRes } from '../ReqRes.js';
-import { GlobalData, GlobalDataFunction } from '../routing/registerGlobalData.js';
-import { TungstenServer } from './TungstenServer.jsx';
-export declare class DevServer extends TungstenServer {
-    framework: Framework;
-    config: FrameworkConfigComplete;
-    compilationInfo: CompilationInfo;
-    port: number;
-    location: string | null;
-    initialProcessEnv: Record<string, string>;
-    app: express.Application;
-    apiRoutes?: ApiRoutes;
-    apiPath?: string;
-    server?: Server;
-    reqId: number;
-    firstRender: boolean;
-    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, initialProcessEnv?: Record<string, string>);
-    private addServerMiddleware;
-    private handleRequestApi;
-    private handleRequest;
-    getGlobalData: (func: GlobalDataFunction, reqRes: ReqRes) => Promise<GlobalData>;
-    errorLog: (error: unknown) => void;
-    errorPage: (error: unknown, errorTrack: string[]) => string;
-    start: () => Promise<string>;
-    stop: () => void;
-}
-//# sourceMappingURL=DevServer.d.ts.map

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

@@ -1 +0,0 @@
-{"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;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;AAgBrD,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,CAsE1B;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"}

package/dist/Servers/DevServer.js

@@ -1,424 +0,0 @@
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-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 { join } from 'path';
-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";
-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 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";
-import { portError } from "./portError.js";
-import { loadEnvsDev } from "./loadEnvsDev.js";
-import { initStores } from "./initStores.js";
-import { MatchedRoute } from "../routing/MatchedRoute.js";
-//import cookieParser from 'cookie-parser'
-function debug(...texts) {
-  // console.log(...texts)
-}
-export class DevServer extends TungstenServer {
-  constructor(framework, config, compilationInfo, initialProcessEnv = {} /* FIX ME */) {
-    super();
-    _defineProperty(this, "framework", void 0);
-    _defineProperty(this, "config", void 0);
-    _defineProperty(this, "compilationInfo", void 0);
-    _defineProperty(this, "port", void 0);
-    _defineProperty(this, "location", null);
-    _defineProperty(this, "initialProcessEnv", void 0);
-    _defineProperty(this, "app", void 0);
-    //apiRoutesPromise?: Promise<ApiRoutes>
-    _defineProperty(this, "apiRoutes", void 0);
-    _defineProperty(this, "apiPath", void 0);
-    _defineProperty(this, "server", void 0);
-    _defineProperty(this, "reqId", void 0);
-    _defineProperty(this, "firstRender", true);
-    _defineProperty(this, "addServerMiddleware", serverMiddleware => {
-      //console.log('addServerMiddleware')
-      const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
-      const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath;
-      // // testes
-      // const load = await createLoad(import.meta.url, sxyLoaderConfig)
-      // const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile)
-      // const middlewareModule = await load(fullFilePath)
-      // if ( ! (middlewareExportName in middlewareModule) ) {
-      //     throwError(
-      //         'DevServer',
-      //         `export ${middlewareExportName} not found in ${middlewareFile}`
-      //         + ` when trying to load server middleware`
-      //     )
-      // }
-      // const middlewares = middlewareModule[middlewareExportName] as RequestHandler[] // eslint-disable-line no-type-assertion/no-type-assertion
-      // this.app.use(path, middlewares)
-      // return
-      this.app.use(path, async (req, res, next) => {
-        // this is going to reload the server application on each request
-        // will cause trouble if anything depends on memory
-        // but should be OK for an ordinary DB based system, including DB based sessions
-        // [*] We could look into replacing this with a watcher + reload based system
-        // we'd have to set up a watcher which triggers a reload of middleware to
-        // a variable that can be accessed here. Probably in a promise format so
-        // that a loading middleware can be awaited instead of running the outdated
-        // code
-        // [*] const middlewares = await middlewaresPromise
-        try {
-          const load = await createLoad(import.meta.url, sxyLoaderConfig);
-          const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
-          const middlewareModule = await load(fullFilePath);
-          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 (!(0 in middlewares)) throwError('addServerMiddleware', `No middleware entry at index 0`);
-          const firstMiddleware = middlewares[0];
-          if (!(typeof firstMiddleware === 'function')) {
-            throwError('addServerMiddleware', `Expected middleware to be a function`);
-          }
-          let i = 0;
-          const next = () => {
-            i++;
-            const m = middlewares[i];
-            if (m !== undefined) {
-              m(req, res, next);
-            }
-          };
-          firstMiddleware(req, res, next);
-        } catch (e) {
-          cliError('Error in user server middleware');
-          next(e);
-        }
-      });
-      cliOut(`Server Middleware added to server at ${path}`);
-    });
-    // private handleRpc = async (req: Request, res: Response, next: NextFunction) => {
-    //     //
-    //     console.log('Server is handling server rpc')
-    // }
-    _defineProperty(this, "handleRequestApi", async (req, res, next) => {
-      req.params.foo;
-      this.apiRoutes = await getApiRoutes(this.config, this.compilationInfo, 'dev');
-      //const requestPath = standardizeWebPath(req.baseUrl + req.path)
-      const subPath = standardizeWebPath(req.path);
-      //console.log('received an API req', req.originalUrl, res.locals.reqId)
-      for (const [path, route] of Object.entries(this.apiRoutes)) {
-        if (route.method === req.method && standardizeWebPath(path) === subPath) {
-          //console.log('API route matched', path)
-          return route.endpoint(req, res, next);
-        }
-      }
-      // otherwise
-      res.sendStatus(404);
-    });
-    _defineProperty(this, "handleRequest", async (req, res) => {
-      if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico)$/.test(req.url)) {
-        // warn(
-        //     `Dev server received request ${req.url} which was not matched by a static file.`
-        //     + '\nBlocking request to prevent pointless app render'
-        // )
-        cliLog(`Requested asset file ${req.url} was not found`);
-        res.status(404).end();
-        return;
-      }
-      const errorTrack = [];
-      try {
-        const _firstRender = this.firstRender;
-        this.firstRender = false;
-        //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
-        //// or
-        //// the app has to return some data other than response string
-        ////
-        //// perhaps, set some return data in the instance
-        //// then return html string + other data
-        const location = req.url;
-        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
-        if (this.framework.frameworkModules === undefined) {
-          throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
-        }
-        if (this.framework.clientImportAliases === undefined) {
-          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);
-        // we are delaying instance creation until after we load the app code, to lets things initialise?
-        const reqRes = {
-          req,
-          res
-        };
-        // Save some state. I think this is a placeholder for later
-        const serverDataLoading = {
-          value: false
-        };
-        const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(async appRoutes => {
-          const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
-          // load data, and do routing
-          return promiseAllObj({
-            appRoutes,
-            routes,
-            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).catch(e => {
-              const msg = 'Error getting global data';
-              cliError(msg);
-              errorTrack.push(msg);
-              throw e;
-            }) : {},
-            matchedRouteInfo: routing(location, routes, serverDataLoading).catch(e => {
-              const msg = 'Error performing routing';
-              cliError(msg);
-              errorTrack.push(msg);
-              throw e;
-            })
-          });
-          // .catch(e => {
-          //     const msg = 'Error when generating routes, getting global data, or performing routing'
-          //     cliError(msg)
-          //     errorTrack.push(msg)
-          //     //cliError(e)
-          //     throw e
-          // })
-        });
-        // routingPromise.catch(e => {
-        //     cliError('ROUTING PROMISE ERR')
-        //     //cliError(e)
-        //     throw e
-        // })
-        let appRoutes;
-        let routes;
-        let globalData;
-        let matchedRouteInfo;
-        let RootComponentClass = null;
-        if (this.config.useRootComponent) {
-          const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
-          console.log('do routing and get root comp');
-          ({
-            routing: {
-              appRoutes,
-              routes,
-              globalData,
-              matchedRouteInfo
-            },
-            RootComponentClass
-          } = await promiseAllObj({
-            routing: routingPromise,
-            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
-          })
-          // .catch(e => {
-          //     cliError('ROUTING AND ROOT ERR')
-          //     //cliError(e)
-          //     throw e
-          //     //return undefined as any
-          // })
-          );
-        } else {
-          console.log('do routing');
-          ({
-            appRoutes,
-            routes,
-            globalData,
-            matchedRouteInfo
-          } = await routingPromise);
-          //throwError('DevServer', 'useRootComponent = false not implemented yet')
-        }
-        // get routes (running the getRoutes function if needed)
-        //const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
-        // load data, and do routing
-        // const [globalData, matchedRouteInfo] = await Promise.all([
-        //     (globalDataFunc !== undefined) ? globalDataFunc(reqRes) : {},
-        //     routing(location, routes, serverDataLoading)
-        // ])
-        const redirected = this.handleRedirects(res, matchedRouteInfo);
-        if (redirected) return; // end early
-        // make stores
-        const {
-          internalStore,
-          stores,
-          storeSubscriptions
-        } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
-        // create the instance
-        const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
-        let html;
-        if (RootComponentClass) {
-          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
-          );
-        } else {
-          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
-          );
-          // const { params, data } = matchedRouteInfo
-          // let { content } = matchedRouteInfo
-          // if (typeof content === 'function') {
-          //     content = content(data, params, {} /* props */, globalData, location)
-          //     //throwError('DevServer', 'route content is a function')
-          // }
-          // //console.log('content to render', content)
-          // html = await renderContentToHtmlDev(
-          //     this.compilationInfo, this.framework.clientImportAliases,
-          //     content, instance, this.config, global.tungstenPublicEnv,
-          //     '' // siteBasePathOverride
-          // )
-        }
-        //debug('html', html)
-        res.setHeader('Content-Type', 'text/html');
-        res.status(instance.matchedRouteInfo.key === '404' ? 404 : 200);
-        res.send(html);
-      } catch (e) {
-        cliLog('error in TungstenServer handleRequest', e);
-        res.setHeader('Content-Type', 'text/html');
-        res.status(500);
-        this.errorLog(e);
-        cliLog('');
-        res.send(this.errorPage(e, errorTrack));
-      }
-    });
-    // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
-    //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
-    // }
-    _defineProperty(this, "getGlobalData", async (func, reqRes) => {
-      try {
-        return await func(reqRes);
-      } catch (e) {
-        cliError('Error fetching global data');
-        //cliError(e)
-        throw e;
-      }
-    });
-    _defineProperty(this, "errorLog", error => {
-      log('error log');
-      log(typeof error === 'object' && error !== null && 'stack' in error ? error.stack : error);
-      log('end error log');
-    });
-    _defineProperty(this, "errorPage", (error, errorTrack) => {
-      return `<!DOCTYPE html>
-</html>
-  <head>
-    <title>Error</title>
-    <style>html { font-family: arial }</style>
-  </head>
-  <body>
-    <h1>Application Error</h1>
-    <section>
-        ${errorTrack.length > 0 ? '<pre>' + errorTrack.join('\n') + '</pre>' : ''}
-        <pre>${typeof error === 'object' && error !== null && 'stack' in error ? error.stack : error}</pre>
-    </section>
-  </body>
-</html>`;
-    });
-    _defineProperty(this, "start", () => {
-      return new Promise(resolve => {
-        this.server = this.app.listen(this.port, () => {
-          cliNews(`Dev server ready at ${this.location}`);
-          resolve(this.location ?? '');
-        });
-      });
-    });
-    _defineProperty(this, "stop", () => {
-      if (this.server !== undefined) this.server.close();
-    });
-    try {
-      this.framework = framework;
-      this.config = config;
-      this.compilationInfo = compilationInfo;
-      // if (tungstenPrivateEnv.TUNGSTEN_SERVER_PORT === -999) {
-      //     throwError(
-      //         'DevServer',
-      //         'TUNGSTEN_SERVER_PORT environment variable has not been set,'
-      //         + '\n Ensure that you have an env schema with this field, and a matching env file'
-      //     )
-      // }
-      const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http';
-      const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost';
-      const port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000;
-      if (isNaN(port) || port === 0) throwError('DevServer', portError(port));
-      this.port = port;
-      //this.port = _port
-      this.location = `${proto}://${host}:${port}`;
-      this.initialProcessEnv = initialProcessEnv;
-      this.app = express();
-      this.reqId = 0;
-      //this.app.use(cookieParser)
-      this.app.use((req, res, next) => {
-        res.locals.reqId = this.reqId++;
-        next();
-      });
-      //if (tungstenPrivateEnv.DEBUG === true) {
-      this.app.use((req, res, next) => {
-        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
-        }
-        cliOut(message);
-        if (this.config.suppressOriginMismatchWarning !== true) {
-          // origin-target mismatch warning
-          if (origin !== undefined && origin === this.location && origin !== targetOrigin) {
-            cliWarn(`Received a request from the frontend, but it's origin` + ` is not the same as the request origin.` + ` This may indicate a misconfiguration, and may prevent` + ` the passing of cookies to the tungsten server.`);
-            cliWarn(`source: ${targetOrigin}`);
-            cliWarn(`target: ${target}`);
-          }
-        }
-        next();
-      });
-      // this.app.use((req, res, next) => {
-      //     cliDebug(`Received request [${res.locals.reqId}] for ${req.url}`)
-      //     next()   
-      // })
-      //}
-      if (config.serverMiddleware) {
-        this.addServerMiddleware(config.serverMiddleware);
-      }
-      // can we set the mime type for .cjs files?
-      express.static.mime.define({
-        'application/javascript': ['cjs']
-      });
-      this.app.use(`/.tungsten.config.js`, express.static(join(this.compilationInfo.location, '.tungsten.config.js'))); // compiled packages
-      this.app.use(`/${packagesFolder}/`, express.static(join(this.compilationInfo.location, packagesFolder))); // compiled packages
-      this.app.use(`/${clientFolder}/`, express.static(join(this.compilationInfo.location, clientFolder))); // compiled packages
-      this.app.use(`/${componentCssFolder}/`, express.static(join(this.compilationInfo.location, componentCssFolder))); // compiled packages
-      this.app.use(express.static(join(this.compilationInfo.location, staticFolder))); // compiled stylesheets? -- etag: false to disable caching
-      const publicLocation = join(this.compilationInfo.location, publicFolder);
-      if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder
-      //cliWarn(`assets dir:`, this.config.assetsDir)
-      if (this.config.assetsDir !== undefined) {
-        this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))); // files from assets folder
-      }
-      this.app.use(express.static(this.compilationInfo.location, {
-        dotfiles: 'allow'
-      })); // serving the app files themselves
-      //this.app.use('/__server_rpc__', this.handleRpc)
-      if (typeof config.apiRoutes === 'string' && config.apiRoutes !== '') {
-        const apiPath = this.apiPath = standardizeWebPath(this.config.apiPath);
-        cliOut(`API listening at ${this.apiPath}`);
-        this.app.use(apiPath, express.json());
-        this.app.use(apiPath, this.handleRequestApi);
-      }
-      this.app.use(this.handleRequest);
-      // !!! obsolete?
-      // start hooking into require to rewrite react requires to tungsten
-      //addRequireResolveHooks() // we need this for server side
-      // we will need a server side import loader too
-    } catch (e) {
-      throw new TungstenError(`${this.constructor.name} construction error: ${e}`);
-    }
-  }
-}

package/dist/Servers/MatchedRouteInfo.d.ts

@@ -1,11 +0,0 @@
-import type { ContentNode } from '../ContentNode.js';
-import type { RoutingRedirect } from '../indexInner.js';
-import type { RouteKey } from '../routing/RouteTypes.js';
-import type { RouteContentFunction } from '../routing/RouteContentFunction.js';
-export type MatchedRouteInfo = {
-    key: RouteKey | null;
-    params: Record<string, string>;
-    content: ContentNode | RouteContentFunction;
-    data?: unknown | RoutingRedirect;
-};
-//# sourceMappingURL=MatchedRouteInfo.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/Servers/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAA;IAC3C,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}

package/dist/Servers/MatchedRouteInfo.js

@@ -1 +0,0 @@
-export {};