nsp-server-pages 0.2.3 → 0.2.4

package/cjs/src/loaders.js

@@ -34,7 +34,7 @@ class JspLoader extends BaseLoader {
             timeout: 1000,
         })(async (path) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${path}`);
+            app.log(`loading JSP: ${path}`);
             const text = await fs_1.promises.readFile(path, "utf8");
             return app.parse(text).toFn();
         });
@@ -64,7 +64,7 @@ class JsLoader extends BaseLoader {
             timeout: 1000,
         })(async (file) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${file}`);
+            app.log(`loading JS: ${file}`);
             const module = await Promise.resolve(`${file}`).then(s => require(s));
             const name = getName(file);
             const fn = module[name];
@@ -80,8 +80,8 @@ class JsLoader extends BaseLoader {
     }
     async load(file) {
         file = file?.replace(/\.jsp$/, ".js");
-        // valid only for .js files
-        if (!/\.[cm]?js$/.test(file))
+        // valid only for .js-like files
+        if (!/\.(cjs|js|mjs|ts)$/.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))
@@ -110,8 +110,8 @@ class FileLoader extends BaseLoader {
         });
     }
     async load(file) {
-        // disabled for JSP, JS and image files
-        if (/\.(jsp|[cm]?js|png|gif|jpe?g)$/i.test(file))
+        // disabled for JSP, JS, TS and image files
+        if (/\.(jsp|cjs|js|mjs|ts|png|gif|jpe?g|webp)$/i.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))

package/cjs/src/mount.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.load = exports.mount = void 0;
+exports.mount = mount;
+exports.load = load;
 function mount(match, fn) {
     const test = ("string" !== typeof match) ? match : {
         test: ((path) => path.startsWith(match))
@@ -10,7 +11,6 @@ function mount(match, fn) {
             return fn(path);
     });
 }
-exports.mount = mount;
 async function load(path) {
     const { loaders } = this;
     const search = path.replace(/^[^?]*\??/, "");
@@ -31,4 +31,3 @@ async function load(path) {
         return fn(context);
     };
 }
-exports.load = load;

package/cjs/src/taglib.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareTag = exports.addTagLib = void 0;
+exports.addTagLib = addTagLib;
+exports.prepareTag = prepareTag;
 const to_xml_1 = require("to-xml");
 const isTagCon = (v) => ("function" === typeof v?.prototype?.render);
 const tagConToTagFn = (Tag) => {
@@ -44,7 +45,6 @@ function addTagLib(tagLibDef) {
         }
     }
 }
-exports.addTagLib = addTagLib;
 function prepareTag(name, attr, body) {
     const { tagMap } = this;
     const tagFn = tagMap.get(name) || defaultTagFn;
@@ -52,7 +52,6 @@ function prepareTag(name, attr, body) {
     const tagDef = { name, app: this, attr: attrFn, body };
     return tagFn(tagDef);
 }
-exports.prepareTag = prepareTag;
 const defaultTagFn = (tagDef) => {
     const { name } = tagDef;
     // tagDef.app.log(`Unknown tag: ${name}`);

package/esm/src/loaders.js

@@ -31,7 +31,7 @@ export class JspLoader extends BaseLoader {
             timeout: 1000,
         })(async (path) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${path}`);
+            app.log(`loading JSP: ${path}`);
             const text = await fs.readFile(path, "utf8");
             return app.parse(text).toFn();
         });
@@ -60,7 +60,7 @@ export class JsLoader extends BaseLoader {
             timeout: 1000,
         })(async (file) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${file}`);
+            app.log(`loading JS: ${file}`);
             const module = await import(file);
             const name = getName(file);
             const fn = module[name];
@@ -76,8 +76,8 @@ export class JsLoader extends BaseLoader {
     }
     async load(file) {
         file = file?.replace(/\.jsp$/, ".js");
-        // valid only for .js files
-        if (!/\.[cm]?js$/.test(file))
+        // valid only for .js-like files
+        if (!/\.(cjs|js|mjs|ts)$/.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))
@@ -105,8 +105,8 @@ export class FileLoader extends BaseLoader {
         });
     }
     async load(file) {
-        // disabled for JSP, JS and image files
-        if (/\.(jsp|[cm]?js|png|gif|jpe?g)$/i.test(file))
+        // disabled for JSP, JS, TS and image files
+        if (/\.(jsp|cjs|js|mjs|ts|png|gif|jpe?g|webp)$/i.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nsp-server-pages",
   "description": "NSP JavaScript Server Pages for Node.js",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"
@@ -11,12 +11,11 @@
     "to-xml": "^0.1.11"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.8",
-    "mocha": "^10.2.0",
-    "nyc": "^15.1.0",
-    "typescript": "^5.2.2"
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^25.2.0",
+    "mocha": "^11.7.5",
+    "nyc": "^17.1.0",
+    "typescript": "^5.9.3"
   },
   "exports": {
     "import": {