nsp-server-pages 0.1.1 → 0.1.2

package/cjs/src/app.js

@@ -15,7 +15,7 @@ class App {
         this.loaders = [];
         this.tagMap = new Map();
         this.fnMap = new Map();
-        this.listeners = new Map;
+        this.hooks = new Map;
         this.options = options = Object.create(options || null);
         if (!options.vName)
             options.vName = "v";
@@ -25,12 +25,12 @@ class App {
             options.storeKey = "#nsp";
     }
     hook(type, fn) {
-        this.listeners.set(type, fn);
+        this.hooks.set(type, fn);
     }
-    process(type, arg) {
-        const fn = this.listeners.get(type);
+    process(type, ...args) {
+        const fn = this.hooks.get(type);
         if (fn)
-            return fn(arg);
+            return fn.apply(null, args);
     }
     log(message) {
         const logger = this.options.logger || console;

package/cjs/src/catch.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.catchFn = void 0;
-const to_xml_1 = require("to-xml");
 const isPromise = (v) => v && (typeof v.catch === "function");
-const escapeError = (e) => (0, to_xml_1.toXML)({ "#": (e?.message || String(e)) });
 const catchFn = (app, fn) => {
     return context => {
         try {
@@ -26,11 +24,13 @@ const catchFn = (app, fn) => {
                     throw e;
                 data.error = e;
             }
-            // call the error handler
+            // call the error hook
             const result = app.process("error", e, context);
-            if (result != null)
-                return result;
-            return `<!--\n[ERR] ${escapeError(e)}\n-->`;
+            // if the hook returns nothing, throw the error
+            if (result == null)
+                throw e;
+            // if the hook returns a string, show it
+            return result;
         }
     };
 };

package/index.d.ts

@@ -110,13 +110,7 @@ declare namespace NSP {
         /**
          * retrieve a result from hook function
          */
-        process<T>(type: "error", e: Error, context: T): string;
-
-        process<T>(type: "directive", src: string, context: T): string;
-
-        process<T>(type: "declaration", src: string, context: T): string;
-
-        process<T>(type: "scriptlet", src: string, context: T): string;
+        process<R>(type: string, ...args: any[]): R;
 
         /**
          * pickup the taglib function
@@ -150,13 +144,15 @@ declare namespace NSP {
         /**
          * register a hook function
          */
-        hook(type: "error", fn: <T>(e: Error, context?: T) => string | void): void;
+        hook(type: "error", fn: (e: Error, context?: any) => string | void): void;
+
+        hook(type: "directive", fn: (src: string, context?: any) => string | void): void;
 
-        hook(type: "directive", fn: <T>(src: string, context?: T) => string | void): void;
+        hook(type: "declaration", fn: (src: string, context?: any) => string | void): void;
 
-        hook(type: "declaration", fn: <T>(src: string, context?: T) => string | void): void;
+        hook(type: "scriptlet", fn: (src: string, context?: any) => string | void): void;
 
-        hook(type: "scriptlet", fn: <T>(src: string, context?: T) => string | void): void;
+        hook(type: string, fn: (...args: any[]) => any): void;
 
         /**
          * parse a JSP document

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nsp-server-pages",
   "description": "NSP JavaScript Server Pages for Node.js",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"

package/src/app.js

@@ -11,7 +11,7 @@ class App {
         this.loaders = [];
         this.tagMap = new Map();
         this.fnMap = new Map();
-        this.listeners = new Map;
+        this.hooks = new Map;
         this.options = options = Object.create(options || null);
         if (!options.vName)
             options.vName = "v";
@@ -21,12 +21,12 @@ class App {
             options.storeKey = "#nsp";
     }
     hook(type, fn) {
-        this.listeners.set(type, fn);
+        this.hooks.set(type, fn);
     }
-    process(type, arg) {
-        const fn = this.listeners.get(type);
+    process(type, ...args) {
+        const fn = this.hooks.get(type);
         if (fn)
-            return fn(arg);
+            return fn.apply(null, args);
     }
     log(message) {
         const logger = this.options.logger || console;

package/src/catch.js

@@ -1,6 +1,4 @@
-import { toXML } from "to-xml";
 const isPromise = (v) => v && (typeof v.catch === "function");
-const escapeError = (e) => toXML({ "#": (e?.message || String(e)) });
 export const catchFn = (app, fn) => {
     return context => {
         try {
@@ -23,11 +21,13 @@ export const catchFn = (app, fn) => {
                     throw e;
                 data.error = e;
             }
-            // call the error handler
+            // call the error hook
             const result = app.process("error", e, context);
-            if (result != null)
-                return result;
-            return `<!--\n[ERR] ${escapeError(e)}\n-->`;
+            // if the hook returns nothing, throw the error
+            if (result == null)
+                throw e;
+            // if the hook returns a string, show it
+            return result;
         }
     };
 };