@love-sqjm/magic 2026.4.17 → 2026.4.18

package/index.js

@@ -1,5 +1,6 @@
 import { program } from 'commander';
 import fs from "node:fs";
+import path from "node:path";
 import { app } from "./app.js";
 import { BuildProject } from "./script/build-project.js";
 import { createProject } from "./script/create-project.js";
@@ -110,7 +111,7 @@ program
             filename += ".m";
         }
 
-        const filePath = app.project.dir + filename;
+        const filePath = path.join( app.project.dir, filename );
         if ( fs.existsSync( filePath ) ) {
             console.error( `错误: 文件已存在 [path:${ filePath }]` );
             process.exit( 1 );

package/package.json

@@ -3,7 +3,7 @@
   "author": "SQJM (https://github.com/SQJM)",
   "license": "MIT",
   "description": "Hi, This is Magic(神奇)",
-  "version": "2026.4.17",
+  "version": "2026.4.18",
   "type": "module",
   "module": "index.js",
   "main": "index.js",

package/script/create-project.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import path from "node:path";
 import { app } from "../app.js";
 
 function getConfig( name, platform ) {
@@ -17,25 +18,26 @@ function getConfig( name, platform ) {
  * @param platform {string}
  */
 export function createProject( name, platform ) {
-    fs.mkdirSync( app.project.dir + name, { recursive : true } );
-    fs.mkdirSync( app.project.dir + name + "/app", { recursive : true } );
+    const projectPath = path.join( app.project.dir, name );
+    fs.mkdirSync( projectPath, { recursive : true } );
+    fs.mkdirSync( path.join( projectPath, "app" ), { recursive : true } );
 
     if ( platform === "module" ) {
         let data = app.templateDir.projectBase.get( "build.module.toml" );
         data = data.replaceAll( "$name", name )
         .replace( "$target", platform );
-        fs.writeFileSync( name + "/build.toml", data );
+        fs.writeFileSync( path.join( projectPath, "build.toml" ), data );
         return;
     }
     let data = app.templateDir.projectBase.get( "build.toml" );
     data = data.replace( "$name", name )
     .replace( "$target", platform )
     .replace( "$config", getConfig( name, platform ) );
-    fs.writeFileSync( name + "/build.toml", data );
+    fs.writeFileSync( path.join( projectPath, "build.toml" ), data );
 
     let data2 = app.templateDir.projectBase.get( "app.xml" );
     data2 = data2.replace( "$name", name );
-    fs.writeFileSync( name + "/app/app.xml", data2 );
+    fs.writeFileSync( path.join( projectPath, "app", "app.xml" ), data2 );
 
     const indexMContent = `<import
 	root=""
@@ -69,5 +71,5 @@ export function createProject( name, platform ) {
     }
 </css>
 `;
-    fs.writeFileSync( name + "/app/index.m", indexMContent );
+    fs.writeFileSync( path.join( projectPath, "app", "index.m" ), indexMContent );
 }

package/script/run-project.js

@@ -11,10 +11,31 @@ import { macroReplace } from "./module/compiler/macro-replace.js";
 import { examine_BuildConfig } from "./module/compiler/step/1.js";
 import WebSocket from "ws"
 
+function openBrowser( urlToOpen ) {
+    const platform = os.platform();
+    let command;
+
+    if ( platform === "win32" ) {
+        command = `start ${ urlToOpen }`;
+    } else if ( platform === "darwin" ) {
+        command = `open ${ urlToOpen }`;
+    } else {
+        command = `xdg-open ${ urlToOpen }`;
+    }
+
+    exec( command, ( error, stdout, stderr ) => {
+        if ( error ) {
+            printf.outFile.error( error );
+        }
+        printf.outFile.log( stdout );
+        printf.error( stderr );
+    } );
+}
+
 const platform = {
     "node-webkit" : ( platform_config ) => {
         try {
-            const pk = `${ app.project.dir }/package.json`;
+            const pk = path.join( app.project.dir, "package.json" );
             if ( !fs.existsSync( pk ) ) {
                 fs.writeFileSync( pk, "{}" );
             }
@@ -27,7 +48,7 @@ const platform = {
             }
 
             const newPk = Object.assign( pkJson, platform_config.build.platform.config );
-            newPk[ "main" ] = platform_config.build.out + "/" + platform_config.config.main + ".html";
+            newPk[ "main" ] = path.join( platform_config.build.out, platform_config.config.main + ".html" );
             delete newPk[ "app" ];
             fs.writeFileSync( pk, JSON.stringify( newPk ) );
         } catch ( e ) {
@@ -45,14 +66,8 @@ const platform = {
     },
     "web" : ( platform_config ) => {
         if ( platform_config.build.platform.config.browser ) {
-            const command = `start ${ platform_config.config.main }.html`;
-            exec( command, ( error, stdout, stderr ) => {
-                if ( error ) {
-                    throw error;
-                }
-                printf.log( stdout );
-                printf.error( stderr );
-            } );
+            const buildDir = path.join( app.project.dir, platform_config.build.out );
+            openBrowser( path.join( buildDir, platform_config.config.main + ".html" ) );
         } else if ( platform_config.build.platform.config.server ) {
             const hostname = platform_config.build.platform.config.server[ "host" ];
             const port = platform_config.build.platform.config.server[ "port" ];
@@ -78,7 +93,7 @@ const platform = {
 
                 let target = path.resolve( rootDir, `.${ targetPath }` );
                 if ( !target.startsWith( rootDir ) ) {
-                    target = rootDir + "index.html";
+                    target = path.join( rootDir, "index.html" );
                 }
                 if ( fs.existsSync( target ) ) {
                     const ext = path.extname( target ).toLowerCase();
@@ -213,14 +228,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 console.log( `HTTP 服务器已启动: http://localhost:${ port }/index.html` );
                 console.log( `使用 Ctrl + C 停止服务器` );
 
-                const command = `start http://${ hostname }:${ port }/index.html`;
-                exec( command, ( error, stdout, stderr ) => {
-                    if ( error ) {
-                        printf.outFile.error( error );
-                        throw error;
-                    }
-                    printf.outFile.log( stdout );
-                } );
+                openBrowser( `http://${ hostname }:${ port }/index.html` );
             } );
         }
     }
@@ -232,7 +240,7 @@ document.addEventListener('DOMContentLoaded', function () {
 export function RunProject() {
     printf.outFile.info( `运行项目` );
 
-    const file = path.normalize( app.project.dir + "build.toml" );
+    const file = path.normalize( path.join( app.project.dir, "build.toml" ) );
     import(file ).then( root => {
         printf.outFile.info( `预处理 Build 配置文件 [path:${ file }]` );
         const config = examine_BuildConfig( macroReplace( root ) );
@@ -240,7 +248,7 @@ export function RunProject() {
             if ( config.build.platform.target === "module" ) {
                 throw `无法运行模块`;
             } else {
-                config[ "build-dir" ] = path.normalize( app.project.dir + config.build.out + '/' );
+                config[ "build-dir" ] = path.normalize( path.join( app.project.dir, config.build.out ) );
                 platform[ config.build.platform.target ]( config );
             }
         }