alemonjs 1.0.20 → 1.0.21

package/build.d.ts

@@ -0,0 +1 @@
+export declare function commandBuild(): Promise<void>

package/{bin/build.js → build.js}

@@ -1,22 +1,20 @@
-#!/usr/bin/env node
-
-import { compilationTools } from 'alemon-rollup'
-;(async function run() {
-  const ars = process.argv.slice(2)
-  let Options = {
-    input: 'apps/**/*.ts',
-    output: 'alemon.app.js'
-  }
-  const i = ars.indexOf('--i')
-  if (i != -1) {
-    Options.input = ars[i + 1]
-  }
-  const o = ars.indexOf('--o')
-  if (ars.indexOf('--o') != -1) {
-    Options.output = ars[o + 1]
-  }
-  await compilationTools({
-    aInput: Options.input,
-    aOutput: Options.output
-  })
-})()
+import { compilationTools } from 'alemon-rollup'
+export async function commandBuild() {
+  const ars = process.argv.slice(2)
+  const Options = {
+    input: 'apps/**/*.ts',
+    output: 'alemon.app.js'
+  }
+  const i = ars.indexOf('--i')
+  if (i != -1) {
+    Options.input = ars[i + 1]
+  }
+  const o = ars.indexOf('--o')
+  if (ars.indexOf('--o') != -1) {
+    Options.output = ars[o + 1]
+  }
+  await compilationTools({
+    aInput: Options.input,
+    aOutput: Options.output
+  })
+}

package/lib/build.js

@@ -0,0 +1,20 @@
+import { compilationTools } from 'alemon-rollup';
+export async function commandBuild() {
+    const ars = process.argv.slice(2);
+    const Options = {
+        input: 'apps/**/*.ts',
+        output: 'alemon.app.js'
+    };
+    const i = ars.indexOf('--i');
+    if (i != -1) {
+        Options.input = ars[i + 1];
+    }
+    const o = ars.indexOf('--o');
+    if (ars.indexOf('--o') != -1) {
+        Options.output = ars[o + 1];
+    }
+    await compilationTools({
+        aInput: Options.input,
+        aOutput: Options.output
+    });
+}

package/lib/core/apps.js

@@ -24,8 +24,7 @@ export function getAppName(url) {
  * @returns
  */
 export function createApps(url) {
-    const AppName = getAppPath(url);
-    return createApp(AppName);
+    return createApp(getAppPath(url));
 }
 /**
  * 创建应用对象

package/lib/run.js

@@ -0,0 +1,25 @@
+import { spawn } from 'child_process';
+import { existsSync } from 'fs';
+import { join } from 'path';
+export function commandRun(ars) {
+    const msg = ars.join(' ');
+    const files = msg.match(/(\S+\.js|\S+\.ts)/g) ?? ['alemon.config.ts'];
+    const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '');
+    for (const item of files) {
+        if (!existsSync(join(process.cwd(), item))) {
+            console.log('[NO FILE]', item);
+            continue;
+        }
+        const isTypeScript = item.endsWith('.ts');
+        const command = isTypeScript ? 'npx ts-node' : 'node';
+        const cmd = `${command} ${item} ${argsWithoutFiles}`;
+        console.log('[alemonjs]', cmd);
+        const childProcess = spawn(cmd, { shell: true });
+        childProcess.stdout.on('data', data => {
+            process.stdout.write(data.toString());
+        });
+        childProcess.stderr.on('data', data => {
+            process.stderr.write(data.toString());
+        });
+    }
+}

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "alemonjs",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
   "license": "GPL-2.0",
   "type": "module",
   "scripts": {
-    "app": "alemonjs",
-    "dev": "alemonjs dev",
     "tsc": "npx tsc",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
@@ -50,20 +48,27 @@
     "lib",
     "types",
     "run.js",
-    "run.d.ts"
+    "run.d.ts",
+    "build.js",
+    "build.d.ts"
   ],
   "exports": {
     ".": "./lib/index.js",
     "./run": {
       "import": "./run.js",
       "types": "./run.d.ts"
+    },
+    "./build": {
+      "import": "./build.js",
+      "types": "./build.d.ts"
+    },
+    "./core": {
+      "import": "./core.js",
+      "types": "./core.d.ts"
     }
   },
   "bin": {
-    "alemonjs": "bin/main.js",
-    "alemonjs-start": "bin/start.js",
-    "alemonjs-build": "bin/build.js",
-    "alemonjs-dev": "bin/dev.js"
+    "alemonjs": "bin/main.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/types/build.d.ts

@@ -0,0 +1 @@
+export declare function commandBuild(): Promise<void>;

package/types/run.d.ts

@@ -0,0 +1 @@
+export declare function commandRun(ars: string[]): void;

package/bin/dev.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-import { spawn } from 'child_process'
-import { existsSync } from 'fs'
-import { join } from 'path'
-const ars = process.argv.slice(2).push('dev')
-const msg = ars.join(' ')
-const files = msg.match(/(\S+\.js|\S+\.ts)/g) ?? ['alemon.config.ts']
-const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '')
-for (const item of files) {
-  if (!existsSync(join(process.cwd(), item))) {
-    console.log('[NO FILE]', item)
-    continue
-  }
-  // nodemon alemon.config.ts dev
-  const cmd = `npx nodemon ${item} ${argsWithoutFiles}`
-  console.log('[alemonjs]', cmd)
-  const childProcess = spawn(cmd, { shell: true })
-  childProcess.stdout.on('data', data => {
-    process.stdout.write(data.toString())
-  })
-  childProcess.stderr.on('data', data => {
-    process.stderr.write(data.toString())
-  })
-}

package/bin/start.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-import { spawn } from 'child_process'
-import { existsSync } from 'fs'
-import { join } from 'path'
-const ars = process.argv.slice(2)
-const msg = ars.join(' ')
-const files = msg.match(/(\S+\.js|\S+\.ts)/g) ?? ['pm2.config.cjs']
-const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '')
-for (const item of files) {
-  if (!existsSync(join(process.cwd(), item))) {
-    console.log('[NO FILE]', item)
-    continue
-  }
-  // pm2 startOrRestart pm2.config.cjs
-  const cmd = `npx pm2 startOrRestart ${item} ${argsWithoutFiles}`
-  console.log('[alemonjs]', cmd)
-  const childProcess = spawn(cmd, { shell: true })
-  childProcess.stdout.on('data', data => {
-    process.stdout.write(data.toString())
-  })
-  childProcess.stderr.on('data', data => {
-    process.stderr.write(data.toString())
-  })
-}