nsp-server-pages 0.2.1 → 0.2.2

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/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/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/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/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.2",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"

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> {

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