yllaw 1.4.0 → 1.5.1

package/README.md

@@ -204,7 +204,7 @@ SomePlugin = "https://gitlab.example.com/group/some-plugin.git@1.0.0"
 TagEditor = "https://gitlab.example.com/group/tag-editor.git@2.1.0"
 ```
 
-插件文件（`*.rbxm`、`*.server.luau`、`*.server.lua`）会被安装到 `%LOCALAPPDATA%/Roblox/Plugins/`。
+插件文件（`*.rbxmx`、`*.server.luau`、`*.server.lua`）会被安装到 `%LOCALAPPDATA%/Roblox/Plugins/`。
 
 ### 全局插件管理
 
@@ -246,7 +246,7 @@ yllaw plugin update SomePlugin   # 更新指定插件
 ```
 your-plugin/
 ├── README.md
-└── YourPlugin.server.luau    # 或 .rbxm 文件
+└── YourPlugin.server.luau    # 或 .rbxmx 文件
 ```
 
 **文件夹插件（推荐，可包含子模块）：**
@@ -259,7 +259,7 @@ your-plugin/
     └── Utils.luau
 ```
 
-yllaw 会自动查找 `*.rbxm`、`*.server.luau`、`*.server.lua` 文件，以及包含 `init.server.luau` / `init.server.lua` 的文件夹。
+yllaw 会自动查找 `*.rbxmx`、`*.server.luau`、`*.server.lua` 文件，以及包含 `init.server.luau` / `init.server.lua` 的文件夹。
 
 ## 与 Wally 的关系
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yllaw",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Package manager for Roblox - supports Wally packages and private Git repositories",
   "main": "src/index.js",
   "bin": {

package/src/plugin.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
+const { spawn } = require('child_process');
 const simpleGit = require('simple-git');
 const chalk = require('chalk');
 const { getPluginsDir, loadConfig, loadInstalled, saveInstalled } = require('./config');
@@ -16,7 +17,7 @@ const log = {
 /**
  * Find plugin files in a directory.
  * Supports:
- *   - Single file plugins: *.rbxm, *.server.luau, *.server.lua
+ *   - Single file plugins: *.rbxmx, *.server.luau, *.server.lua
  *   - Folder plugins: directories containing init.server.luau or init.server.lua
  *
  * Returns structured results:
@@ -44,7 +45,7 @@ async function findPluginFiles(dir) {
     for (const entry of entries) {
       if (entry.isFile()) {
         const name = entry.name;
-        if (name.endsWith('.rbxm') ||
+        if (name.endsWith('.rbxmx') ||
             name.endsWith('.server.luau') ||
             name.endsWith('.server.lua')) {
           results.push({ type: 'file', path: path.join(searchDir, name), name });
@@ -68,6 +69,99 @@ async function findPluginFiles(dir) {
   return results;
 }
 
+/**
+ * Build a plugin entry (.server.lua(u) or folder) to .rbxmx using Rojo.
+ * Generates a temporary project.json, runs `rojo build`, returns the result.
+ * @returns {{ rbxmxPath: string, name: string } | null}
+ */
+async function buildToRbxmx(entry) {
+  let pluginName;
+  if (entry.type === 'folder') {
+    pluginName = entry.name;
+  } else {
+    pluginName = entry.name
+      .replace(/\.server\.luau$/, '')
+      .replace(/\.server\.lua$/, '');
+  }
+
+  const parentDir = path.dirname(entry.path);
+  const entryBasename = path.basename(entry.path);
+  const projectPath = path.join(parentDir, `_yllaw_build.project.json`);
+  const rbxmxPath = path.join(parentDir, `${pluginName}.rbxmx`);
+
+  await fs.writeJson(projectPath, {
+    name: pluginName,
+    tree: { "$path": entryBasename },
+  });
+
+  try {
+    const success = await new Promise((resolve) => {
+      const rojo = spawn('rojo', ['build', projectPath, '-o', rbxmxPath], {
+        stdio: 'pipe',
+        shell: true,
+      });
+
+      let stderr = '';
+      rojo.stderr.on('data', (data) => { stderr += data.toString(); });
+      rojo.on('close', (code) => {
+        if (code !== 0 && stderr) {
+          log.error(`Rojo build failed: ${stderr.trim()}`);
+        }
+        resolve(code === 0);
+      });
+      rojo.on('error', () => resolve(false));
+    });
+
+    if (!success) return null;
+    return { rbxmxPath, name: `${pluginName}.rbxmx` };
+  } finally {
+    await fs.remove(projectPath);
+  }
+}
+
+/**
+ * Install plugin entries to the plugins directory.
+ * For .rbxmx files: copy directly.
+ * For .server.lua(u) / folders: build to .rbxmx via Rojo, fallback to direct copy.
+ * @returns {Array} installed file records
+ */
+async function installEntries(pluginEntries, pluginsDir, logPrefix = '') {
+  const installedFiles = [];
+
+  for (const entry of pluginEntries) {
+    if (entry.type === 'file' && entry.name.endsWith('.rbxmx')) {
+      const dest = path.join(pluginsDir, entry.name);
+      await fs.copy(entry.path, dest, { overwrite: true });
+      installedFiles.push({ type: 'file', name: entry.name });
+      log.ok(`${logPrefix}${entry.name} -> ${pluginsDir}`);
+    } else {
+      const result = await buildToRbxmx(entry);
+      if (result) {
+        const dest = path.join(pluginsDir, result.name);
+        await fs.copy(result.rbxmxPath, dest, { overwrite: true });
+        installedFiles.push({ type: 'file', name: result.name });
+        log.ok(`${logPrefix}${entry.name} -> ${result.name} -> ${pluginsDir}`);
+        await fs.remove(result.rbxmxPath);
+      } else {
+        log.warn(`Rojo build failed for ${entry.name}, copying as-is`);
+        if (entry.type === 'folder') {
+          const dest = path.join(pluginsDir, entry.name);
+          await fs.copy(entry.path, dest, { overwrite: true });
+          await fs.remove(path.join(dest, '.git'));
+          installedFiles.push({ type: 'folder', name: entry.name });
+        } else {
+          const dest = path.join(pluginsDir, entry.name);
+          await fs.copy(entry.path, dest, { overwrite: true });
+          installedFiles.push({ type: 'file', name: entry.name });
+        }
+        log.ok(`${logPrefix}${entry.name} -> ${pluginsDir}`);
+      }
+    }
+  }
+
+  return installedFiles;
+}
+
 /**
  * Parse git spec: "https://example.com/repo.git@version"
  */
@@ -180,21 +274,7 @@ async function installPlugin(name, version, sources) {
     const pluginsDir = getPluginsDir();
     await fs.ensureDir(pluginsDir);
 
-    const installedFiles = [];
-    for (const entry of pluginEntries) {
-      if (entry.type === 'folder') {
-        const dest = path.join(pluginsDir, entry.name);
-        await fs.copy(entry.path, dest, { overwrite: true });
-        await fs.remove(path.join(dest, '.git'));
-        installedFiles.push({ type: 'folder', name: entry.name });
-        log.ok(`${entry.name}/ -> ${pluginsDir}`);
-      } else {
-        const dest = path.join(pluginsDir, entry.name);
-        await fs.copy(entry.path, dest, { overwrite: true });
-        installedFiles.push({ type: 'file', name: entry.name });
-        log.ok(`${entry.name} -> ${pluginsDir}`);
-      }
-    }
+    const installedFiles = await installEntries(pluginEntries, pluginsDir);
 
     // Update installed.json
     const installed = await loadInstalled();
@@ -237,21 +317,7 @@ async function installPluginFromGitSpec(name, spec, options = {}) {
           if (pluginEntries.length > 0) {
             const pluginsDir = getPluginsDir();
             await fs.ensureDir(pluginsDir);
-            const installedFiles = [];
-            for (const entry of pluginEntries) {
-              if (entry.type === 'folder') {
-                const dest = path.join(pluginsDir, entry.name);
-                await fs.copy(entry.path, dest, { overwrite: true });
-                await fs.remove(path.join(dest, '.git'));
-                installedFiles.push({ type: 'folder', name: entry.name });
-                log.ok(`[DEV] ${entry.name}/ -> ${pluginsDir}`);
-              } else {
-                const dest = path.join(pluginsDir, entry.name);
-                await fs.copy(entry.path, dest, { overwrite: true });
-                installedFiles.push({ type: 'file', name: entry.name });
-                log.ok(`[DEV] ${entry.name} -> ${pluginsDir}`);
-              }
-            }
+            const installedFiles = await installEntries(pluginEntries, pluginsDir, '[DEV] ');
             const installed = await loadInstalled();
             installed[name] = {
               version: displayRef,
@@ -278,21 +344,7 @@ async function installPluginFromGitSpec(name, spec, options = {}) {
     const pluginsDir = getPluginsDir();
     await fs.ensureDir(pluginsDir);
 
-    const installedFiles = [];
-    for (const entry of pluginEntries) {
-      if (entry.type === 'folder') {
-        const dest = path.join(pluginsDir, entry.name);
-        await fs.copy(entry.path, dest, { overwrite: true });
-        await fs.remove(path.join(dest, '.git'));
-        installedFiles.push({ type: 'folder', name: entry.name });
-        log.ok(`${entry.name}/ -> ${pluginsDir}`);
-      } else {
-        const dest = path.join(pluginsDir, entry.name);
-        await fs.copy(entry.path, dest, { overwrite: true });
-        installedFiles.push({ type: 'file', name: entry.name });
-        log.ok(`${entry.name} -> ${pluginsDir}`);
-      }
-    }
+    const installedFiles = await installEntries(pluginEntries, pluginsDir);
 
     // Update installed.json
     const installed = await loadInstalled();
@@ -419,14 +471,31 @@ async function updatePlugin(name) {
     return false;
   }
 
-  if (latestTag === entry.version) {
+  // Check if plugin files still exist on disk
+  const pluginsDir = getPluginsDir();
+  let missing = false;
+  if (entry.files) {
+    for (const fileEntry of entry.files) {
+      const fileName = typeof fileEntry === 'string' ? fileEntry : fileEntry.name;
+      if (!await fs.pathExists(path.join(pluginsDir, fileName))) {
+        missing = true;
+        break;
+      }
+    }
+  }
+
+  if (latestTag === entry.version && !missing) {
     log.info(`${name}: up to date (${entry.version})`);
     return true;
   }
 
-  log.ok(`${name}: ${entry.version} -> ${latestTag}`);
+  if (missing) {
+    log.info(`${name}: files missing, reinstalling (${latestTag})`);
+  } else {
+    log.ok(`${name}: ${entry.version} -> ${latestTag}`);
+  }
 
-  // Reinstall at new version
+  // Reinstall
   const spec = `${entry.url}@${latestTag}`;
   return await installPluginFromGitSpec(name, spec);
 }