功能模块及编译器初步实现

.gitignore

@@ -12,3 +12,5 @@
 /**/node_modules
 /app
 /hooks
+/platforms
+/cloud

addon/nger-addon/readme.md

@@ -0,0 +1 @@
+## 模块管理

addon/nger-install/inc/index.ts

@@ -0,0 +1,3 @@
+
+
+export default [];

addon/nger-install/index.ts

@@ -0,0 +1,23 @@
+import { NgModule } from 'nger-core';
+import pages, { NgerInstallPage } from './template';
+import incs from './inc';
+import { NgerInstallTypeorm } from './typeorm';
+
+@NgModule({
+    declarations: [
+        // 模板
+        ...pages,
+        // 控制器
+        ...incs
+    ],
+    providers: [],
+    bootstrap: [
+        // 默认跳转页面
+        NgerInstallPage
+    ],
+    imports: [
+        // 数据库
+        NgerInstallTypeorm
+    ]
+})
+export class NgerInstallModule { }

addon/nger-install/package.json

@@ -0,0 +1,3 @@
+{
+    "name": "nger-install"
+}

addon/nger-install/readme.md

@@ -0,0 +1,26 @@
+## 系统安装配置
+
+## 源码
+- [x] `addon`
+  - [x] `ims-install`
+    - [ ] `inc` 控制器，服务端
+    - [ ] `template` 模板
+    - [ ] `typeorm` 数据库
+    - [ ] `index.ts` 模块入口
+    - [ ] `package.json` 插件描述
+
+## 编译后
+- [x] `addon`
+  - [x] `ims-install`
+    - [ ] `pc` pc网站
+    - [ ] `admin` 管理
+    - [ ] `ttapp` 字节跳动
+    - [ ] `aliapp` 支付宝
+    - [ ] `weapp` 微信小程序
+    - [ ] `wechat` 微信浏览器
+    - [ ] `h5` 手机网站
+    - [ ] `ios` ios端
+    - [ ] `android` 安卓端
+    - [ ] `index.js` // 插件，可安装卸载更新
+    - [ ] `server.js` // 可独立运行，nger start addon/ims-install/server.js -p 4200
+    - [ ] `package.json` // 插件描述

addon/nger-install/template/index.ts

@@ -0,0 +1,7 @@
+import { NgerInstallPage } from './install/index';
+
+export default [
+    NgerInstallPage
+];
+
+export { NgerInstallPage }

addon/nger-install/template/install/index.tsx

@@ -0,0 +1,36 @@
+import { Page } from 'nger-core';
+
+@Page({
+    path: '/install',
+    title: 'nger系统安装',
+    type: ['pc']
+})
+export class NgerInstallPage {
+
+    render() {
+        return <div>
+            <h2 className="title">欢迎使用Nger平台</h2>
+            <div className="step1">
+                <h4 className="title">管理员</h4>
+                <input type="text" placeholder="站长用户名" />
+                <input type="text" placeholder="站长密码" />
+            </div>
+            <div className="step2">
+                <h4 className="title">数据库配置</h4>
+                <input type="text" placeholder="数据库地址" />
+                <input type="text" placeholder="数据库端口" />
+                <input type="text" placeholder="数据库用户名" />
+                <input type="text" placeholder="数据库密码" />
+            </div>
+            <div className="step3">
+                <h4 className="title">挑选模块</h4>
+                <ul>
+                    <li>商城</li>
+                    <li>社区</li>
+                    <li>bbs</li>
+                    <li>官网</li>
+                </ul>
+            </div>
+        </div>
+    }
+}

addon/nger-install/typeorm/entities/addon.ts

@@ -0,0 +1,4 @@
+import { Entity } from 'nger-core'
+
+@Entity()
+export class NgerAddon { }

addon/nger-install/typeorm/entities/index.ts

@@ -0,0 +1,4 @@
+import { NgerAddon } from './addon'
+export default [
+    NgerAddon
+];

addon/nger-install/typeorm/index.ts

@@ -0,0 +1,10 @@
+import { Typeorm } from 'nger-core'
+import entities from './entities'
+@Typeorm({
+    entities: [
+        ...entities
+    ],
+    migrations: [],
+    subscribers: []
+})
+export class NgerInstallTypeorm { }

framework/inc/home.ts → addon/nger-welcome/inc/index.ts

@@ -1,10 +1,11 @@
 import { Controller, Get } from 'nger-core'
 
-// 首页
 @Controller({
     path: '/api'
 })
