nsp-server-pages 0.2.2 → 0.2.4

package/cjs/src/app.js

@@ -78,7 +78,7 @@ 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;

package/cjs/src/loaders.js

@@ -34,7 +34,7 @@ class JspLoader extends BaseLoader {
             timeout: 1000,
         })(async (path) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${path}`);
+            app.log(`loading JSP: ${path}`);
             const text = await fs_1.promises.readFile(path, "utf8");
             return app.parse(text).toFn();
         });
@@ -64,7 +64,7 @@ class JsLoader extends BaseLoader {
             timeout: 1000,
         })(async (file) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${file}`);
+            app.log(`loading JS: ${file}`);
             const module = await Promise.resolve(`${file}`).then(s => require(s));
             const name = getName(file);
             const fn = module[name];
@@ -80,8 +80,8 @@ class JsLoader extends BaseLoader {
     }
     async load(file) {
         file = file?.replace(/\.jsp$/, ".js");
-        // valid only for .js files
-        if (!/\.[cm]?js$/.test(file))
+        // valid only for .js-like files
+        if (!/\.(cjs|js|mjs|ts)$/.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))
@@ -110,8 +110,8 @@ class FileLoader extends BaseLoader {
         });
     }
     async load(file) {
-        // disabled for JSP, JS and image files
-        if (/\.(jsp|[cm]?js|png|gif|jpe?g)$/i.test(file))
+        // disabled for JSP, JS, TS and image files
+        if (/\.(jsp|cjs|js|mjs|ts|png|gif|jpe?g|webp)$/i.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))

package/cjs/src/mount.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.load = exports.mount = void 0;
+exports.mount = mount;
+exports.load = load;
 function mount(match, fn) {
     const test = ("string" !== typeof match) ? match : {
         test: ((path) => path.startsWith(match))
@@ -10,7 +11,6 @@ function mount(match, fn) {
             return fn(path);
     });
 }
-exports.mount = mount;
 async function load(path) {
     const { loaders } = this;
     const search = path.replace(/^[^?]*\??/, "");
@@ -31,4 +31,3 @@ async function load(path) {
         return fn(context);
     };
 }
-exports.load = load;

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

@@ -46,6 +46,7 @@ const jspToJS = (app, src, option) => {
     const root = new tag_js_1.Tag(app);
     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/taglib.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareTag = exports.addTagLib = void 0;
+exports.addTagLib = addTagLib;
+exports.prepareTag = prepareTag;
 const to_xml_1 = require("to-xml");
 const isTagCon = (v) => ("function" === typeof v?.prototype?.render);
 const tagConToTagFn = (Tag) => {
@@ -44,7 +45,6 @@ function addTagLib(tagLibDef) {
         }
     }
 }
-exports.addTagLib = addTagLib;
 function prepareTag(name, attr, body) {
     const { tagMap } = this;
     const tagFn = tagMap.get(name) || defaultTagFn;
@@ -52,7 +52,6 @@ function prepareTag(name, attr, body) {
     const tagDef = { name, app: this, attr: attrFn, body };
     return tagFn(tagDef);
 }
-exports.prepareTag = prepareTag;
 const defaultTagFn = (tagDef) => {
     const { name } = tagDef;
     // tagDef.app.log(`Unknown tag: ${name}`);

package/esm/src/app.js

@@ -75,7 +75,7 @@ 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;

package/esm/src/loaders.js

@@ -31,7 +31,7 @@ export class JspLoader extends BaseLoader {
             timeout: 1000,
         })(async (path) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${path}`);
+            app.log(`loading JSP: ${path}`);
             const text = await fs.readFile(path, "utf8");
             return app.parse(text).toFn();
         });
@@ -60,7 +60,7 @@ export class JsLoader extends BaseLoader {
             timeout: 1000,
         })(async (file) => {
             const app = this.appRef.deref();
-            app.log(`loading: ${file}`);
+            app.log(`loading JS: ${file}`);
             const module = await import(file);
             const name = getName(file);
             const fn = module[name];
@@ -76,8 +76,8 @@ export class JsLoader extends BaseLoader {
     }
     async load(file) {
         file = file?.replace(/\.jsp$/, ".js");
-        // valid only for .js files
-        if (!/\.[cm]?js$/.test(file))
+        // valid only for .js-like files
+        if (!/\.(cjs|js|mjs|ts)$/.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))
@@ -105,8 +105,8 @@ export class FileLoader extends BaseLoader {
         });
     }
     async load(file) {
-        // disabled for JSP, JS and image files
-        if (/\.(jsp|[cm]?js|png|gif|jpe?g)$/i.test(file))
+        // disabled for JSP, JS, TS and image files
+        if (/\.(jsp|cjs|js|mjs|ts|png|gif|jpe?g|webp)$/i.test(file))
             return;
         // skip when file does not exist
         if (!await this.isFile(file))

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

@@ -42,6 +42,7 @@ export const jspToJS = (app, src, option) => {
     const root = new Tag(app);
     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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nsp-server-pages",
   "description": "NSP JavaScript Server Pages for Node.js",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "author": "@kawanet",
   "bugs": {
     "url": "https://github.com/kawanet/nsp-server-pages/issues"
@@ -11,11 +11,11 @@
     "to-xml": "^0.1.11"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
-    "mocha": "^10.2.0",
-    "typescript": "^5.2.2"
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^25.2.0",
+    "mocha": "^11.7.5",
+    "nyc": "^17.1.0",
+    "typescript": "^5.9.3"
   },
   "exports": {
     "import": {
@@ -49,6 +49,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,7 +19,7 @@ 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 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>;