nsp-server-pages 0.1.0 → 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/bundle.js

@@ -6,13 +6,16 @@ const join = (a, b) => (a == null ? b : (b == null ? a : a + b));
 const bundle = (array, start, end) => {
     start = +start || 0;
     end = +end || array?.length || 0;
+    // empty
     if (end <= start) {
         return () => null;
     }
+    // single item
     if (end - 1 === start) {
         const node = array[start];
         return (typeof node === "function") ? node : () => node;
     }
+    // multiple items
     return context => {
         let result;
         let promise;

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

@@ -7,19 +7,21 @@
 export const createNSP: (options?: NSP.Options) => NSP.App;
 
 declare namespace NSP {
-    type NodeFn<T> = (context?: T) => string | Promise<string>;
+    type NodeFn<T> = (context: T) => string | Promise<string>;
 
     type Node<T> = string | NodeFn<T>;
 
-    type AttrFn<A, T = any> = (context?: T) => A;
+    type AttrFn<A, T = any> = (context: T) => A;
 
-    type TagFn<A, T = any> = (tag: TagDef<A, T>) => NodeFn<T>;
+    type VoidFn<T> = (context: T) => void | Promise<void>;
 
-    type LoaderFn = (path: string) => Promise<NodeFn<any>>;
+    type TagFn<A, T = any> = (tag: TagDef<A, T>) => (NodeFn<T> | VoidFn<T>);
 
-    type TextFlex = string | Promise<string> | (string | Promise<string>)[];
+    type LoaderFn = (path: string) => Promise<NodeFn<any> | undefined>;
 
-    type Build<T> = (nsp: App) => (context?: T) => string | Promise<string>;
+    type Strings = string | Promise<string> | Strings[];
+
+    type Build<T> = (nsp: App) => (context: T) => string | Promise<string>;
 
     interface TagDef<A, T = any> {
         app: App;
@@ -103,18 +105,12 @@ declare namespace NSP {
         /**
          * concat strings even if they are Promise<string>
          */
-        concat(...text: TextFlex[]): string | Promise<string>;
+        concat(...text: Strings[]): string | Promise<string>;
 
         /**
          * 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
@@ -148,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.0",
+  "version": "0.1.2",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.3",
+    "@types/node": "^20.5.4",
     "mocha": "^10.2.0",
     "typescript": "^5.1.6"
   },

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/bundle.js

@@ -3,13 +3,16 @@ const join = (a, b) => (a == null ? b : (b == null ? a : a + b));
 export const bundle = (array, start, end) => {
     start = +start || 0;
     end = +end || array?.length || 0;
+    // empty
     if (end <= start) {
         return () => null;
     }
+    // single item
     if (end - 1 === start) {
         const node = array[start];
         return (typeof node === "function") ? node : () => node;
     }
+    // multiple items
     return context => {
         let result;
         let promise;

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;
         }
     };
 };