nsp-server-pages 0.2.1 → 0.2.3

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 = [];
@@ -78,14 +78,14 @@ class App {
         return loader.load(file);
     }
     store(context, key) {
-        if ("object" !== typeof context && context == null) {
+        if ("object" !== typeof context || context == null) {
             throw new Error("Context must be an object");
         }
         const { storeKey } = this.options;
         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

@@ -58,10 +58,10 @@ class Attr {
         const nextLF = LF + SP;
         const keys = this.keys();
         const items = keys.map(key => {
+            const value = this.get(key);
             if (!isSafeKey(key)) {
                 key = JSON.stringify(key);
             }
-            const value = this.get(key);
             return `${key}: ${value}`;
         });
         // no arguments

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,8 +44,9 @@ 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);
+    const { vName } = app.options;
     for (let i = 0; i < array.length; i++) {
         const i3 = i % 3;
         let str = array[i];
@@ -55,7 +56,7 @@ const jspToJS = (app, src, option) => {
             // close-tag
             if (tag.isClose()) {
                 const closed = tree.close();
-                if (!closed) {
+                if (!closed?.tagName) {
                     throw new Error(`invalid closing tag: </${tag.tagName}>`);
                 }
                 if (closed.tagName !== tag.tagName) {
@@ -72,7 +73,13 @@ const jspToJS = (app, src, option) => {
         else if (i3 === 2 && str) {
             // <% scriptlet %>
             const item = new scriptlet_js_1.Scriptlet(app, str);
-            tree.get().append(item);
+            const toJS = (option) => {
+                const js = item.toJS(option);
+                if (/^\/\//.test(js))
+                    return js; // comment
+                return `${vName} => ${js}`; // array function
+            };
+            tree.get().append({ toJS });
         }
         else if (i3 === 0) {
             // text node

package/cjs/src/parser/scriptlet.js

@@ -40,7 +40,7 @@ class Scriptlet {
         }
         app.log(`${type} found: ${src?.substring(0, 1000)}`);
         src = /`|\$\{/.test(src) ? JSON.stringify(src) : "`" + src + "`";
-        src = `${vName} => ${nspName}.process("${type}", ${src}, ${vName})`;
+        src = `${nspName}.process("${type}", ${src}, ${vName})`;
         return src;
     }
 }

package/cjs/src/parser/tag.js

@@ -104,7 +104,7 @@ class Tag {
         const nextLF = LF + SP;
         const nextOption = { SP, LF: (body ? nextLF : LF) };
         const type = `parse.tag.${tagName}`;
-        const def = { app, name: tagName, attr, body, LF: LF, nextLF };
+        const def = { app, name: tagName, attr, body, LF, nextLF };
         const tagJS = app.process(type, def) ?? this.getTagJS(def, nextOption);
         return commentJS ? commentJS + tagJS : tagJS;
     }

package/cjs/src/parser/text.js

@@ -52,7 +52,11 @@ const textToJS = (app, src, option) => {
             value = value.replace(/\s*}$/s, "");
             const item = new el_js_1.EL(app, value);
             if (isAsync) {
-                items.push({ toJS: (option) => `await ${item.toJS(option)}` });
+                const toJS = (option) => {
+                    const js = item.toJS(option);
+                    return `await ${js}`;
+                };
+                items.push({ toJS });
             }
             else {
                 items.push(item);

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 = [];
@@ -75,14 +75,14 @@ export class App {
         return loader.load(file);
     }
     store(context, key) {
-        if ("object" !== typeof context && context == null) {
+        if ("object" !== typeof context || context == null) {
             throw new Error("Context must be an object");
         }
         const { storeKey } = this.options;
         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

@@ -55,10 +55,10 @@ export class Attr {
         const nextLF = LF + SP;
         const keys = this.keys();
         const items = keys.map(key => {
+            const value = this.get(key);
             if (!isSafeKey(key)) {
                 key = JSON.stringify(key);
             }
-            const value = this.get(key);
             return `${key}: ${value}`;
         });
         // no arguments

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,8 +40,9 @@ 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);
+    const { vName } = app.options;
     for (let i = 0; i < array.length; i++) {
         const i3 = i % 3;
         let str = array[i];
@@ -51,7 +52,7 @@ export const jspToJS = (app, src, option) => {
             // close-tag
             if (tag.isClose()) {
                 const closed = tree.close();
-                if (!closed) {
+                if (!closed?.tagName) {
                     throw new Error(`invalid closing tag: </${tag.tagName}>`);
                 }
                 if (closed.tagName !== tag.tagName) {
@@ -68,7 +69,13 @@ export const jspToJS = (app, src, option) => {
         else if (i3 === 2 && str) {
             // <% scriptlet %>
             const item = new Scriptlet(app, str);
-            tree.get().append(item);
+            const toJS = (option) => {
+                const js = item.toJS(option);
+                if (/^\/\//.test(js))
+                    return js; // comment
+                return `${vName} => ${js}`; // array function
+            };
+            tree.get().append({ toJS });
         }
         else if (i3 === 0) {
             // text node

package/esm/src/parser/scriptlet.js

@@ -37,7 +37,7 @@ export class Scriptlet {
         }
         app.log(`${type} found: ${src?.substring(0, 1000)}`);
         src = /`|\$\{/.test(src) ? JSON.stringify(src) : "`" + src + "`";
-        src = `${vName} => ${nspName}.process("${type}", ${src}, ${vName})`;
+        src = `${nspName}.process("${type}", ${src}, ${vName})`;
         return src;
     }
 }

package/esm/src/parser/tag.js

@@ -101,7 +101,7 @@ export class Tag {
         const nextLF = LF + SP;
         const nextOption = { SP, LF: (body ? nextLF : LF) };
         const type = `parse.tag.${tagName}`;
-        const def = { app, name: tagName, attr, body, LF: LF, nextLF };
+        const def = { app, name: tagName, attr, body, LF, nextLF };
         const tagJS = app.process(type, def) ?? this.getTagJS(def, nextOption);
         return commentJS ? commentJS + tagJS : tagJS;
     }

package/esm/src/parser/text.js

@@ -48,7 +48,11 @@ const textToJS = (app, src, option) => {
             value = value.replace(/\s*}$/s, "");
             const item = new EL(app, value);
             if (isAsync) {
-                items.push({ toJS: (option) => `await ${item.toJS(option)}` });
+                const toJS = (option) => {
+                    const js = item.toJS(option);
+                    return `await ${js}`;
+                };
+                items.push({ toJS });
             }
             else {
                 items.push(item);

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.1",
+  "version": "0.2.3",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"
@@ -13,8 +13,9 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.5.8",
     "mocha": "^10.2.0",
+    "nyc": "^15.1.0",
     "typescript": "^5.2.2"
   },
   "exports": {
@@ -49,6 +50,7 @@
   },
   "scripts": {
     "build": "make all",
+    "coverage": "npx tsc -p tsconfig-cjs.json && npx nyc npx mocha cjs/test",
     "fixpack": "fixpack",
     "prepack": "make clean test-title all test",
     "test": "make test"

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, P extends TagClass = TagClass> = { new(tag: NSP.TagDef<A>, context: T): P, prototype: P };
+
     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> {

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