-export class NgerHome {
+export class NgerWelcomeController {
     @Get()
-    getSystemInfo() { }
+    getAllInstalled() {
+        return [];
+    }
 }

addon/nger-welcome/index.ts

@@ -0,0 +1,10 @@
+import { NgModule } from 'nger-core'
+import pages from './template'
+import { NgerWelcomeController } from './inc'
+@NgModule({
+    declarations: [
+        ...pages,
+        NgerWelcomeController
+    ]
+})
+export class NgerWelcomeModule { }

addon/nger-welcome/template/home/index.tsx

@@ -0,0 +1,32 @@
+import { Page } from 'nger-core';
+
+@Page({
+    path: '/',
+    type: ['admin'],
+    title: '首页'
+})
+export class NgerWelcomeHomePage {
+
+    getLang() {
+        // 把这个当成规范
+        return {
+            [`客户1`]: {
+                'install_title': '模块安装'
+            },
+            [`客户2`]: {
+                'install_title': 'Nger模块安装'
+            }
+        }
+    }
+
+    render() {
+        return <div role="member">
+            <li>bbs</li>
+            <li>商城</li>
+            <li>官网</li>
+            <li>博客</li>
+            <button id="install">模块安装</button>
+        </div>
+    }
+}
+

addon/nger-welcome/template/index.ts

@@ -0,0 +1,5 @@
+import { NgerWelcomeHomePage } from './home'
+
+export default [
+    NgerWelcomeHomePage
+]

lerna.json

@@ -1,7 +1,7 @@
 {
   "lerna": "3.13.1",
   "packages": [
-    "dist/*"
+    "packages/*"
   ],
   "command": {
     "publish": {

packages/nger-compiler-client/README.md

@@ -0,0 +1,3 @@
+# `nger-compiler-client`
+
+> 客户端编译

packages/nger-compiler-client/__tests__/nger-compiler-client.test.js

@@ -0,0 +1,7 @@
+'use strict';
+
+const ngerCompilerClient = require('..');
+
+describe('nger-compiler-client', () => {
+    it('needs tests');
+});

packages/nger-compiler/lib/compiler.ts → packages/nger-compiler-client/lib/bootstrap.ts

@@ -1,18 +1,18 @@
-import { NgModuleBootstrap, NgModuleRef, FileSystem,Logger } from 'nger-core';
+import { NgModuleBootstrap, NgModuleRef, FileSystem, Logger } from 'nger-core';
 import chokidar from 'chokidar';
 import { join, relative, extname } from 'path'
 import { Stats } from 'fs-extra'
-import { NgerCompilerNgMetadata } from './helper/ng_metadata'
+import { NgerCompilerNgMetadata, NgerCompilerBabel, NgerCompilerBabelController } from 'nger-compiler'
 const root = process.cwd();
 import { NgerUtil } from 'nger-util'
-import { NgerCompilerBabel } from './ts/babel'
-export class NgerCompilerBootstrap extends NgModuleBootstrap {
+export class NgerCompilerClientBootstrap extends NgModuleBootstrap {
     constructor(
         public metadata: NgerCompilerNgMetadata,
         public fs: FileSystem,
         public util: NgerUtil,
         public babel: NgerCompilerBabel,
-        public logger: Logger
+        public logger: Logger,
+        public controller: NgerCompilerBabelController
     ) {
         super();
     }
@@ -21,10 +21,9 @@ export class NgerCompilerBootstrap extends NgModuleBootstrap {
     }
     async watchTsx() {
         // 监听ts文件变更并生成metadata.json文件
-        const framework = join(root, 'framework');
         const addon = join(root, 'addon');
         await this.util.rimraf(join(root, '.temp'));
-        chokidar.watch([`${addon}/**/*.(ts|tsx)`, `${framework}/**/*.(ts|tsx)`])
+        chokidar.watch([`${addon}/**/*.(ts|tsx)`])
             .on('add', (file, stats) => this.handlerTsxFile('add', file, stats))
             .on('change', (file, stats) => this.handlerTsxFile('change', file, stats))
             .on('error', () => { });
@@ -41,14 +40,17 @@ export class NgerCompilerBootstrap extends NgModuleBootstrap {
         this.metadataCache.set(file, metadataPath)
         // 解析Controller成浏览器端接口
         if (metadata) {
-            this.logger.info(`compiler controller`)
             const config = this.metadata.getControllerConfig(metadata);
             if (config) {
                 // 是controller
-                const code = this.babel.compile(file);
+                const code = this.controller.compile(file);
                 const controllerPath = join(root, '.temp', `${noExtPath}.js`);
                 this.fs.writeFileSync(controllerPath, code)
             }
+        } else {
+            const code = this.babel.compile(file);
+            const controllerPath = join(root, '.temp', `${noExtPath}.js`);
+            this.fs.writeFileSync(controllerPath, code)
         }
     }
 }

packages/nger-compiler-client/lib/index.ts

@@ -0,0 +1,16 @@
+import { NgModuleBootstrap, FileSystem, Logger } from 'nger-core'
+import compilerProviders, { NgerCompilerNgMetadata, NgerCompilerBabel, NgerCompilerBabelController } from 'nger-compiler'
+import { NgerCompilerClientBootstrap } from './bootstrap'
+import { NgerUtil } from 'nger-util'
+export default [
+    ...compilerProviders,
+    {
+        provide: NgModuleBootstrap,
+        useClass: NgerCompilerClientBootstrap,
+        multi: true,
+        deps: [
+            NgerCompilerNgMetadata, FileSystem, NgerUtil,
+            NgerCompilerBabel, Logger, NgerCompilerBabelController
+        ]
+    },
+]