tungsten 0.1.37 → 0.1.38

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.38",
   "description": "",
   "type": "module",
   "bin": {