@foal/cli 2.9.0 → 2.10.0

package/lib/generate/file-system.d.ts

@@ -189,6 +189,24 @@ export declare class FileSystem {
      * @memberof FileSystem
      */
     projectHasDependency(name: string): boolean;
+    /**
+     * Returns the dependencies of the project package.json.
+     *
+     * @returns {{ name: string, version: string }[]}
+     */
+    getProjectDependencies(): {
+        name: string;
+        version: string;
+    }[];
+    /**
+     * Returns the dev dependencies of the project package.json.
+     *
+     * @returns {{ name: string, version: string }[]}
+     */
+    getProjectDevDependencies(): {
+        name: string;
+        version: string;
+    }[];
     /************************
         Testing Methods
     ************************/

package/lib/generate/file-system.js

@@ -390,6 +390,32 @@ class FileSystem {
         this.currentDir = initialCurrentDir;
         return pkg.dependencies.hasOwnProperty(name);
     }
+    /**
+     * Returns the dependencies of the project package.json.
+     *
+     * @returns {{ name: string, version: string }[]}
+     */
+    getProjectDependencies() {
+        const initialCurrentDir = this.currentDir;
+        this.cdProjectRootDir();
+        const pkg = JSON.parse(fs_1.readFileSync(this.parse('package.json'), 'utf8'));
+        this.currentDir = initialCurrentDir;
+        return Object.keys(pkg.dependencies)
+            .map(name => ({ name, version: pkg.dependencies[name] }));
+    }
+    /**
+     * Returns the dev dependencies of the project package.json.
+     *
+     * @returns {{ name: string, version: string }[]}
+     */
+    getProjectDevDependencies() {
+        const initialCurrentDir = this.currentDir;
+        this.cdProjectRootDir();
+        const pkg = JSON.parse(fs_1.readFileSync(this.parse('package.json'), 'utf8'));
+        this.currentDir = initialCurrentDir;
+        return Object.keys(pkg.devDependencies)
+            .map(name => ({ name, version: pkg.devDependencies[name] }));
+    }
     /************************
         Testing Methods
     ************************/

package/lib/generate/templates/app/package.json

@@ -7,19 +7,15 @@
   "scripts": {
     "build": "foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
-    "develop": "npm run build && concurrently \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-
+    "develop": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
-    "test": "npm run build:test && concurrently \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-
+    "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
     "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
-    "e2e": "npm run build:e2e && concurrently \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
-
+    "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
     "lint:fix": "eslint --ext ts --fix src",
-
     "makemigrations": "foal rmdir build && tsc -p tsconfig.app.json && npx typeorm migration:generate --name migration && tsc -p tsconfig.app.json",
     "migrations": "npx typeorm migration:run",
     "revertmigration": "npx typeorm migration:revert"
@@ -35,6 +31,7 @@
     "typeorm": "0.2.26"
   },
   "devDependencies": {
+    "@foal/cli": "^2.9.0",
     "@types/mocha": "7.0.2",
     "@types/node": "10.17.24",
     "concurrently": "~5.3.0",
@@ -46,4 +43,4 @@
     "@typescript-eslint/parser": "~2.7.0",
     "typescript": "~4.0.2"
   }
-}
+}

package/lib/generate/templates/app/package.mongodb.json

@@ -7,16 +7,13 @@
   "scripts": {
     "build": "foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
-    "develop": "npm run build && concurrently \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-
+    "develop": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
-    "test": "npm run build:test && concurrently \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-
+    "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
     "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
-    "e2e": "npm run build:e2e && concurrently \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
-
+    "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
     "lint:fix": "eslint --ext ts --fix src"
   },
@@ -30,6 +27,7 @@
     "typeorm": "0.2.26"
   },
   "devDependencies": {
+    "@foal/cli": "^2.9.0",
     "@types/mocha": "7.0.2",
     "@types/node": "10.17.24",
     "concurrently": "~5.3.0",
@@ -41,4 +39,4 @@
     "@typescript-eslint/parser": "~2.7.0",
     "typescript": "~4.0.2"
   }
