nsp-server-pages 0.2.0 → 0.2.2

package/README.md

@@ -11,7 +11,7 @@ NSP JavaScript Server Pages for Node.js
 - `${ f:h("tag") }` - custom taglib static function call
 - `<ns:tag attr="${ expression }"/>` - custom taglib action tag
 - `<%-- comments --%>` - comments in JSP just ignored
-- See TypeScript declaration [index.d.ts](https://github.com/kawanet/nsp-server-pages/blob/main/index.d.ts) for API detail.
+- See [TypeScript declaration files](https://github.com/kawanet/nsp-server-pages/tree/main/types/) for API detail.
 
 ## SYNOPSIS
 
@@ -156,6 +156,7 @@ app.use("/", async (req, res, next) => {
 - https://github.com/kawanet/nsp-server-pages
 - https://github.com/kawanet/nsp-jstl-taglib
 - https://github.com/kawanet/nsp-struts1-taglib
+- https://github.com/kawanet/nsp-seasar2-taglib
 - https://github.com/apache/tomcat
 
 ## LICENSE

package/cjs/src/app.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = void 0;
-const mount_js_1 = require("./mount.js");
+const bundle_js_1 = require("./bundle.js");
+const catch_js_1 = require("./catch.js");
+const concat_js_1 = require("./concat.js");
 const loaders_js_1 = require("./loaders.js");
+const mount_js_1 = require("./mount.js");
 const jsp_js_1 = require("./parser/jsp.js");
-const catch_js_1 = require("./catch.js");
-const bundle_js_1 = require("./bundle.js");
+const store_js_1 = require("./store.js");
 const taglib_js_1 = require("./taglib.js");
-const concat_js_1 = require("./concat.js");
-const stack_store_js_1 = require("./stack-store.js");
 class App {
     constructor(options) {
         this.loaders = [];
@@ -85,7 +85,7 @@ class App {
         const map = (context[storeKey] ??= new Map());
         let value = map.get(key);
         if (value == null) {
-            value = new stack_store_js_1.StackStore();
+            value = new store_js_1.Store();
             map.set(key, value);
         }
         return value;

package/cjs/src/parser/attr.js

@@ -53,9 +53,9 @@ class Attr {
     _toJS(option) {
         const { app } = this;
         const { indent } = app.options;
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
         const keys = this.keys();
         const items = keys.map(key => {
             if (!isSafeKey(key)) {
@@ -69,7 +69,7 @@ class Attr {
             return 'null';
         const js = items.join(`,${nextLF}`);
         const trailingComma = (keys.length > 1) ? "," : "";
-        return `{${nextLF}${js}${trailingComma}${currentLF}}`;
+        return `{${nextLF}${js}${trailingComma}${LF}}`;
     }
 }
 exports.Attr = Attr;

package/cjs/src/parser/jsp.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jspToJS = exports.JSP = void 0;
+const store_js_1 = require("../store.js");
 const scriptlet_js_1 = require("./scriptlet.js");
-const stack_store_js_1 = require("../stack-store.js");
 const tag_js_1 = require("./tag.js");
 /**
  * Parser for JSP document
@@ -44,7 +44,7 @@ const insideRE = `[^"']|${stringRE}`;
 const tagRegExp = new RegExp(`(</?${nameRE}:(?:${insideRE})*?>)|(<%(?:${insideRE})*?%>)`, "s");
 const jspToJS = (app, src, option) => {
     const root = new tag_js_1.Tag(app);
-    const tree = new stack_store_js_1.StackStore(root);
+    const tree = new store_js_1.Store(root);
     const array = src.split(tagRegExp);
     for (let i = 0; i < array.length; i++) {
         const i3 = i % 3;

package/cjs/src/parser/tag.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tag = void 0;
-const text_js_1 = require("./text.js");
 const attr_js_1 = require("./attr.js");
+const text_js_1 = require("./text.js");
 const emptyText = {
     '""': true,
     "''": true,
@@ -34,13 +34,14 @@ class Tag {
     getBodyJS(option) {
         const { app } = this;
         const { indent, trimSpaces, vName } = app.options;
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
+        const nextOption = { SP, LF: nextLF };
         const { children } = this;
         const args = children.map(item => {
             if (isTranspiler(item)) {
-                return item.toJS({ LF: nextLF });
+                return item.toJS(nextOption);
             }
             else if (!/\S/.test(item)) {
                 // item with only whitespace
@@ -53,7 +54,7 @@ class Tag {
                     item = item.replace(/^[ \t]+/s, " ");
                     item = item.replace(/[ \t]+$/s, " ");
                 }
-                let js = new text_js_1.Text(app, item).toJS({ LF: nextLF });
+                let js = new text_js_1.Text(app, item).toJS(nextOption);
                 if (/\(.+?\)|\$\{.+?}/s.test(js)) {
                     js = `${vName} => ${js}`; // array function
                 }
@@ -75,11 +76,11 @@ class Tag {
                 args[idx] += ",";
             }
             else if (idx === last && isComment) {
-                args[idx] += currentLF;
+                args[idx] += LF;
             }
         });
         const bodyL = /^`\n/s.test(args.at(0)) ? "" : nextLF;
-        const bodyR = /(\n`|[)\s])$/s.test(args.at(-1)) ? "" : currentLF;
+        const bodyR = /(\n`|[)\s])$/s.test(args.at(-1)) ? "" : LF;
         return bodyL + args.join(nextLF) + bodyR;
     }
     /**
@@ -98,13 +99,13 @@ class Tag {
         const commentJS = this.getCommentJS(option);
         const attr = new attr_js_1.Attr(app, this.src);
         const body = this.getBodyJS(option);
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
-        const tagOption = { LF: (body ? nextLF : currentLF) };
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
+        const nextOption = { SP, LF: (body ? nextLF : LF) };
         const type = `parse.tag.${tagName}`;
-        const def = { app, name: tagName, attr, body, LF: currentLF, nextLF };
-        const tagJS = app.process(type, def) ?? this.getTagJS(def, tagOption);
+        const def = { app, name: tagName, attr, body, LF: LF, nextLF };
+        const tagJS = app.process(type, def) ?? this.getTagJS(def, nextOption);
         return commentJS ? commentJS + tagJS : tagJS;
     }
     getCommentJS(option) {
@@ -120,10 +121,13 @@ class Tag {
         const attrRaw = def.attr.toJS(option);
         // transpile attributes to array function if they include variables
         const hasVars = /\(.+?\)|\$\{.+?}/s.test(attrRaw);
-        const attrJS = hasVars ? `${vName} => (${attrRaw})` : attrRaw;
+        const attrArg = hasVars ? `, ${vName} => (${attrRaw})` : `, ${attrRaw}`;
         const nameJS = JSON.stringify(tagName);
         const hasAttr = /:/.test(attrRaw);
-        const restJS = def.body ? (`, ${attrJS}, ${def.body}`) : (hasAttr ? `, ${attrJS}` : "");
+        let bodyArg = def.body;
+        if (bodyArg)
+            bodyArg = ((/^\n/.test(bodyArg)) ? "," : ", ") + bodyArg;
+        const restJS = bodyArg ? (attrArg + bodyArg) : (hasAttr ? attrArg : "");
         return `${nspName}.tag(${nameJS}${restJS})`;
     }
 }

package/cjs/src/store.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Store = void 0;
+/**
+ * The Store class was implemented using a stack {stack: P[]} at first.
+ * Now it was changed to a linked list to allow access to the parent.
+ */
+class Store {
+    constructor(value) {
+        this.item = { value };
+    }
+    open(value) {
+        this.item = { parent: this.item, value };
+    }
+    close() {
+        const item = this.item;
+        this.item = item.parent;
+        return item.value;
+    }
+    get() {
+        return this.item.value;
+    }
+    set(value) {
+        this.item.value = value;
+    }
+    find(test) {
+        let item = this.item;
+        while (item) {
+            if (test(item.value)) {
+                return item.value;
+            }
+            item = item.parent;
+        }
+    }
+}
+exports.Store = Store;

package/cjs/src/taglib.js

@@ -2,17 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareTag = exports.addTagLib = void 0;
 const to_xml_1 = require("to-xml");
+const isTagCon = (v) => ("function" === typeof v?.prototype?.render);
+const tagConToTagFn = (Tag) => {
+    return (tag) => {
+        return (context) => {
+            const result = new Tag(tag, context).render();
+            if (result)
+                return result;
+        };
+    };
+};
 function addTagLib(tagLibDef) {
     const { fnMap, tagMap } = this;
     const { ns, fn, tag } = tagLibDef;
     if (fn) {
         for (const name in fn) {
-            fnMap.set(`${ns}:${name}`, fn[name]);
+            const impl = fn[name];
+            if (typeof impl === "function") {
+                // FnFn is called with App instance as this
+                fnMap.set(`${ns}:${name}`, impl.bind(this));
+            }
+            else if (impl != null) {
+                throw new Error(`Invalid taglib implementation: \${${ns}:${name}()}`);
+            }
         }
     }
     if (tag) {
         for (const name in tag) {
-            tagMap.set(`${ns}:${name}`, tag[name]);
+            const impl = tag[name];
+            if (isTagCon(impl)) {
+                // NSP.TagCon
+                tagMap.set(`${ns}:${name}`, tagConToTagFn(impl));
+            }
+            else if (typeof impl === "function") {
+                // NSP.TagFn
+                tagMap.set(`${ns}:${name}`, impl);
+            }
+            else if (impl != null) {
+                throw new Error(`Invalid taglib implementation: <${ns}:${name}>`);
+            }
         }
     }
 }

package/esm/src/app.js

@@ -1,11 +1,11 @@
-import { load, mount } from "./mount.js";
+import { bundle } from "./bundle.js";
+import { catchFn } from "./catch.js";
+import { concat } from "./concat.js";
 import { FileLoader, JsLoader, JspLoader } from "./loaders.js";
+import { load, mount } from "./mount.js";
 import { JSP } from "./parser/jsp.js";
-import { catchFn } from "./catch.js";
-import { bundle } from "./bundle.js";
+import { Store } from "./store.js";
 import { addTagLib, prepareTag } from "./taglib.js";
-import { concat } from "./concat.js";
-import { StackStore } from "./stack-store.js";
 export class App {
     constructor(options) {
         this.loaders = [];
@@ -82,7 +82,7 @@ export class App {
         const map = (context[storeKey] ??= new Map());
         let value = map.get(key);
         if (value == null) {
-            value = new StackStore();
+            value = new Store();
             map.set(key, value);
         }
         return value;

package/esm/src/parser/attr.js

@@ -50,9 +50,9 @@ export class Attr {
     _toJS(option) {
         const { app } = this;
         const { indent } = app.options;
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
         const keys = this.keys();
         const items = keys.map(key => {
             if (!isSafeKey(key)) {
@@ -66,7 +66,7 @@ export class Attr {
             return 'null';
         const js = items.join(`,${nextLF}`);
         const trailingComma = (keys.length > 1) ? "," : "";
-        return `{${nextLF}${js}${trailingComma}${currentLF}}`;
+        return `{${nextLF}${js}${trailingComma}${LF}}`;
     }
 }
 const UNESCAPE = {

package/esm/src/parser/jsp.js

@@ -1,5 +1,5 @@
+import { Store } from "../store.js";
 import { Scriptlet } from "./scriptlet.js";
-import { StackStore } from "../stack-store.js";
 import { Tag } from "./tag.js";
 /**
  * Parser for JSP document
@@ -40,7 +40,7 @@ const insideRE = `[^"']|${stringRE}`;
 const tagRegExp = new RegExp(`(</?${nameRE}:(?:${insideRE})*?>)|(<%(?:${insideRE})*?%>)`, "s");
 export const jspToJS = (app, src, option) => {
     const root = new Tag(app);
-    const tree = new StackStore(root);
+    const tree = new Store(root);
     const array = src.split(tagRegExp);
     for (let i = 0; i < array.length; i++) {
         const i3 = i % 3;

package/esm/src/parser/tag.js

@@ -1,5 +1,5 @@
-import { Text } from "./text.js";
 import { Attr } from "./attr.js";
+import { Text } from "./text.js";
 const emptyText = {
     '""': true,
     "''": true,
@@ -31,13 +31,14 @@ export class Tag {
     getBodyJS(option) {
         const { app } = this;
         const { indent, trimSpaces, vName } = app.options;
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
+        const nextOption = { SP, LF: nextLF };
         const { children } = this;
         const args = children.map(item => {
             if (isTranspiler(item)) {
-                return item.toJS({ LF: nextLF });
+                return item.toJS(nextOption);
             }
             else if (!/\S/.test(item)) {
                 // item with only whitespace
@@ -50,7 +51,7 @@ export class Tag {
                     item = item.replace(/^[ \t]+/s, " ");
                     item = item.replace(/[ \t]+$/s, " ");
                 }
-                let js = new Text(app, item).toJS({ LF: nextLF });
+                let js = new Text(app, item).toJS(nextOption);
                 if (/\(.+?\)|\$\{.+?}/s.test(js)) {
                     js = `${vName} => ${js}`; // array function
                 }
@@ -72,11 +73,11 @@ export class Tag {
                 args[idx] += ",";
             }
             else if (idx === last && isComment) {
-                args[idx] += currentLF;
+                args[idx] += LF;
             }
         });
         const bodyL = /^`\n/s.test(args.at(0)) ? "" : nextLF;
-        const bodyR = /(\n`|[)\s])$/s.test(args.at(-1)) ? "" : currentLF;
+        const bodyR = /(\n`|[)\s])$/s.test(args.at(-1)) ? "" : LF;
         return bodyL + args.join(nextLF) + bodyR;
     }
     /**
@@ -95,13 +96,13 @@ export class Tag {
         const commentJS = this.getCommentJS(option);
         const attr = new Attr(app, this.src);
         const body = this.getBodyJS(option);
-        const spaces = +indent ? " ".repeat(+indent) : (indent ?? "");
-        const currentLF = option?.LF ?? "\n";
-        const nextLF = currentLF + spaces;
-        const tagOption = { LF: (body ? nextLF : currentLF) };
+        const SP = option?.SP ?? (("string" === typeof indent) ? indent : (+indent ? " ".repeat(+indent) : ""));
+        const LF = option?.LF ?? "\n";
+        const nextLF = LF + SP;
+        const nextOption = { SP, LF: (body ? nextLF : LF) };
         const type = `parse.tag.${tagName}`;
-        const def = { app, name: tagName, attr, body, LF: currentLF, nextLF };
-        const tagJS = app.process(type, def) ?? this.getTagJS(def, tagOption);
+        const def = { app, name: tagName, attr, body, LF: LF, nextLF };
+        const tagJS = app.process(type, def) ?? this.getTagJS(def, nextOption);
         return commentJS ? commentJS + tagJS : tagJS;
     }
     getCommentJS(option) {
@@ -117,10 +118,13 @@ export class Tag {
         const attrRaw = def.attr.toJS(option);
         // transpile attributes to array function if they include variables
         const hasVars = /\(.+?\)|\$\{.+?}/s.test(attrRaw);
-        const attrJS = hasVars ? `${vName} => (${attrRaw})` : attrRaw;
+        const attrArg = hasVars ? `, ${vName} => (${attrRaw})` : `, ${attrRaw}`;
         const nameJS = JSON.stringify(tagName);
         const hasAttr = /:/.test(attrRaw);
-        const restJS = def.body ? (`, ${attrJS}, ${def.body}`) : (hasAttr ? `, ${attrJS}` : "");
+        let bodyArg = def.body;
+        if (bodyArg)
+            bodyArg = ((/^\n/.test(bodyArg)) ? "," : ", ") + bodyArg;
+        const restJS = bodyArg ? (attrArg + bodyArg) : (hasAttr ? attrArg : "");
         return `${nspName}.tag(${nameJS}${restJS})`;
     }
 }

package/esm/src/store.js

@@ -0,0 +1,32 @@
+/**
+ * The Store class was implemented using a stack {stack: P[]} at first.
+ * Now it was changed to a linked list to allow access to the parent.
+ */
+export class Store {
+    constructor(value) {
+        this.item = { value };
+    }
+    open(value) {
+        this.item = { parent: this.item, value };
+    }
+    close() {
+        const item = this.item;
+        this.item = item.parent;
+        return item.value;
+    }
+    get() {
+        return this.item.value;
+    }
+    set(value) {
+        this.item.value = value;
+    }
+    find(test) {
+        let item = this.item;
+        while (item) {
+            if (test(item.value)) {
+                return item.value;
+            }
+            item = item.parent;
+        }
+    }
+}

package/esm/src/taglib.js

@@ -1,15 +1,43 @@
 import { toXML } from "to-xml";
+const isTagCon = (v) => ("function" === typeof v?.prototype?.render);
+const tagConToTagFn = (Tag) => {
+    return (tag) => {
+        return (context) => {
+            const result = new Tag(tag, context).render();
+            if (result)
+                return result;
+        };
+    };
+};
 export function addTagLib(tagLibDef) {
     const { fnMap, tagMap } = this;
     const { ns, fn, tag } = tagLibDef;
     if (fn) {
         for (const name in fn) {
-            fnMap.set(`${ns}:${name}`, fn[name]);
+            const impl = fn[name];
+            if (typeof impl === "function") {
+                // FnFn is called with App instance as this
+                fnMap.set(`${ns}:${name}`, impl.bind(this));
+            }
+            else if (impl != null) {
+                throw new Error(`Invalid taglib implementation: \${${ns}:${name}()}`);
+            }
         }
     }
     if (tag) {
         for (const name in tag) {
-            tagMap.set(`${ns}:${name}`, tag[name]);
+            const impl = tag[name];
+            if (isTagCon(impl)) {
+                // NSP.TagCon
+                tagMap.set(`${ns}:${name}`, tagConToTagFn(impl));
+            }
+            else if (typeof impl === "function") {
+                // NSP.TagFn
+                tagMap.set(`${ns}:${name}`, impl);
+            }
+            else if (impl != null) {
+                throw new Error(`Invalid taglib implementation: <${ns}:${name}>`);
+            }
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nsp-server-pages",
   "description": "NSP JavaScript Server Pages for Node.js",
-  "version": "0.2.0",
+  "version": "0.2.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.6",
+    "@types/node": "^20.5.7",
     "mocha": "^10.2.0",
     "typescript": "^5.2.2"
   },

package/types/index.d.ts

@@ -19,6 +19,8 @@ export declare namespace NSP {
 
     type TagFn<A, T = any> = (tag: TagDef<A, T>) => (NodeFn<T> | VoidFn<T>);
 
+    type TagCon<A, T = any> = { new(tag: NSP.TagDef<A>, context: T): TagClass };
+
     type LoaderFn = (path: string) => Promise<NodeFn<any> | undefined>;
 
     type Strings = string | Promise<string> | Strings[];
@@ -166,7 +168,11 @@ export declare namespace NSP {
         /**
          * tags
          */
-        tag?: { [name: string]: TagFn<any> };
+        tag?: { [name: string]: TagFn<any> | TagCon<any> };
+    }
+
+    interface TagClass {
+        render(): string | Promise<string> | void | Promise<void>;
     }
 
     interface StackStore<P> {
@@ -198,6 +204,7 @@ export declare namespace NSP {
 
     interface ToJSOption {
         LF?: string;
+        SP?: string;
     }
 
     interface Transpiler {

package/cjs/src/stack-store.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StackStore = void 0;
-class StackStore {
-    constructor(value) {
-        this.stack = [];
-        if (arguments.length) {
-            this.set(value);
-        }
-    }
-    open(value) {
-        this.stack.unshift(value);
-    }
-    close() {
-        return this.stack.shift();
-    }
-    get() {
-        return this.stack[0];
-    }
-    set(value) {
-        this.stack[0] = value;
-    }
-    find(test) {
-        for (const data of this.stack) {
-            if (test(data)) {
-                return data;
-            }
-        }
-    }
-}
-exports.StackStore = StackStore;

package/esm/src/stack-store.js

@@ -1,27 +0,0 @@
-export class StackStore {
-    constructor(value) {
-        this.stack = [];
-        if (arguments.length) {
-            this.set(value);
-        }
-    }
-    open(value) {
-        this.stack.unshift(value);
-    }
-    close() {
-        return this.stack.shift();
-    }
-    get() {
-        return this.stack[0];
-    }
-    set(value) {
-        this.stack[0] = value;
-    }
-    find(test) {
-        for (const data of this.stack) {
-            if (test(data)) {
-                return data;
-            }
-        }
-    }
-}