@foal/cli 2.3.0 → 2.7.0

package/lib/generate/generators/angular/connect-angular.js

@@ -33,13 +33,19 @@ function connectAngular(path) {
         return JSON.stringify(pkg, null, 2);
     })
         .modify('angular.json', content => {
+        var _a, _b, _c, _d, _e;
         const config = JSON.parse(content);
         // Proxy configuration
+        (_a = config.projects[config.defaultProject]).architect || (_a.architect = {});
+        (_b = config.projects[config.defaultProject].architect).serve || (_b.serve = {});
+        (_c = config.projects[config.defaultProject].architect.serve).options || (_c.options = {});
         config.projects[config.defaultProject].architect.serve.options.proxyConfig = 'src/proxy.conf.json';
         // Output build directory
         const outputPath = path_1.join(path_1.relative(path, process.cwd()), 'public')
             // Make projects generated on Windows build on Unix.
             .replace(/\\/g, '/');
+        (_d = config.projects[config.defaultProject].architect).build || (_d.build = {});
+        (_e = config.projects[config.defaultProject].architect.build).options || (_e.options = {});
         config.projects[config.defaultProject].architect.build.options.outputPath = outputPath;
         return JSON.stringify(config, null, 2);
     });

package/lib/generate/generators/entity/create-entity.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEntity = void 0;
 // FoalTS
+const path_1 = require("path");
 const file_system_1 = require("../../file-system");
 const utils_1 = require("../../utils");
 function createEntity({ name }) {
@@ -13,10 +14,13 @@ function createEntity({ name }) {
     else if (fs.exists('entities')) {
         root = 'entities';
     }
-    const names = utils_1.getNames(name);
+    const names = utils_1.getNames(path_1.basename(name));
+    const subdir = path_1.dirname(name);
     const isMongoDBProject = fs.projectHasDependency('mongodb');
     fs
         .cd(root)
+        .ensureDir(subdir)
+        .cd(subdir)
         .renderOnlyIf(!isMongoDBProject, 'entity/entity.ts', `${names.kebabName}.entity.ts`, names)
         .renderOnlyIf(isMongoDBProject, 'entity/entity.mongodb.ts', `${names.kebabName}.entity.ts`, names)
         .ensureFile('index.ts')

package/lib/generate/generators/hook/create-hook.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHook = void 0;
 // FoalTS
+const path_1 = require("path");
 const file_system_1 = require("../../file-system");
 const utils_1 = require("../../utils");
 function createHook({ name }) {
@@ -13,9 +14,12 @@ function createHook({ name }) {
     else if (fs.exists('hooks')) {
         root = 'hooks';
     }
-    const names = utils_1.getNames(name);
+    const names = utils_1.getNames(path_1.basename(name));
+    const subdir = path_1.dirname(name);
     fs
         .cd(root)
+        .ensureDir(subdir)
+        .cd(subdir)
         .render('hook/hook.ts', `${names.kebabName}.hook.ts`, names)
         .ensureFile('index.ts')
         .addNamedExportIn('index.ts', names.upperFirstCamelName, `./${names.kebabName}.hook`);

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

@@ -7,7 +7,7 @@
   "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 --no-restart-on error ./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\"",
 
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",

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

@@ -7,7 +7,7 @@
   "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 --no-restart-on error ./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\"",
 
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
@@ -21,7 +21,7 @@
     "lint:fix": "eslint --ext ts --fix src"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "dependencies": {
     "@foal/core": "^2.0.0",

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

@@ -7,7 +7,7 @@
   "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 --no-restart-on error ./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\"",
 
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
@@ -21,7 +21,7 @@
     "lint:fix": "eslint --ext ts --fix src"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "dependencies": {
     "@foal/core": "^2.0.0",

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

@@ -7,7 +7,7 @@
   "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 --no-restart-on error ./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\"",
 
     "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
@@ -25,7 +25,7 @@
     "revertmigration": "npx typeorm migration:revert"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "dependencies": {
     "@foal/core": "^2.0.0",

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

@@ -1,7 +1,6 @@
 // 3p
-// import { Group, Permission } from '@foal/typeorm';
-// import { isCommon } from '@foal/password';
-import { createConnection, getConnection, getManager } from 'typeorm';
+// import { hashPassword } from '@foal/core';
+import { createConnection } from 'typeorm';
 
 // App
 import { User } from '../app/entities';
@@ -10,52 +9,24 @@ export const schema = {
   additionalProperties: false,
   properties: {
     // email: { type: 'string', format: 'email' },
-    // groups: { type: 'array', items: { type: 'string' }, uniqueItems: true, default: [] },
     // password: { type: 'string' },
-    // userPermissions: { type: 'array', items: { type: 'string' }, uniqueItems: true, default: [] },
   },
   required: [ /* 'email', 'password' */ ],
   type: 'object',
 };
 
 export async function main(/*args*/) {
-  const user = new User();
-  // user.userPermissions = [];
-  // user.groups = [];
-  // user.email = args.email;
-  // if (await isCommon(args.password)) {
-  //   console.log('This password is too common. Please choose another one.');
-  //   return;
-  // }
-  // await user.setPassword(args.password);
-
-  await createConnection();
-
-  // for (const codeName of args.userPermissions as string[]) {
-  //   const permission = await Permission.findOne({ codeName });
-  //   if (!permission) {
-  //     console.log(`No permission with the code name "${codeName}" was found.`);
-  //     return;
-  //   }
-  //   user.userPermissions.push(permission);
-  // }
-
-  // for (const codeName of args.groups as string[]) {
-  //   const group = await Group.findOne({ codeName });
-  //   if (!group) {
-  //     console.log(`No group with the code name "${codeName}" was found.`);
-  //     return;
-  //   }
-  //   user.groups.push(group);
-  // }
+  const connection = await createConnection();
 
   try {
-    console.log(
-      await getManager().save(user)
-    );
+    const user = new User();
+    // user.email = args.email;
+    // user.password = await hashPassword(args.password);
+
+    console.log(await user.save());
   } catch (error) {
     console.log(error.message);
   } finally {
-    await getConnection().close();
+    await connection.close();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foal/cli",
-  "version": "2.3.0",
+  "version": "2.7.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": "25c7a245f3806abd4465694958739bc5106bed00"
+  "gitHead": "f29806e349427d412606a2086ae474f2b65df3ac"
 }