-}
+}

package/lib/generate/templates/app/package.mongodb.yaml.json

@@ -7,16 +7,13 @@
   "scripts": {
     "build": "foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
-    "develop": "npm run build && concurrently \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-
+    "develop": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
-    "test": "npm run build:test && concurrently \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-
+    "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
     "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
-    "e2e": "npm run build:e2e && concurrently \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
-
+    "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
     "lint:fix": "eslint --ext ts --fix src"
   },
@@ -31,6 +28,7 @@
     "yamljs": "~0.3.0"
   },
   "devDependencies": {
+    "@foal/cli": "^2.9.0",
     "@types/mocha": "7.0.2",
     "@types/node": "10.17.24",
     "concurrently": "~5.3.0",
@@ -42,4 +40,4 @@
     "@typescript-eslint/parser": "~2.7.0",
     "typescript": "~4.0.2"
   }
-}
+}

package/lib/generate/templates/app/package.yaml.json

@@ -7,19 +7,15 @@
   "scripts": {
     "build": "foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
-    "develop": "npm run build && concurrently \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-
+    "develop": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
-    "test": "npm run build:test && concurrently \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-
+    "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
     "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
-    "e2e": "npm run build:e2e && concurrently \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
-
+    "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
     "lint:fix": "eslint --ext ts --fix src",
-
     "makemigrations": "foal rmdir build && tsc -p tsconfig.app.json && npx typeorm migration:generate --name migration && tsc -p tsconfig.app.json",
     "migrations": "npx typeorm migration:run",
     "revertmigration": "npx typeorm migration:revert"
@@ -36,6 +32,7 @@
     "yamljs": "~0.3.0"
   },
   "devDependencies": {
+    "@foal/cli": "^2.9.0",
     "@types/mocha": "7.0.2",
     "@types/node": "10.17.24",
     "concurrently": "~5.3.0",
@@ -47,4 +44,4 @@
     "@typescript-eslint/parser": "~2.7.0",
     "typescript": "~4.0.2"
   }
-}
+}

package/lib/generate/templates/app/src/index.ts

@@ -1,8 +1,5 @@
 import 'source-map-support/register';
 
-// std
-import * as http from 'http';
-
 // 3p
 import { Config, createApp, displayServerURL } from '@foal/core';
 
@@ -12,9 +9,8 @@ import { AppController } from './app/app.controller';
 async function main() {
   const app = await createApp(AppController);
 
-  const httpServer = http.createServer(app);
   const port = Config.get('port', 'number', 3001);
-  httpServer.listen(port, () => displayServerURL(port));
+  app.listen(port, () => displayServerURL(port));
 }
 
 main()

package/lib/generate/templates/app/src/scripts/create-user.mongodb.ts

@@ -30,7 +30,7 @@ export async function main(/*args*/) {
     console.log(
       await getMongoManager().save(user)
     );
-  } catch (error) {
+  } catch (error: any) {
     console.log(error.message);
   } finally {
     await getConnection().close();

package/lib/generate/templates/app/src/scripts/create-user.ts

@@ -24,7 +24,7 @@ export async function main(/*args*/) {
     // user.password = await hashPassword(args.password);
 
     console.log(await user.save());
-  } catch (error) {
+  } catch (error: any) {
     console.log(error.message);
   } finally {
     await connection.close();

package/lib/generate/templates/script/script.ts

@@ -16,7 +16,7 @@ export async function main(args: any) {
   try {
     // Do something.
 
-  } catch (error) {
+  } catch (error: any) {
     console.error(error);
   } finally {
     await connection.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foal/cli",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "CLI tool for FoalTS",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -71,5 +71,5 @@
     "ts-node": "~9.0.0",
     "typescript": "~4.0.2"
   },
-  "gitHead": "ec37607a1ffc61ee9020b5e69ae7aa5e9dced1f4"
+  "gitHead": "74055f6a822a42571f6e2ae0b6715b18af297ee7"
 }