refactor(framework): rename pageModule to module

Author: ije

framework/core/routing.ts

@@ -231,7 +231,7 @@ export function isHttpUrl(url: string) {
     }
 }
 
-export function isPageModule(url: string) {
+export function isModuleURL(url: string) {
     for (const ext of pageModuleExts) {
         if (url.endsWith('.' + ext)) {
             return true
@@ -241,11 +241,20 @@ export function isPageModule(url: string) {
 }
 
 export function getPagePathname(url: string): string {
-    const pathname = trimPageModuleExt(url).replace(/^\/pages\//, '/').replace(/\/?index$/, '/')
+    let pathname = trimModuleExt(url)
+    if (pathname.startsWith('/pages/')) {
+        pathname = util.trimPrefix(pathname, '/pages')
+    }
+    if (pathname.endsWith('/index')) {
+        pathname = util.trimSuffix(pathname, '/index')
+        if (pathname === '') {
+            pathname = '/'
+        }
+    }
     return pathname
 }
 
-export function trimPageModuleExt(url: string) {
+export function trimModuleExt(url: string) {
     for (const ext of pageModuleExts) {
         if (url.endsWith('.' + ext)) {
             return url.slice(0, -(ext.length + 1))

framework/react/bootstrap.ts

@@ -1,7 +1,7 @@
 import type { ComponentType } from 'https://esm.sh/react'
 import { createElement } from 'https://esm.sh/react'
 import { hydrate, render } from 'https://esm.sh/react-dom'
-import { Route, RouteModule, Routing, trimPageModuleExt } from '../core/routing.ts'
+import { Route, RouteModule, Routing, trimModuleExt } from '../core/routing.ts'
 import type { PageRoute } from './pageprops.ts'
 import { createPageProps } from './pageprops.ts'
 import Router from './router.ts'
@@ -22,7 +22,7 @@ export default async function bootstrap(options: Options) {
     const customComponents: Record<string, ComponentType> = {}
     await Promise.all(sharedModules.map(async mod => {
         const { default: C } = await importModule(baseUrl, mod)
-        switch (trimPageModuleExt(mod.url)) {
+        switch (trimModuleExt(mod.url)) {
             case '/404':
                 customComponents['E404'] = C
                 break

framework/react/util.ts

@@ -1,7 +1,7 @@
 import { createContext } from 'https://esm.sh/react'
 import util from '../../shared/util.ts'
 import type { RouterURL } from '../../types.ts'
-import { trimPageModuleExt } from '../core/routing.ts'
+import { trimModuleExt } from '../core/routing.ts'
 
 const symbolFor = typeof Symbol === 'function' && Symbol.for
 const REACT_FORWARD_REF_TYPE = symbolFor ? Symbol.for('react.forward_ref') : 0xead0
@@ -50,7 +50,7 @@ export function importModule(baseUrl: string, mod: { url: string, hash: string }
     }
 
     if (ALEPH && mod.url.startsWith('/pages/')) {
-        const src = util.cleanPath(baseUrl + '/_aleph/' + trimPageModuleExt(mod.url) + `.bundle.${util.shortHash(mod.hash)}.js`)
+        const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.bundle.${util.shortHash(mod.hash)}.js`)
         return new Promise((resolve, reject) => {
             const script = document.createElement('script')
             script.onload = () => {
@@ -64,7 +64,7 @@ export function importModule(baseUrl: string, mod: { url: string, hash: string }
         })
     }
 
-    const src = util.cleanPath(baseUrl + '/_aleph/' + trimPageModuleExt(mod.url) + `.${util.shortHash(mod.hash)}.js`) + (forceRefetch ? `?t=${Date.now()}` : '')
+    const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.${util.shortHash(mod.hash)}.js`) + (forceRefetch ? `?t=${Date.now()}` : '')
     return import(src)
 }