@avleon/cli 0.0.38 → 0.0.40

package/dist/create.js

@@ -40,11 +40,12 @@ exports.createApplication = createApplication;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const paths_1 = require("./paths");
 const prettier = __importStar(require("prettier"));
-const win32_1 = __importDefault(require("path/win32"));
+const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const child_process_1 = require("child_process");
 const util_1 = __importDefault(require("util"));
+const lodash_1 = require("lodash");
 const execAsync = util_1.default.promisify(child_process_1.exec);
 const getShell = () => {
     if (os_1.default.platform() === 'win32') {
@@ -98,6 +99,7 @@ async function createApplication(fname, flags = {}) {
     // }
     await fs_extra_1.default.ensureDir(appPaths.root + "/src");
     await fs_extra_1.default.ensureDir(appPaths.root + "/src/controllers");
+    await fs_extra_1.default.ensureDir(appPaths.root + "/src/config");
     await fs_extra_1.default.ensureDir(appPaths.root + "/src/services");
     await fs_extra_1.default.ensureDir(appPaths.root + "/src/models");
     await fs_extra_1.default.ensureDir(appPaths.root + "/test");
@@ -122,22 +124,42 @@ export class HomeController{
         singleAttributePerLine: true,
         parser: "typescript",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.src, "home.controller.ts"), formatHomeController);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.controllers, "home.controller.ts"), formatHomeController);
+    // openapi config file
+    const openapiConfigFile = `
+import { AppConfig, Environment, IConfig } from "@avleon/core";
+
+@AppConfig
+export class OpenApiConfig implements IConfig {
+
+    config(env: Environment) {
+        return {
+            info: {
+                title: '${(0, lodash_1.capitalize)(fname)}',
+                version: '0.0.1',
+            },
+        }
+    }
+}
+`;
+    const formatConfigFile = await prettier.format(openapiConfigFile, {
+        singleQuote: true,
+        singleAttributePerLine: true,
+        parser: "typescript",
+    });
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.configs, "openapi.config.ts"), formatConfigFile);
     // main file 
     const mainFunc = `
-import {
-  Avleon
-} from "@avleon/core";
-import { HomeController } from './home.controller';
+import { Avleon } from '@avleon/core';
+import { OpenApiConfig } from './config/openapi.config';
+import { HomeController } from './controllers/home.controller';
 
 
 const app = Avleon.createApplication();
-app.useOpenApi({
-  info:{
-    title: '${fname} Api',
-    version: '0.0.1'
-  }
-});
+
+if(app.isDevelopemtn()){
+  app.useOpenApi(OpenApiConfig);
+}
 
 app.useControllers([ HomeController ]);
 app.useStaticFiles();
@@ -149,13 +171,14 @@ export default app;
         singleAttributePerLine: true,
         parser: "typescript",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.src, "app.ts"), formatMainFunc);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.src, "app.ts"), formatMainFunc);
     // create serve.ts 
     const serveFunc = `
 import app from "./app";
+import { capitalize } from "lodash";
 
 async function start(){
-  app.run();
+  app.run(); // default run on :4000
 }
 
 start();
@@ -165,7 +188,7 @@ start();
         singleAttributePerLine: true,
         parser: "typescript",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.src, "serve.ts"), formatServeFunc);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.src, "serve.ts"), formatServeFunc);
     // create package.json
     const packageJson = `
 {
@@ -188,8 +211,8 @@ start();
   "keywords": ["avleon","nodejs","typescript"],
   "license": "ISC",
   "dependencies": {
-    "@avleon/core": "^0.0.29",
-    "@avleon/cli": "^0.0.37",
+    "@avleon/core": "^0.0.36",
+    "@avleon/cli": "^0.0.40",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "reflect-metadata": "^0.2.2"
@@ -218,7 +241,7 @@ start();
     const formattedPackageJson = await prettier.format(packageJson, {
         parser: "json",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, "package.json"), formattedPackageJson);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "package.json"), formattedPackageJson);
     const tsconfigJson = await prettier.format(`{
   "compilerOptions": {
     "target": "ES2017",
@@ -235,7 +258,13 @@ start();
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
 }`, { parser: "json" });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, "tsconfig.json"), tsconfigJson);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "tsconfig.json"), tsconfigJson);
+    const tsconfigBuildJson = await prettier.format(`{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules","coverage", "test", "dist", "**/*spec.ts"]
+}
+`, { parser: "json" });
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "tsconfig.build.json"), tsconfigBuildJson);
     // write e2e-test.json
     const e2eJson = await prettier.format(`{
   "moduleFileExtensions": [
@@ -250,13 +279,8 @@ start();
     "^.+/\/\.(t|j)s$": "ts-jest"
   }
 }`, { parser: "json" });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, "test/e2e-spec.json"), e2eJson);
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, ".gitignore"), `node_modules/\ndist/\n.env`);
-    // create basic service
-    // create basic controller
-    // console.info("App created successfully. Run the following command to get start.");
-    //  console.log(`cd ${fname} && ${pm} install`);
-    // console.log(pm == 'npm' ? `npm run start:dev` : `${pm} start:dev`);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "test/e2e-spec.json"), e2eJson);
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, ".gitignore"), `node_modules/\ndist/\n.env`);
     try {
         console.log(`Running ${pm} install...`);
         await execAsync(`cd ${fname}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avleon/cli",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "bin": {
     "avleon": "./dist/cli.js"
   },