create-yeow 0.2.68 → 0.2.71

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-yeow",
-    "version": "0.2.68",
+    "version": "0.2.71",
     "description": "Scaffold a Yeow plugin project",
     "type": "module",
     "bin": {

package/templates/default/.yeow/build.js

@@ -1,17 +1,19 @@
 import * as esbuild from 'esbuild';
-import { readFileSync, writeFileSync, mkdirSync, existsSync, statSync, readdirSync, rmdirSync, copyFileSync } from 'fs';
-import { resolve, dirname, basename, extname } from 'path';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, statSync, readdirSync, rmSync } from 'fs';
+import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
 import AdmZip from 'adm-zip';
 import { execSync } from 'child_process';
+import { makeAssetPlugin, makeDedupePlugin, assetsOutDirFor } from './yeow-assets.mjs';
 
 const root = resolve(fileURLToPath(import.meta.url), '..', '..');
 const cfg = JSON.parse(readFileSync(resolve(root, 'yeow.config.json'), 'utf-8'));
+const pkgJson = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf-8'));
 const { name, version } = cfg;
 const isTs = existsSync(resolve(root, 'src', 'index.ts'));
 const entry = isTs ? 'src/index.ts' : 'src/index.js';
 
+// ── 类型检查（TS 项目）──
 if (isTs && cfg.typecheck !== false) {
     try {
         execSync('npx -p typescript tsc --noEmit', { cwd: root, stdio: 'pipe' });
@@ -29,88 +31,13 @@ if (isTs && cfg.typecheck !== false) {
 const apiVer = cfg.api || '1.18';
 const isDev = process.env.YEOW_DEV === 'true';
 const outDir = isDev ? resolve(root, 'dist', '.dev') : resolve(root, 'dist', '.yeow');
-const assetsOutDir = resolve(outDir, '.assets');
-const srcAssetsDir = resolve(root, 'assets');
-
-// ── esbuild plugin: __yeow-assets virtual module ──
-// 目录级哈希：目录整体重命名 <name>.<dirHash>/，目录内文件保持原名（内部引用不断）
-// 根级文件独立哈希 <name>.<hash><ext>
-const ASSET_TREE = (() => {
-    if (!existsSync(srcAssetsDir)) return { children: {}, hash: null };
-    const buildTree = (absDir) => {
-        const children = {};
-        for (const e of readdirSync(absDir, { withFileTypes: true })) {
-            const p = resolve(absDir, e.name);
-            if (e.isDirectory()) {
-                children[e.name] = buildTree(p);
-            } else {
-                children[e.name] = { isFile: true, contentHash: createHash('md5').update(readFileSync(p)).digest('hex').slice(0, 8) };
-            }
-        }
-        const parts = Object.keys(children).sort().map(k => {
-            const c = children[k];
-            return k + ':' + (c.isFile ? c.contentHash : c.hash);
-        });
-        return { children, isFile: false, hash: createHash('md5').update(parts.join(',')).digest('hex').slice(0, 8) };
-    };
-    return buildTree(srcAssetsDir);
-})();
-
-const yeowAssetPlugin = {
-    name: 'yeow-assets',
-    setup(build) {
-        build.onResolve({ filter: /^__yeow-assets$/ }, args => ({
-            path: args.path,
-            namespace: 'yeow-assets',
-        }));
-        build.onLoad({ filter: /.*/, namespace: 'yeow-assets' }, async () => {
-            const map = {};
-            mkdirSync(assetsOutDir, { recursive: true });
-
-            const deploy = (node, absSrc, origRel, hashedRel) => {
-                if (!node.isFile && hashedRel) {
-                    mkdirSync(resolve(assetsOutDir, hashedRel), { recursive: true });
-                }
-                for (const [name, child] of Object.entries(node.children || {})) {
-                    if (child.isFile) {
-                        // 根级文件：独立哈希；目录内文件：保持原名
-                        if (hashedRel === '') {
-                            const ext = extname(name);
-                            const base = basename(name, ext);
-                            const dest = base + '.' + child.contentHash + ext;
-                            copyFileSync(resolve(absSrc, name), resolve(assetsOutDir, dest));
-                            map[name] = 'assets/' + dest;
-                        } else {
-                            copyFileSync(resolve(absSrc, name), resolve(assetsOutDir, hashedRel, name));
-                            map[origRel + name] = 'assets/' + hashedRel + name;
-                        }
-                    } else {
-                        const subHashed = (hashedRel === '' ? '' : hashedRel) + name + '.' + child.hash + '/';
-                        deploy(child, resolve(absSrc, name), origRel + name + '/', subHashed);
-                        map[origRel + name + '/'] = 'assets/' + subHashed;
-                    }
-                }
-            };
-
-            deploy(ASSET_TREE, srcAssetsDir, '', '');
-
-            return {
-                contents: 'const _map = ' + JSON.stringify(map) + ';\n' +
-                    'function _norm(p) { return p.endsWith("/") ? p.slice(0, -1) : p; }\n' +
-                    'export function getPath(p) {\n' +
-                    '  if (_map[p]) return _map[p];\n' +
-                    '  const n = _norm(p);\n' +
-                    '  if (_map[n]) return _map[n];\n' +
-                    '  if (_map[n + "/"]) return _map[n + "/"];\n' +
-                    '  return p;\n' +
-                    '}\n',
-                loader: 'js',
-            };
-        });
-    },
-};
+const assetsOut = assetsOutDirFor(outDir);
 
 async function main() {
+    // 清空资产输出，避免旧哈希目录残留
+    rmSync(assetsOut, { recursive: true, force: true });
+
+    // ── 打包 ──
     await esbuild.build({
         entryPoints: [resolve(root, entry)],
         outfile: resolve(outDir, 'main.js'),
@@ -123,52 +50,67 @@ async function main() {
         treeShaking: true,
         minify: false,
         sourcemap: isDev ? 'linked' : false,
-        plugins: [yeowAssetPlugin],
+        plugins: [
+            makeDedupePlugin(root),
+            makeAssetPlugin({ root, pkgJson, outDir }),
+        ],
     });
+    console.log('  \u2713 Bundled (' + (statSync(resolve(outDir, 'main.js')).size / 1024).toFixed(1) + ' KB)');
 
-    const size = statSync(resolve(outDir, 'main.js')).size;
-    console.log('  \u2713 Bundled (' + (size / 1024).toFixed(1) + ' KB)');
-
-    const tmplJar = resolve(root, '.yeow', 'assets', 'yeow-template-0.1.0.jar');
-    const zip = new AdmZip(tmplJar);
+    // ── 组装 JAR ──
+    const zip = new AdmZip(resolve(root, '.yeow', 'assets', 'yeow-template-0.1.0.jar'));
     zip.updateFile('plugin.yml', Buffer.from(
         'name: ' + name + '\n' +
         'version: ' + version + '\n' +
         'main: yeow.template.Bootstrap\n' +
         'api-version: \'' + apiVer + '\'\n' +
-        'depend:\n  - Yeow-Runtime\n'));
+        'depend:\n  - Yeow\n'));
 
     if (isDev) {
         const devInfo = {
             name,
             codeFile: resolve(outDir, 'main.js').replace(/\\/g, '/'),
-            assetsDir: assetsOutDir.replace(/\\/g, '/'),
+            assetsDir: assetsOut.replace(/\\/g, '/'),
         };
         writeFileSync(resolve(outDir, 'dev.json'), JSON.stringify(devInfo, null, 2));
-        console.log('  \u2713 Dev info written');
         zip.addFile('.yeow/dev.json', readFileSync(resolve(outDir, 'dev.json')));
+        console.log('  \u2713 Dev info written');
     } else {
         zip.addFile('.yeow/main.js', readFileSync(resolve(outDir, 'main.js')));
     }
 
-    // Pack hashed assets into JAR
-    if (existsSync(assetsOutDir)) {
-        const files = readdirSync(assetsOutDir, { recursive: true });
+    // 资产（esbuild 插件已写入 assetsOut）
+    if (existsSync(assetsOut)) {
+        const files = readdirSync(assetsOut, { recursive: true }).filter(f => statSync(resolve(assetsOut, f)).isFile());
         for (const f of files) {
-            const fp = resolve(assetsOutDir, f);
-            if (statSync(fp).isFile()) {
-                zip.addFile('assets/' + f.replace(/\\/g, '/'), readFileSync(fp));
-            }
+            zip.addFile('assets/' + f.replace(/\\/g, '/'), readFileSync(resolve(assetsOut, f)));
         }
-        console.log('  \u2713 Assets included (' + files.filter(f => statSync(resolve(assetsOutDir, f)).isFile()).length + ' files)');
+        console.log('  \u2713 Assets included (' + files.length + ' files)');
     }
 
     zip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
-    const outJar = isDev ? resolve(root, 'dist', 'plugins', name + '-' + version + '.jar')
-                          : resolve(root, 'dist', name + '-' + version + '.jar');
+    const outJar = resolve(root, 'dist', isDev ? 'plugins' : '', name + '-' + version + '.jar');
     mkdirSync(dirname(outJar), { recursive: true });
     zip.writeZip(outJar);
     console.log('  \u2713 Packaged ' + outJar + '\n');
+
+    // ── 组装 .yeow.zip（仅生产）──
+    // 平台无关的插件包：放入 plugins/Yeow/ 会被运行时自动扫描加载，或 /yeow load 手动加载。
+    if (!isDev) {
+        const pkgZip = new AdmZip();
+        pkgZip.addFile('.yeow/main.js', readFileSync(resolve(outDir, 'main.js')));
+        if (existsSync(assetsOut)) {
+            const files = readdirSync(assetsOut, { recursive: true }).filter(f => statSync(resolve(assetsOut, f)).isFile());
+            for (const f of files) {
+                pkgZip.addFile('assets/' + f.replace(/\\/g, '/'), readFileSync(resolve(assetsOut, f)));
+            }
+        }
+        pkgZip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
+        const outZip = resolve(root, 'dist', name + '-' + version + '.yeow.zip');
+        mkdirSync(dirname(outZip), { recursive: true });
+        pkgZip.writeZip(outZip);
+        console.log('  \u2713 Packaged ' + outZip + '\n');
+    }
 }
 
 main().catch(e => { console.error(e); process.exit(1); });

package/templates/default/.yeow/dev-server.js

@@ -269,7 +269,7 @@ function startHotReload() {
 let _consumer = null;
 async function getSourceMapConsumer() {
     if (_consumer) return _consumer;
-    const mapFile = resolve(ROOT, 'dist', '.yeow', 'main.js.map');
+    const mapFile = resolve(ROOT, 'dist', '.dev', 'main.js.map');
     if (!existsSync(mapFile)) return null;
     try {
         const raw = JSON.parse(readFileSync(mapFile, 'utf-8'));

package/templates/default/.yeow/yeow-assets.mjs

@@ -0,0 +1,141 @@
+import { readFileSync, readdirSync, existsSync, statSync, mkdirSync, copyFileSync } from 'fs';
+import { resolve, dirname, basename, extname } from 'path';
+import { createRequire } from 'module';
+import { createHash } from 'crypto';
+
+const require = createRequire(import.meta.url);
+
+// ── 哈希树 ─────────────────────────────────────────────────────────
+// 哈希规则：
+//   - 根级文件：独立哈希 <name>.<contentHash><ext>
+//   - 顶层目录（assets/ 直接子目录）：整体哈希 <name>.<dirHash>/，内部一切保持原名
+// 保证目录内部（含深层子目录）的相对引用始终有效。
+function buildTree(absDir) {
+    const children = {};
+    for (const e of readdirSync(absDir, { withFileTypes: true })) {
+        const p = resolve(absDir, e.name);
+        if (e.isDirectory()) {
+            children[e.name] = buildTree(p);
+        } else {
+            children[e.name] = {
+                isFile: true,
+                contentHash: createHash('md5').update(readFileSync(p)).digest('hex').slice(0, 8),
+            };
+        }
+    }
+    const parts = Object.keys(children).sort().map(k => {
+        const c = children[k];
+        return k + ':' + (c.isFile ? c.contentHash : c.hash);
+    });
+    return { children, isFile: false, hash: createHash('md5').update(parts.join(',')).digest('hex').slice(0, 8) };
+}
+
+// ── 部署 + map ─────────────────────────────────────────────────────
+// overwrite=false 时（依赖包）不覆盖主项目已有的 map 条目与文件
+// topLevel=true：当前目录是 assets/ 直接子目录，需要哈希；内部目录保持原名
+function deploy(node, absSrc, outDir, map, origRel, hashedRel, overwrite, topLevel) {
+    if (!node.isFile && hashedRel) mkdirSync(resolve(outDir, hashedRel), { recursive: true });
+    for (const [name, child] of Object.entries(node.children || {})) {
+        if (child.isFile) {
+            if (hashedRel === '') {
+                const ext = extname(name);
+                const base = basename(name, ext);
+                const dest = base + '.' + child.contentHash + ext;
+                const dst = resolve(outDir, dest);
+                if (overwrite || !existsSync(dst)) copyFileSync(resolve(absSrc, name), dst);
+                if (overwrite || !map[name]) map[name] = 'assets/' + dest;
+            } else {
+                const dst = resolve(outDir, hashedRel, name);
+                if (overwrite || !existsSync(dst)) {
+                    mkdirSync(resolve(outDir, hashedRel), { recursive: true });
+                    copyFileSync(resolve(absSrc, name), dst);
+                }
+                if (overwrite || !map[origRel + name]) map[origRel + name] = 'assets/' + hashedRel + name;
+            }
+        } else {
+            const subOrig = origRel + name + '/';
+            // 仅顶层目录哈希；内部目录保持原名（保护深层相对引用）
+            const subHashed = topLevel
+                ? name + '.' + child.hash + '/'
+                : hashedRel + name + '/';
+            deploy(child, resolve(absSrc, name), outDir, map, subOrig, subHashed, overwrite, false);
+            if (overwrite || !map[subOrig]) map[subOrig] = 'assets/' + subHashed;
+        }
+    }
+}
+
+// ── 收集所有资产来源（主项目 + 依赖包）───────────────────────────
+function collectSources(root, pkgJson) {
+    const sources = [];
+    const own = resolve(root, 'assets');
+    if (existsSync(own)) sources.push({ tree: buildTree(own), absSrc: own, overwrite: true });
+
+    for (const pkgName of Object.keys(pkgJson.dependencies || {})) {
+        try {
+            const pkgJsonPath = require.resolve(pkgName + '/package.json', { paths: [root] });
+            const pkgAssets = resolve(dirname(pkgJsonPath), 'assets');
+            if (existsSync(pkgAssets)) {
+                sources.push({ tree: buildTree(pkgAssets), absSrc: pkgAssets, overwrite: false });
+            }
+        } catch { /* 非 Yeow 包或未安装，跳过 */ }
+    }
+    return sources;
+}
+
+// ── esbuild 插件：__yeow-assets 虚拟模块 ──────────────────────────
+export function makeAssetPlugin({ root, pkgJson, outDir }) {
+    const assetsOutDir = resolve(outDir, '.assets');
+    return {
+        name: 'yeow-assets',
+        setup(build) {
+            build.onResolve({ filter: /^__yeow-assets$/ }, args => ({
+                path: args.path,
+                namespace: 'yeow-assets',
+            }));
+            build.onLoad({ filter: /.*/, namespace: 'yeow-assets' }, async () => {
+                const map = {};
+                mkdirSync(assetsOutDir, { recursive: true });
+                for (const src of collectSources(root, pkgJson)) {
+                    deploy(src.tree, src.absSrc, assetsOutDir, map, '', '', src.overwrite, true);
+                }
+                return {
+                    contents:
+                        'const _map = ' + JSON.stringify(map) + ';\n' +
+                        'function _norm(p) { return p.endsWith("/") ? p.slice(0, -1) : p; }\n' +
+                        'export function getPath(p) {\n' +
+                        '  if (_map[p]) return _map[p];\n' +
+                        '  const n = _norm(p);\n' +
+                        '  if (_map[n]) return _map[n];\n' +
+                        '  if (_map[n + "/"]) return _map[n + "/"];\n' +
+                        '  return p;\n' +
+                        '}\n',
+                    loader: 'js',
+                };
+            });
+        },
+    };
+}
+
+// ── esbuild 插件：统一 yeow-api/yeow-utils 到主项目实例 ──────────
+// 避免依赖包自带副本导致全局状态分裂（如 __yeowInitCbs 被覆盖）
+// 注意：返回路径必须用正斜杠，否则 Windows 下 esbuild 解析失败
+export function makeDedupePlugin(root) {
+    return {
+        name: 'dedupe-yeow-core',
+        setup(build) {
+            build.onResolve({ filter: /^yeow-api$/ }, () => ({
+                path: resolve(root, 'node_modules', 'yeow-api', 'src', 'index.ts').replace(/\\/g, '/'),
+            }));
+            build.onResolve({ filter: /^yeow-utils$/ }, () => ({
+                path: resolve(root, 'node_modules', 'yeow-utils', 'src', 'index.ts').replace(/\\/g, '/'),
+            }));
+        },
+    };
+}
+
+// ── 资产输出目录（供 build.js 打包 JAR）────────────────────────────
+export function assetsOutDirFor(outDir) {
+    return resolve(outDir, '.assets');
+}
+
+export { buildTree };

package/templates/default/package.json

@@ -7,7 +7,7 @@
         "dev": "node .yeow/dev-server.js"
     },
     "dependencies": {
-        "yeow-api": "^0.2.57",
+        "yeow-api": "^0.2.59",
         "yeow-utils": "^0.1.14"
     },
     "devDependencies": {

package/templates/default/yeow.config.json

@@ -6,6 +6,7 @@
     "api": "1.18",
     "java": 21,
     "typecheck": true,
+    "permissions": [],
     "dev": {
         "port": 17367,
         "memory": "4G",