nadesiko3 3.7.19 → 3.7.21

package/src/cnako3mod.mjs

@@ -8,7 +8,6 @@ import { exec } from 'node:child_process';
 import path from 'node:path';
 import url from 'node:url';
 import fse from 'fs-extra';
-import fetch from 'node-fetch';
 import { NakoCompiler, newCompilerOptions } from '../core/src/nako3.mjs';
 import { NakoImportError } from '../core/src/nako_errors.mjs';
 import { NakoGenOptions } from '../core/src/nako_gen.mjs';
@@ -238,7 +237,7 @@ export class CNako3 extends NakoCompiler {
         // or 以下のコピーだと依存ファイルがコピーされない package.jsonを見てコピーする必要がある
         const orgModule = path.join(__dirname, '..', 'node_modules');
         const dirNodeModules = path.join(path.dirname(opt.output), 'node_modules');
-        const modlist = ['fs-extra', 'iconv-lite', 'opener', 'node-fetch', 'shell-quote'];
+        const modlist = ['fs-extra', 'iconv-lite', 'opener', 'shell-quote'];
         const copied = {};
         // 再帰的に必要なモジュールをコピーする
         const copyModule = (mod) => {

package/src/cnako3mod.mts

@@ -11,7 +11,6 @@ import path from 'node:path'
 import url from 'node:url'
 import fse from 'fs-extra'
 
-import fetch from 'node-fetch'
 import { NakoCompiler, LoaderTool, newCompilerOptions } from '../core/src/nako3.mjs'
 import { NakoImportError } from '../core/src/nako_errors.mjs'
 
@@ -278,7 +277,7 @@ export class CNako3 extends NakoCompiler {
     // or 以下のコピーだと依存ファイルがコピーされない package.jsonを見てコピーする必要がある
     const orgModule = path.join(__dirname, '..', 'node_modules')
     const dirNodeModules = path.join(path.dirname(opt.output), 'node_modules')
-    const modlist = ['fs-extra', 'iconv-lite', 'opener', 'node-fetch', 'shell-quote']
+    const modlist = ['fs-extra', 'iconv-lite', 'opener', 'shell-quote']
     const copied: { [key: string]: boolean } = {}
     // 再帰的に必要なモジュールをコピーする
     const copyModule = (mod: string) => {

package/src/nako_version.mjs

@@ -1,8 +1,8 @@
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const nakoVersion = {
-    version: '3.7.19',
+    version: '3.7.21',
     major: 3,
     minor: 7,
-    patch: 19
+    patch: 21
 };
 export default nakoVersion;

package/src/nako_version.mts

@@ -11,9 +11,9 @@ export interface NakoVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const nakoVersion: NakoVersion = {
-  version: '3.7.19',
+  version: '3.7.21',
   major: 3,
   minor: 7,
-  patch: 19
+  patch: 21
 }
 export default nakoVersion

package/src/plugin_httpserver.mjs

@@ -2,9 +2,11 @@
 import fs from 'fs';
 import http from 'http';
 import path from 'path';
+import os from 'os';
 // 定数
 const HTTPSERVER_LOGID = '[簡易HTTPサーバ]';
 const ERR_NOHTTPSERVER = '最初に『簡易HTTPサーバ起動時』を実行してサーバを起動する必要があります。';
+const MAX_BODY_SIZE_POST = 10 * 1024 * 1024; // 10MB
 class EasyURLItem {
     constructor(action) {
         this.action = action;
@@ -30,19 +32,86 @@ class EasyURLDispather {
         const params = this.parseURL(req.url);
         const url = params['?URL'];
         this.sys.__setSysVar('GETデータ', params);
-        // URLの一致を調べてアクションを実行
-        const filtered = this.items.filter(v => url.startsWith(v.url)).sort((a, b) => { return b.url.length - a.url.length; });
-        for (const it of filtered) {
-            let isBreak = false;
-            if (it.action === 'static') {
-                isBreak = this.doRequestStatic(req, res, it);
-            }
-            else if (it.action === 'callback') {
-                isBreak = this.doRequestCallback(req, res, it);
-            }
-            if (isBreak) {
-                break;
+        const runDispatcher = (postData) => {
+            this.sys.__setSysVar('POSTデータ', postData);
+            // URLの一致を調べてアクションを実行
+            const filtered = this.items.filter(v => url.startsWith(v.url)).sort((a, b) => { return b.url.length - a.url.length; });
+            for (const it of filtered) {
+                let isBreak = false;
+                if (it.action === 'static') {
+                    isBreak = this.doRequestStatic(req, res, it);
+                }
+                else if (it.action === 'callback') {
+                    isBreak = this.doRequestCallback(req, res, it);
+                }
+                if (isBreak) {
+                    break;
+                }
             }
+        };
+        if (req.method === 'POST') {
+            let bodySize = 0;
+            const chunks = [];
+            req.on('data', (chunk) => {
+                bodySize += chunk.length;
+                if (bodySize > MAX_BODY_SIZE_POST) {
+                    res.statusCode = 413;
+                    res.end('Request entity too large.');
+                    req.destroy();
+                    return;
+                }
+                chunks.push(chunk);
+            });
+            req.on('end', async () => {
+                const bodyBuffer = Buffer.concat(chunks);
+                let postData = {};
+                let filesData = [];
+                const contentType = req.headers['content-type'] || '';
+                try {
+                    if (contentType.indexOf('multipart/form-data') >= 0) {
+                        const boundaryMatch = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/);
+                        if (boundaryMatch) {
+                            const boundary = (boundaryMatch[1] || boundaryMatch[2] || '').trim();
+                            const parsed = await parseMultipart(bodyBuffer, boundary);
+                            postData = parsed.fields;
+                            filesData = parsed.files;
+                        }
+                    }
+                    else if (contentType.indexOf('application/json') >= 0) {
+                        const bodyStr = bodyBuffer.toString('utf-8');
+                        try {
+                            postData = JSON.parse(bodyStr);
+                        }
+                        catch (e) {
+                            postData = bodyStr;
+                        }
+                    }
+                    else if (contentType.indexOf('application/x-www-form-urlencoded') >= 0) {
+                        const bodyStr = bodyBuffer.toString('utf-8');
+                        const searchParams = new URLSearchParams(bodyStr);
+                        const obj = {};
+                        for (const [key, val] of searchParams.entries()) {
+                            obj[key] = val;
+                        }
+                        postData = obj;
+                    }
+                    else {
+                        postData = bodyBuffer.toString('utf-8');
+                    }
+                }
+                catch (err) {
+                    console.error(`${HTTPSERVER_LOGID} アップロード保存エラー: ${err.message}`);
+                    res.statusCode = 500;
+                    res.end('Failed to save upload file.');
+                    return;
+                }
+                this.sys.__setSysVar('FILESデータ', filesData);
+                runDispatcher(postData);
+            });
+        }
+        else {
+            this.sys.__setSysVar('FILESデータ', []);
+            runDispatcher({});
         }
     }
     return404(res) {
@@ -51,7 +120,9 @@ class EasyURLDispather {
         res.end('<html><meta charset="utf-8"><body><h1>404 見当たりません。</h1></body></html>');
     }
     doRequestStatic(req, res, it) {
-        let url = ('' + req.url).replace(/\.\./g, ''); // URLの..を許可しない
+        const params = this.parseURL(req.url);
+        const rawUrl = params['?URL'] || '';
+        let url = ('' + rawUrl).replace(/\.\./g, ''); // URLの..を許可しない
         url = url.substring(it.url.length);
         let fpath = path.join(it.path, url);
         console.log('FILE=', fpath);
@@ -114,11 +185,106 @@ class EasyURLDispather {
         return params;
     }
 }
+async function parseMultipart(body, boundary) {
+    const fields = {};
+    const files = [];
+    const boundaryBuffer = Buffer.from('--' + boundary);
+    let pos = 0;
+    const parts = [];
+    while (true) {
+        const nextIdx = body.indexOf(boundaryBuffer, pos);
+        if (nextIdx === -1) {
+            break;
+        }
+        if (pos > 0) {
+            let endPos = nextIdx;
+            if (body[nextIdx - 2] === 13 && body[nextIdx - 1] === 10) {
+                endPos -= 2;
+            }
+            else if (body[nextIdx - 1] === 10) {
+                endPos -= 1;
+            }
+            parts.push(body.subarray(pos, endPos));
+        }
+        pos = nextIdx + boundaryBuffer.length;
+    }
+    for (const part of parts) {
+        if (part.length === 0) {
+            continue;
+        }
+        let start = 0;
+        if (part[0] === 13 && part[1] === 10) {
+            start = 2;
+        }
+        else if (part[0] === 10) {
+            start = 1;
+        }
+        const headerEnd = part.indexOf(Buffer.from('\r\n\r\n'), start);
+        let bodyStart = 0;
+        let headerStr = '';
+        if (headerEnd !== -1) {
+            headerStr = part.toString('utf-8', start, headerEnd);
+            bodyStart = headerEnd + 4;
+        }
+        else {
+            const headerEndLf = part.indexOf(Buffer.from('\n\n'), start);
+            if (headerEndLf !== -1) {
+                headerStr = part.toString('utf-8', start, headerEndLf);
+                bodyStart = headerEndLf + 2;
+            }
+        }
+        if (bodyStart === 0) {
+            continue;
+        }
+        const partBody = part.subarray(bodyStart);
+        const headers = {};
+        const lines = headerStr.split(/\r?\n/);
+        for (const line of lines) {
+            const idx = line.indexOf(':');
+            if (idx !== -1) {
+                const key = line.substring(0, idx).trim().toLowerCase();
+                const val = line.substring(idx + 1).trim();
+                headers[key] = val;
+            }
+        }
+        const contentDisposition = headers['content-disposition'] || '';
+        const nameMatch = contentDisposition.match(/name="([^"]+)"/);
+        const filenameMatch = contentDisposition.match(/filename="([^"]+)"/);
+        if (nameMatch) {
+            const name = nameMatch[1];
+            if (filenameMatch) {
+                const filename = filenameMatch[1];
+                const safeFilename = path.basename(filename).replace(/[\\/]/g, '_');
+                const contentType = headers['content-type'] || 'application/octet-stream';
+                const uploadDir = path.join(os.tmpdir(), 'nako3-plugin_httpserver_upload');
+                if (!fs.existsSync(uploadDir)) {
+                    await fs.promises.mkdir(uploadDir, { recursive: true });
+                }
+                const uniqueName = Date.now() + '_' + Math.random().toString(36).substring(2, 8) + '_' + safeFilename;
+                const filepath = path.join(uploadDir, uniqueName);
+                await fs.promises.writeFile(filepath, partBody);
+                files.push({
+                    fieldName: name,
+                    name: filename,
+                    path: filepath,
+                    size: partBody.length,
+                    type: contentType
+                });
+            }
+            else {
+                fields[name] = partBody.toString('utf-8');
+            }
+        }
+    }
+    return { files, fields };
+}
 // MIMEタイプ
 const MimeTypes = {
     '.html': 'text/html',
     '.css': 'text/css',
     '.js': 'text/javascript',
+    '.mjs': 'text/javascript',
+    '.nako3': 'text/nadesiko3',
     '.png': 'image/png',
     '.gif': 'image/gif',
     '.svg': 'svg+xml'
@@ -168,6 +334,8 @@ const PluginHttpServer = {
     },
     // @簡易HTTPサーバ
     'GETデータ': { type: 'const', value: '' }, // @GETでーた
+    'POSTデータ': { type: 'const', value: '' }, // @POSTでーた
+    'FILESデータ': { type: 'const', value: '' }, // @FILESでーた
     '簡易HTTPサーバ起動時': {
         type: 'func',
         josi: [['を'], ['の', 'で']],
@@ -179,6 +347,9 @@ const PluginHttpServer = {
             dp.server = http.createServer((req, res) => {
                 dp.doRequest(req, res);
             });
+            dp.server.on('error', (err) => {
+                console.error(`${HTTPSERVER_LOGID} エラー: ${err.message}`);
+            });
             // サーバ起動
             dp.server.listen(port, () => {
                 console.log(`${HTTPSERVER_LOGID} ポート番号(${port})で監視開始`);

package/src/plugin_httpserver.mts

@@ -2,10 +2,13 @@
 import fs from 'fs'
 import http from 'http'
 import path from 'path'
+import os from 'os'
 
 // 定数
 const HTTPSERVER_LOGID = '[簡易HTTPサーバ]'
 const ERR_NOHTTPSERVER = '最初に『簡易HTTPサーバ起動時』を実行してサーバを起動する必要があります。'
+const MAX_BODY_SIZE_POST = 10 * 1024 * 1024 // 10MB
+      
 // オブジェクト
 type EasyURLActionType = 'static' | 'callback'
 type EasyURLCallback = (req: any, res: any) => void
@@ -49,16 +52,79 @@ class EasyURLDispather {
     const params = this.parseURL(req.url)
     const url = params['?URL']
     this.sys.__setSysVar('GETデータ', params)
-    // URLの一致を調べてアクションを実行
-    const filtered = this.items.filter(v => url.startsWith(v.url)).sort((a, b) => { return b.url.length - a.url.length })
-    for (const it of filtered) {
-      let isBreak = false
-      if (it.action === 'static') {
-        isBreak = this.doRequestStatic(req, res, it)
-      } else if (it.action === 'callback') {
-        isBreak = this.doRequestCallback(req, res, it)
+
+    const runDispatcher = (postData: any) => {
+      this.sys.__setSysVar('POSTデータ', postData)
+      // URLの一致を調べてアクションを実行
+      const filtered = this.items.filter(v => url.startsWith(v.url)).sort((a, b) => { return b.url.length - a.url.length })
+      for (const it of filtered) {
+        let isBreak = false
+        if (it.action === 'static') {
+          isBreak = this.doRequestStatic(req, res, it)
+        } else if (it.action === 'callback') {
+          isBreak = this.doRequestCallback(req, res, it)
+        }
+        if (isBreak) { break }
       }
-      if (isBreak) { break }
+    }
+
+    if (req.method === 'POST') {
+      let bodySize = 0
+      const chunks: Buffer[] = []
+      req.on('data', (chunk: Buffer) => {
+        bodySize += chunk.length
+        if (bodySize > MAX_BODY_SIZE_POST) {
+          res.statusCode = 413
+          res.end('Request entity too large.')
+          req.destroy()
+          return
+        }
+        chunks.push(chunk)
+      })
+      req.on('end', async() => {
+        const bodyBuffer = Buffer.concat(chunks)
+        let postData: any = {}
+        let filesData: any[] = []
+        const contentType = req.headers['content-type'] || ''
+        try {
+          if (contentType.indexOf('multipart/form-data') >= 0) {
+            const boundaryMatch = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/)
+            if (boundaryMatch) {
+              const boundary = (boundaryMatch[1] || boundaryMatch[2] || '').trim()
+              const parsed = await parseMultipart(bodyBuffer, boundary)
+              postData = parsed.fields
+              filesData = parsed.files
+            }
+          } else if (contentType.indexOf('application/json') >= 0) {
+            const bodyStr = bodyBuffer.toString('utf-8')
+            try {
+              postData = JSON.parse(bodyStr)
+            } catch (e) {
+              postData = bodyStr
+            }
+          } else if (contentType.indexOf('application/x-www-form-urlencoded') >= 0) {
+            const bodyStr = bodyBuffer.toString('utf-8')
+            const searchParams = new URLSearchParams(bodyStr)
+            const obj: any = {}
+            for (const [key, val] of searchParams.entries()) {
+              obj[key] = val
+            }
+            postData = obj
+          } else {
+            postData = bodyBuffer.toString('utf-8')
+          }
+        } catch (err: any) {
+          console.error(`${HTTPSERVER_LOGID} アップロード保存エラー: ${err.message}`)
+          res.statusCode = 500
+          res.end('Failed to save upload file.')
+          return
+        }
+        this.sys.__setSysVar('FILESデータ', filesData)
+        runDispatcher(postData)
+      })
+    } else {
+      this.sys.__setSysVar('FILESデータ', [])
+      runDispatcher({})
     }
   }
 
@@ -69,7 +135,9 @@ class EasyURLDispather {
   }
 
   doRequestStatic(req: any, res: any, it: EasyURLItem): boolean {
-    let url: string = ('' + req.url).replace(/\.\./g, '') // URLの..を許可しない
+    const params = this.parseURL(req.url)
+    const rawUrl = params['?URL'] || ''
+    let url: string = ('' + rawUrl).replace(/\.\./g, '') // URLの..を許可しない
     url = url.substring(it.url.length)
     let fpath = path.join(it.path, url)
     console.log('FILE=', fpath)
@@ -134,11 +202,104 @@ class EasyURLDispather {
     return params
   }
 }
+async function parseMultipart(body: Buffer, boundary: string): Promise<{ files: any[], fields: any }> {
+  const fields: any = {}
+  const files: any[] = []
+
+  const boundaryBuffer = Buffer.from('--' + boundary)
+  let pos = 0
+  const parts: Buffer[] = []
+
+  while (true) {
+    const nextIdx = body.indexOf(boundaryBuffer, pos)
+    if (nextIdx === -1) { break }
+    if (pos > 0) {
+      let endPos = nextIdx
+      if (body[nextIdx - 2] === 13 && body[nextIdx - 1] === 10) {
+        endPos -= 2
+      } else if (body[nextIdx - 1] === 10) {
+        endPos -= 1
+      }
+      parts.push(body.subarray(pos, endPos))
+    }
+    pos = nextIdx + boundaryBuffer.length
+  }
+
+  for (const part of parts) {
+    if (part.length === 0) { continue }
+    let start = 0
+    if (part[0] === 13 && part[1] === 10) { start = 2 }
+    else if (part[0] === 10) { start = 1 }
+
+    const headerEnd = part.indexOf(Buffer.from('\r\n\r\n'), start)
+    let bodyStart = 0
+    let headerStr = ''
+    if (headerEnd !== -1) {
+      headerStr = part.toString('utf-8', start, headerEnd)
+      bodyStart = headerEnd + 4
+    } else {
+      const headerEndLf = part.indexOf(Buffer.from('\n\n'), start)
+      if (headerEndLf !== -1) {
+        headerStr = part.toString('utf-8', start, headerEndLf)
+        bodyStart = headerEndLf + 2
+      }
+    }
+
+    if (bodyStart === 0) { continue }
+
+    const partBody = part.subarray(bodyStart)
+    const headers: any = {}
+    const lines = headerStr.split(/\r?\n/)
+    for (const line of lines) {
+      const idx = line.indexOf(':')
+      if (idx !== -1) {
+        const key = line.substring(0, idx).trim().toLowerCase()
+        const val = line.substring(idx + 1).trim()
+        headers[key] = val
+      }
+    }
+
+    const contentDisposition = headers['content-disposition'] || ''
+    const nameMatch = contentDisposition.match(/name="([^"]+)"/)
+    const filenameMatch = contentDisposition.match(/filename="([^"]+)"/)
+
+    if (nameMatch) {
+      const name = nameMatch[1]
+      if (filenameMatch) {
+        const filename = filenameMatch[1]
+        const safeFilename = path.basename(filename).replace(/[\\/]/g, '_')
+        const contentType = headers['content-type'] || 'application/octet-stream'
+
+        const uploadDir = path.join(os.tmpdir(), 'nako3-plugin_httpserver_upload')
+        if (!fs.existsSync(uploadDir)) {
+          await fs.promises.mkdir(uploadDir, { recursive: true })
+        }
+        const uniqueName = Date.now() + '_' + Math.random().toString(36).substring(2, 8) + '_' + safeFilename
+        const filepath = path.join(uploadDir, uniqueName)
+        await fs.promises.writeFile(filepath, partBody)
+
+        files.push({
+          fieldName: name,
+          name: filename,
+          path: filepath,
+          size: partBody.length,
+          type: contentType
+        })
+      } else {
+        fields[name] = partBody.toString('utf-8')
+      }
+    }
+  }
+
+  return { files, fields }
+}
 // MIMEタイプ
 const MimeTypes: any = {
   '.html': 'text/html',
   '.css': 'text/css',
   '.js': 'text/javascript',
+  '.mjs': 'text/javascript',
+  '.nako3': 'text/nadesiko3',
   '.png': 'image/png',
   '.gif': 'image/gif',
   '.svg': 'svg+xml'
@@ -184,6 +345,8 @@ const PluginHttpServer = {
   },
   // @簡易HTTPサーバ
   'GETデータ': { type: 'const', value: '' }, // @GETでーた
+  'POSTデータ': { type: 'const', value: '' }, // @POSTでーた
+  'FILESデータ': { type: 'const', value: '' }, // @FILESでーた
   '簡易HTTPサーバ起動時': { // @ポート番号PORTを指定して簡易HTTPサーバを起動して、CALLBACKを実行する。 // @かんいHTTPさーばきどうしたとき
     type: 'func',
     josi: [['を'], ['の', 'で']],
@@ -195,6 +358,9 @@ const PluginHttpServer = {
       dp.server = http.createServer((req: any, res: any) => {
         dp.doRequest(req, res)
       })
+      dp.server.on('error', (err: any) => {
+        console.error(`${HTTPSERVER_LOGID} エラー: ${err.message}`)
+      })
       // サーバ起動
       dp.server.listen(port, () => {
         console.log(`${HTTPSERVER_LOGID} ポート番号(${port})で監視開始`)

package/src/plugin_node.mjs

@@ -13,7 +13,6 @@ import url from 'node:url';
 import opener from 'opener';
 import iconv from 'iconv-lite';
 import shellQuote from 'shell-quote';
-import fetch, { FormData, Blob } from 'node-fetch';
 import fse from 'fs-extra';
 import { getEnv, isWindows, getCommandLineArgs } from './deno_wrapper.mjs';
 const __filename = url.fileURLToPath(import.meta.url);

package/src/plugin_node.mts

@@ -14,7 +14,6 @@ import url from 'node:url'
 import opener from 'opener'
 import iconv from 'iconv-lite'
 import shellQuote from 'shell-quote'
-import fetch, { FormData, Blob } from 'node-fetch'
 import fse from 'fs-extra'
 import { NakoSystem } from '../core/src/plugin_api.mjs'
 
@@ -699,7 +698,7 @@ export default {
     },
     return_none: true
   },
-  'ファイル上書コピー': { // @パスAをパスBへファイルコピーする(相手先に内容をマージしてコピー) // @ふぁいるうわがきこぴー
+  'ファイル上書コピー': { // @パスAをパスBへファイルコピーする(コピー先に内容をマージしてコピー) // @ふぁいるうわがきこぴー
     type: 'func',
     josi: [['から', 'を'], ['に', 'へ']],
     pure: true,
@@ -740,7 +739,7 @@ export default {
     },
     return_none: true
   },
-  'ファイル上書移動': { // @パスAをパスBへ移動する(相手先に内容をマージしてコピー後、元を削除) // @ふぁいるうわがきいどう
+  'ファイル上書移動': { // @パスAをパスBへ移動する(移動先に内容をマージしてコピー後、元を削除) // @ふぁいるうわがきいどう
     type: 'func',
     josi: [['から', 'を'], ['に', 'へ']],
     pure: true,

package/src/wnako3mod.mjs

@@ -236,6 +236,9 @@ function dirname(s) {
 }
 function resolveURL(base, s) {
     const baseA = base.split('/');
+    if (baseA.length > 0 && baseA[baseA.length - 1] === '') {
+        baseA.pop();
+    }
     const sA = s.split('/');
     for (const p of sA) {
         if (p === '') {

package/src/wnako3mod.mts

@@ -240,6 +240,9 @@ function dirname(s: string) {
 
 function resolveURL(base: string, s: string) {
   const baseA = base.split('/')
+  if (baseA.length > 0 && baseA[baseA.length - 1] === '') {
+    baseA.pop()
+  }
   const sA = s.split('/')
   for (const p of sA) {
     if (p === '') { continue }

package/test/common/wnako3mod_test.mjs

@@ -0,0 +1,48 @@
+import assert from 'assert'
+import { WebNakoCompiler } from '../../src/wnako3mod.mjs'
+
+describe('wnako3mod_test', () => {
+  let originalWindow
+
+  before(() => {
+    // window のモック
+    originalWindow = globalThis.window
+    globalThis.window = {
+      location: {
+        href: 'http://localhost:8888/index.html'
+      }
+    }
+  })
+
+  after(() => {
+    globalThis.window = originalWindow
+  })
+
+  it('resolvePath で baseDir が / のときの // スタートの不具合が修正されていること', () => {
+    const compiler = new WebNakoCompiler()
+    const token = { file: 'main', line: 1 }
+    
+    // http://localhost:8888/index.html から hoge.nako3 を取り込む想定
+    const result = compiler.resolvePath('hoge.nako3', token, '')
+    // 結果が /hoge.nako3 になるべき（//hoge.nako3 ではなく）
+    assert.strictEqual(result.filePath, '/hoge.nako3')
+  })
+
+  it('resolvePath で baseDir が /dir/ のとき', () => {
+    const compiler = new WebNakoCompiler()
+    const token = { file: 'main', line: 1 }
+    
+    globalThis.window.location.href = 'http://localhost:8888/dir/index.html'
+    const result = compiler.resolvePath('hoge.nako3', token, '')
+    assert.strictEqual(result.filePath, '/dir/hoge.nako3')
+  })
+
+  it('resolvePath で baseDir が /dir/subdir/ のとき', () => {
+    const compiler = new WebNakoCompiler()
+    const token = { file: 'main', line: 1 }
+    
+    globalThis.window.location.href = 'http://localhost:8888/dir/subdir/index.html'
+    const result = compiler.resolvePath('hoge.nako3', token, '')
+    assert.strictEqual(result.filePath, '/dir/subdir/hoge.nako3')
+  })
+})

package/test/node/package_json_test.mjs

@@ -0,0 +1,17 @@
+import fs from 'node:fs'
+import assert from 'node:assert'
+import { test } from 'node:test'
+
+test('package.json に node-fetch の依存がない', () => {
+  const pkgUrl = new URL('../../package.json', import.meta.url)
+  const pkg = JSON.parse(fs.readFileSync(pkgUrl, 'utf-8'))
+  const dependencySections = [
+    'dependencies',
+    'devDependencies',
+    'optionalDependencies',
+    'peerDependencies'
+  ]
+  for (const section of dependencySections) {
+    assert.equal(pkg[section]?.['node-fetch'], undefined, `${section} に node-fetch が含まれています`)
+  }
+})