innetjs 1.7.4 → 1.8.2

package/bin/innet

@@ -112,17 +112,27 @@ class InnetJS {
         this.api = api;
     }
     // Methods
-    init(appName, { template = 'fe', force = false } = {}) {
+    init(appName, { template, force = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appPath = path__default['default'].resolve(appName);
+            if (!template) {
+                logger__default['default'].log(chalk__default['default'].green(`Select one of those templates`));
+                const { value } = yield selector__default['default']({
+                    values: ['fe', 'be']
+                });
+                template = value;
+                readline.moveCursor(process.stdout, 0, -1);
+                logger__default['default'].log(`Selected ${value} template`);
+            }
             if (!force) {
                 yield logger__default['default'].start('Check if app folder is available', () => __awaiter(this, void 0, void 0, function* () {
                     if (fs__default['default'].existsSync(appPath)) {
-                        console.log(chalk__default['default'].red(`'${appPath}' already exist, what do you want?`));
-                        const { id: result } = yield selector__default['default']({
+                        logger__default['default'].log(chalk__default['default'].red(`'${appPath}' already exist, what do you want?`));
+                        const { id: result, value } = yield selector__default['default']({
                             values: ['Stop the process', 'Remove the folder', 'Merge with template']
                         });
-                        readline.moveCursor(process.stdout, 0, -2);
+                        readline.moveCursor(process.stdout, 0, -1);
+                        logger__default['default'].log(`Already exist, selected: ${value}`);
                         if (!result) {
                             throw Error(`'${appPath}' already exist`);
                         }
@@ -134,11 +144,11 @@ class InnetJS {
             }
             const libPath = path__default['default'].resolve(__dirname, '..');
             const templatePath = path__default['default'].resolve(libPath, 'templates', template);
-            yield logger__default['default'].start('Check if the template exists', () => {
+            yield logger__default['default'].start('Check if the template exists', () => __awaiter(this, void 0, void 0, function* () {
                 if (!fs__default['default'].existsSync(templatePath)) {
                     throw Error(`The template '${template}' is not exist`);
                 }
-            });
+            }));
             yield logger__default['default'].start('Copy files', () => fs__default['default'].copy(templatePath, appPath));
             yield logger__default['default'].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });
@@ -425,7 +435,7 @@ class InnetJS {
     }
 }
 
-var version = "1.7.4";
+var version = "1.8.2";
 
 require('dotenv').config();
 const innetJS = new InnetJS();
@@ -435,8 +445,9 @@ commander.program
     .command('init <app-name>')
     .description('Create innet boilerplate')
     .option('-e, --error', 'Show error details')
-    .action((appName, { error }) => {
-    innetJS.init(appName).catch(e => {
+    .option('-t, --template <template>', 'Select template fe or be')
+    .action((appName, { error, template }) => {
+    innetJS.init(appName, { template }).catch(e => {
         if (error) {
             console.error(e);
             process.exit(1);

package/index.d.ts

@@ -28,10 +28,7 @@ export default class InnetJS {
         port?: number;
         api?: string;
     });
-    init(appName: string, { template, force }?: {
-        template?: string;
-        force?: boolean;
-    }): Promise<void>;
+    init(appName: string, { template, force }?: any): Promise<void>;
     build({ node }?: {
         node?: boolean;
     }): Promise<void>;

package/index.es6.js

@@ -88,17 +88,27 @@ class InnetJS {
         this.api = api;
     }
     // Methods
-    init(appName, { template = 'fe', force = false } = {}) {
+    init(appName, { template, force = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appPath = path.resolve(appName);
+            if (!template) {
+                logger.log(chalk.green(`Select one of those templates`));
+                const { value } = yield selector({
+                    values: ['fe', 'be']
+                });
+                template = value;
+                readline.moveCursor(process.stdout, 0, -1);
+                logger.log(`Selected ${value} template`);
+            }
             if (!force) {
                 yield logger.start('Check if app folder is available', () => __awaiter(this, void 0, void 0, function* () {
                     if (fs.existsSync(appPath)) {
-                        console.log(chalk.red(`'${appPath}' already exist, what do you want?`));
-                        const { id: result } = yield selector({
+                        logger.log(chalk.red(`'${appPath}' already exist, what do you want?`));
+                        const { id: result, value } = yield selector({
                             values: ['Stop the process', 'Remove the folder', 'Merge with template']
                         });
-                        readline.moveCursor(process.stdout, 0, -2);
+                        readline.moveCursor(process.stdout, 0, -1);
+                        logger.log(`Already exist, selected: ${value}`);
                         if (!result) {
                             throw Error(`'${appPath}' already exist`);
                         }
@@ -110,11 +120,11 @@ class InnetJS {
             }
             const libPath = path.resolve(__dirname, '..');
             const templatePath = path.resolve(libPath, 'templates', template);
-            yield logger.start('Check if the template exists', () => {
+            yield logger.start('Check if the template exists', () => __awaiter(this, void 0, void 0, function* () {
                 if (!fs.existsSync(templatePath)) {
                     throw Error(`The template '${template}' is not exist`);
                 }
-            });
+            }));
             yield logger.start('Copy files', () => fs.copy(templatePath, appPath));
             yield logger.start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });

package/index.js

@@ -110,17 +110,27 @@ class InnetJS {
         this.api = api;
     }
     // Methods
-    init(appName, { template = 'fe', force = false } = {}) {
+    init(appName, { template, force = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appPath = path__default['default'].resolve(appName);
+            if (!template) {
+                logger__default['default'].log(chalk__default['default'].green(`Select one of those templates`));
+                const { value } = yield selector__default['default']({
+                    values: ['fe', 'be']
+                });
+                template = value;
+                readline.moveCursor(process.stdout, 0, -1);
+                logger__default['default'].log(`Selected ${value} template`);
+            }
             if (!force) {
                 yield logger__default['default'].start('Check if app folder is available', () => __awaiter(this, void 0, void 0, function* () {
                     if (fs__default['default'].existsSync(appPath)) {
-                        console.log(chalk__default['default'].red(`'${appPath}' already exist, what do you want?`));
-                        const { id: result } = yield selector__default['default']({
+                        logger__default['default'].log(chalk__default['default'].red(`'${appPath}' already exist, what do you want?`));
+                        const { id: result, value } = yield selector__default['default']({
                             values: ['Stop the process', 'Remove the folder', 'Merge with template']
                         });
-                        readline.moveCursor(process.stdout, 0, -2);
+                        readline.moveCursor(process.stdout, 0, -1);
+                        logger__default['default'].log(`Already exist, selected: ${value}`);
                         if (!result) {
                             throw Error(`'${appPath}' already exist`);
                         }
@@ -132,11 +142,11 @@ class InnetJS {
             }
             const libPath = path__default['default'].resolve(__dirname, '..');
             const templatePath = path__default['default'].resolve(libPath, 'templates', template);
-            yield logger__default['default'].start('Check if the template exists', () => {
+            yield logger__default['default'].start('Check if the template exists', () => __awaiter(this, void 0, void 0, function* () {
                 if (!fs__default['default'].existsSync(templatePath)) {
                     throw Error(`The template '${template}' is not exist`);
                 }
-            });
+            }));
             yield logger__default['default'].start('Copy files', () => fs__default['default'].copy(templatePath, appPath));
             yield logger__default['default'].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "innetjs",
-  "version": "1.7.4",
+  "version": "1.8.2",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
   "license": "MIT",
   "bin": {
-    "innetjs": "./bin/innet"
+    "innetjs": "bin/innet"
   },
   "repository": {
     "type": "git",

package/templates/be/.env

@@ -0,0 +1 @@
+BUILD_FOLDER=build

package/templates/be/README.md

@@ -0,0 +1,15 @@
+# be
+
+This is the simplest template of innet.js using for server side.
+
+To start development run:
+```shell
+npm start
+```
+
+To build the project run:
+```shell
+npm run build
+```
+
+

package/templates/be/package.json

@@ -0,0 +1,13 @@
+{
+  "scripts": {
+    "start": "innetjs start -n",
+    "build": "innetjs build -n"
+  },
+  "dependencies": {
+    "@innet/server": "^1.0.2",
+    "innet": "^1.0.0"
+  },
+  "devDependencies": {
+    "innetjs": "^1.8.2"
+  }
+}

package/templates/be/src/App.tsx

@@ -0,0 +1,7 @@
+export default function App () {
+  return (
+    <server onStart={url => console.log(`open: ${url}`)}>
+      Hello World!
+    </server>
+  )
+}

package/templates/be/src/index.tsx

@@ -0,0 +1,6 @@
+import innet from 'innet'
+import server from '@innet/server'
+
+import App from './App'
+
+innet(<App />, server)

package/templates/be/tsconfig.json

@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "/": ["src"],
+      "/*": ["src/*"],
+      "@cantinc/utils": ["src/@cantinc/utils"],
+      "@innet/*": ["src/@innet/*"],
+      "innet/*": ["src/@innet/innet/*"],
+      "innet": ["src/@innet/innet"],
+    },
+    "target": "ES6",
+    "lib": [
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": false,
+    "removeComments": true,
+    "declaration": false,
+    "noEmit": true,
+    "jsx": "preserve"
+  },
+  "include": [
+    "src"
+  ]
+}

package/templates/fe/package.json

@@ -9,6 +9,6 @@
     "watch-state": "^3.3.3"
   },
   "devDependencies": {
-    "innetjs": "^1.7.4"
+    "innetjs": "^1.8.2"
   }
 }