tungsten 0.1.37 → 0.1.39

package/dist/Framework.d.ts

@@ -16,7 +16,7 @@ export declare class Framework {
     build(mode: Mode): Promise<void>;
     clean(mode?: Mode | 'staticSite'): Promise<void>;
     staticGen(): Promise<void>;
-    private getConfig;
+    private getAppConfig;
     private compileUserApp;
     private copyFrameworkAssets;
     private bundle;

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;AAIrC,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;AAuBxD,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;YAGD,SAAS;YAUT,cAAc;YAOd,mBAAmB;YAYnB,MAAM;IAKd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IAoBrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAkG7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CAuChD"}
+{"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;AAIrC,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;AAuBxD,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;YAGD,YAAY;YAUZ,cAAc;YAOd,mBAAmB;YAYnB,MAAM;IAKd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IAoBrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAkG7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CAuChD"}

package/dist/Framework.js

@@ -41,7 +41,7 @@ export class Framework {
     _defineProperty(this, "prodServer", void 0);
   }
   async init() {
-    const configOrUndefined = await this.getConfig();
+    const configOrUndefined = await this.getAppConfig();
     if (configOrUndefined === undefined) {
       throwError('Framework.init()', 'config is undefined');
     }
@@ -88,7 +88,7 @@ export class Framework {
   async staticGen() {
     await staticGen(this);
   }
-  async getConfig() {
+  async getAppConfig() {
     const userConfigOrNull = await findUserConfig(process.cwd());
     if (userConfigOrNull !== null) {
       const userConfig = userConfigOrNull;

package/dist/Servers/StaticSiteServer.d.ts

@@ -1,12 +1,14 @@
 import type { Server } from 'http';
 import express from 'express';
+import { FrameworkConfigComplete } from 'tungsten/FrameworkConfig.js';
 export declare class StaticSiteServer {
+    config: FrameworkConfigComplete;
     port: number;
     location?: string;
     app: express.Application;
     server?: Server;
     staticSiteLocation: string;
-    constructor();
+    constructor(config: FrameworkConfigComplete);
     start: () => Promise<string>;
     stop: () => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"StaticSiteServer.d.ts","sourceRoot":"","sources":["../../src/Servers/StaticSiteServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAM7B,qBAAa,gBAAgB;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;;IAS1B,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAQ3B;IACD,IAAI,aAEH;CACJ"}
+{"version":3,"file":"StaticSiteServer.d.ts","sourceRoot":"","sources":["../../src/Servers/StaticSiteServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAErE,qBAAa,gBAAgB;IACzB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;gBAEd,MAAM,EAAE,uBAAuB;IAQ3C,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAQ3B;IACD,IAAI,aAEH;CACJ"}

package/dist/Servers/StaticSiteServer.js

@@ -7,14 +7,15 @@ import { staticSiteFolder } from "../settings.js";
 import { cliNews } from "../cliOutput.js";
 export class StaticSiteServer {
   // to do
-  constructor() {
+  constructor(config) {
+    _defineProperty(this, "config", void 0);
     _defineProperty(this, "port", void 0);
     _defineProperty(this, "location", void 0);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "server", void 0);
     _defineProperty(this, "staticSiteLocation", void 0);
     _defineProperty(this, "start", () => {
-      const location = this.location = `http://localhost:${this.port}`;
+      const location = this.location = `http://localhost:${this.port}${this.config.siteBasePath}`;
       return new Promise(resolve => {
         this.server = this.app.listen(this.port, () => {
           cliNews(`Static preview ready at ${this.location}`);
@@ -25,6 +26,7 @@ export class StaticSiteServer {
     _defineProperty(this, "stop", () => {
       if (this.server !== undefined) this.server.close();
     });
+    this.config = config;
     this.port = 3001;
     this.app = express();
     this.staticSiteLocation = join(process.cwd(), staticSiteFolder);

package/dist/bin/commands/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/static.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/static.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/static.js

@@ -1,5 +1,6 @@
 import open from 'open';
+import { getAppConfig } from 'tungsten/getAppConfig.js';
 import { StaticSiteServer } from "../../Servers/StaticSiteServer.js";
-const staticServer = new StaticSiteServer();
+const staticServer = new StaticSiteServer(await getAppConfig());
 const staticServerLocation = await staticServer.start();
 open(staticServerLocation);

package/dist/getAppConfig.d.ts

@@ -0,0 +1,3 @@
+import { FrameworkConfigComplete } from './FrameworkConfig.js';
+export declare function getAppConfig(): Promise<FrameworkConfigComplete>;
+//# sourceMappingURL=getAppConfig.d.ts.map

package/dist/getAppConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAppConfig.d.ts","sourceRoot":"","sources":["../src/getAppConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAG9D,wBAAsB,YAAY,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAQrE"}

package/dist/getAppConfig.js

@@ -0,0 +1,12 @@
+import { defaultConfig } from "./defaultConfig.js";
+import { findUserConfig } from "./findUserConfig.js";
+import { makeFinalConfig } from "./makeFinalConfig.js";
+export async function getAppConfig() {
+  const userConfigOrNull = await findUserConfig(process.cwd());
+  if (userConfigOrNull !== null) {
+    const userConfig = userConfigOrNull;
+    return makeFinalConfig(userConfig.data);
+  } else {
+    return defaultConfig;
+  }
+}

package/dist/staticGen/getAppRoutes.d.ts

@@ -1,4 +1,5 @@
 import { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { CompilationInfo } from '../build/CompilationInfo.js';
-export declare function getAppRoutes(compilationInfo: CompilationInfo, config: FrameworkConfigComplete): Promise<any>;
+import { AppRoutes } from 'tungsten/routing/AppRoutes.js';
+export declare function getAppRoutes(compilationInfo: CompilationInfo, config: FrameworkConfigComplete): Promise<AppRoutes>;
 //# sourceMappingURL=getAppRoutes.d.ts.map

package/dist/staticGen/getAppRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAIlE,wBAAsB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,gBAoBnG"}
+{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAIzD,wBAAsB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,GAC9F,OAAO,CAAC,SAAS,CAAC,CAoBvB"}

package/dist/staticGen/getAppRoutes.js

@@ -1,6 +1,8 @@
 import { join } from 'path';
 import { fixExtension } from "../fixExtension.js";
 import { TungstenError } from "../TungstenError.js";
+// this file is outdated and may not work correct
+// should compare this to the functions used by Servers
 export async function getAppRoutes(compilationInfo, config) {
   const fullBuildLocation = 'file://' + compilationInfo.location;
   const routesLocationConfig = config.routesLocation;

package/dist/staticGen/staticGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAchD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBAgKnD"}
+{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAgBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBAqKnD"}

package/dist/staticGen/staticGen.js

@@ -9,6 +9,7 @@ import { matchPath } from "../routing/matchPath.js";
 import { throwError } from "../throwError.js";
 import { RouteKeyIsPath, StringIsPath } from "../routing/RouteTypes.js";
 import { findLinks, pathToLink, pathToFileName, rewriteLinks } from "./staticGenFunctions.js";
+import { filter as objectFilter, count } from 'sxy-lib/objects.js';
 export async function staticGen(framework) {
   if (framework.compilationInfo === undefined) {
     throwError('staticGen()', `framework.compilationInfo is undefined`);
@@ -20,7 +21,9 @@ export async function staticGen(framework) {
   const siteBasePath = config.siteBasePath;
   console.log('siteBasePath', siteBasePath);
   const projectDir = process.cwd();
-  let appRoutes = await getAppRoutes(framework.compilationInfo, config);
+  //let appRoutes: RouteDefinition[] | Record<RouteKey, RouteDefinition> = await getAppRoutes(framework.compilationInfo, config)
+  const getRoutes = await getAppRoutes(framework.compilationInfo, config);
+  const appRoutes = typeof getRoutes === 'function' ? getRoutes(null) : getRoutes;
   const buildLocation = framework.compilationInfo.location;
   const server = await framework.createProdServer();
   const serverLocation = await server.start(null, true); // port, mute
@@ -29,12 +32,12 @@ export async function staticGen(framework) {
     recursive: true
   });
   const rewriteMap = {};
-  if (!Array.isArray(appRoutes)) {
-    appRoutes = Object.entries(appRoutes).map(([path, route]) => {
-      route.path = path;
-      return route;
-    });
-  }
+  // if ( ! Array.isArray(appRoutes) ) {
+  //     appRoutes = Object.entries(appRoutes).map( ([path, route]) => { 
+  //         route.path = path as keyof typeof appRoutes
+  //         return route
+  //     } )
+  // }
   // for default and 404 routes we need to identify which one is in use, and then make sure the app renders it
   // appRoutes = appRoutes.map( route => {
   //     if (route.path === 'default') {
@@ -47,25 +50,27 @@ export async function staticGen(framework) {
   //     return route
   // })
   const dynamicRoutes = [];
-  appRoutes = appRoutes.filter(route => {
-    if (!route.path.startsWith('/')) {
+  const finalRoutes = objectFilter(appRoutes, (path, route) => {
+    if (!path.startsWith('/')) {
       //cliWarn(`Static gen skipping route ${route.path}, because it does not start with /, and is not default or 404`)
-      cliWarn(`Static gen skipping route ${route.path}, because it does not start with /`);
+      cliWarn(`Static gen skipping route ${path}, because it does not start with /`);
       return false;
     }
-    if (route.path.includes(':')) {
+    if (path.includes(':')) {
       // separate these out
-      dynamicRoutes.push(route);
+      dynamicRoutes.push([path, route]);
       return false;
     }
     return true;
   });
-  for (const route of appRoutes) {
+  if (count(finalRoutes) === 0) {
+    cliWarn('Found no valid route!');
+  }
+  for (const [path, route] of Object.entries(finalRoutes)) {
     // we need to develop the rewrite map over time, because we discover links during processing
-    const path = route.path;
     rewriteMap[path] = pathToLink(path, siteBasePath);
-    console.log('rewriteMap', rewriteMap);
   }
+  console.log('rewriteMap', rewriteMap);
   async function renderPath(path, siteBasePath) {
     const url = serverLocation + path;
     let links;
@@ -78,9 +83,9 @@ export async function staticGen(framework) {
       for (const link of links) {
         if (!StringIsPath(link)) throwError('renderRoute', `Found a link '${link}' that did not start with /`);
         if (!(link in rewriteMap)) {
-          for (const dynamicRoute of dynamicRoutes) {
-            if (RouteKeyIsPath(dynamicRoute.path)) {
-              if (matchPath(dynamicRoute.path, link)) {
+          for (const [path, dynamicRoute] of dynamicRoutes) {
+            if (RouteKeyIsPath(path)) {
+              if (matchPath(path, link)) {
                 //console.log('link', link)
                 //console.log('in?', link in rewriteMap)
                 //console.log(`link ${link} matched dynamic route ${dynamicRoute.path}`)
@@ -117,8 +122,8 @@ export async function staticGen(framework) {
       cliError(`Static site gen - error generating path ${path} (full location ${url}): ${e} ${e.stack}`);
     }
   }
-  for (const route of appRoutes) {
-    await renderPath(route.path, siteBasePath);
+  for (const [path, route] of Object.entries(finalRoutes)) {
+    await renderPath(path, siteBasePath);
   }
   console.log('rewriteMap', rewriteMap);
   const copyPromises = [fsExtra.copy(join(buildLocation, staticFolder), join(projectDir, staticSiteFolder)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "",
   "type": "module",
   "bin": {