sinto 1.4.0 → 1.5.0

package/gentest/generate.js

@@ -3,18 +3,19 @@ const puppeteerTestContent = require('./testPupContent');
 const jsonfile = require('jsonfile');
 const path = require('path');
 const { exec } = require('child_process');
+const { addDevDep } = require('../tools/dep.js');
 
-const createPuppeteerTest = () => {    
+const createPuppeteerTest = async () => {    
     const dir = process.cwd();
     createDirectory(`${dir}/test`);
     createFile(`${dir}/test/apptest.js`, puppeteerTestContent);
 
-    writeTestScript();  
+    await writeTestScriptInPackageJson();  
 }
 
-async function writeTestScript() {    
-    const currentDirectory = process.cwd();
-    const filePath = currentDirectory + '/package.json'
+async function writeTestScriptInPackageJson() {    
+    const dir = process.cwd();
+    const filePath = dir + '/package.json'
     jsonfile.readFile(filePath, async (err, obj) => {
         if(err) {
             console.error('Error! Failed to read package.json file.', err);
@@ -34,54 +35,10 @@ async function writeTestScript() {
     });
 }
 
-async function addDependency(packageName) {
-    return new Promise((resolve, reject) => {
-      exec(`npm view ${packageName} version`, (err, stdout, stderr) => {
-        if (err) {
-          reject(`Error! Retrieving the version of package named ${packageName} failed: ${stderr}`);
-        } else {
-          const version = stdout.trim();
-          resolve({ [packageName]: `^${version}` });
-        }
-      });
-    });
-}
-
-async function writePuppeteerDependencies(packageNames) {
-    const currentDirectory = process.cwd();
-    const filePath = currentDirectory + '/package.json';
-
-    jsonfile.readFile(filePath, async (err, obj) => {
-        if (err) {
-        console.error('Error! Failed to read package.json file:', err);
-        return;
-        }
-    
-        try {
-            obj.dependencies = obj.dependencies || {};
-
-            for(const packageName of packageNames) {
-                try {
-                    const newDependency = await addDependency(packageName);
-                    Object.assign(obj.devDependencies, newDependency);
-                }catch(error) {
-                    console.error(error);
-                    return;
-                }
-            }
-
-            jsonfile.writeFile(filePath, obj, { spaces: 2 }, (err) => {
-                if (err) {
-                console.error('Error! Failed to write package.json:', err);
-                } else {
-                console.log(`Added new depencies`);
-                }
-            });
-        } catch (error) {
-            console.error(error);
-        }
-    });
-
+const writePuppeteerDependencies = async (packageNames) => {
+    const dir = process.cwd();
+    const filePath = dir + '/package.json';
+    await addDevDep(filePath, packageNames);
 }
 
 module.exports.createPuppeteerTest = createPuppeteerTest;

package/gents/gents.js

@@ -0,0 +1,36 @@
+const tsconfigContent = require('./tsconfigContent');
+const { createFile } = require('../tools/tools.js');
+const jsonfile = require('jsonfile');
+const { addDevDep } = require('../tools/dep.js');
+
+const supplementTypescript = () => {
+    writeConfigFile();
+    showMsg();
+    addDependencies();
+}
+
+const writeConfigFile = () => {
+    const dir = process.cwd();
+    const path = `${dir}/tsconfig.json`;
+    jsonfile.writeFileSync(path, tsconfigContent, { spaces: 2 });
+}
+
+const showMsg = () => {
+    console.log(`
+Proposal:
+In the tsconfig.json file, leave the module value
+at commonjs for a NodeJS project. In the case of 
+an ES project, rewrite it to, for example, ES6.
+
+Install dependencies:
+pnpm install
+        `);
+}
+
+const addDependencies = () => {
+    const dir = process.cwd();
+    const path = `${dir}/package.json`;
+    addDevDep(path, ['typescript']);
+}
+
+module.exports.supplementTypescript = supplementTypescript;

package/gents/tsconfigContent.js

@@ -0,0 +1,14 @@
+
+const tsconfigContent = 
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "commonjs",
+        "outDir": "./app",
+        "strict": true,
+        "esModuleInterop": true
+    }
+}
+
+
+module.exports = tsconfigContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sinto",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Website project development manager",
   "bin": {
     "sin": "sin.js"

package/sin.js

@@ -7,14 +7,15 @@ const { build } = require('./build/build');
 const { rmno } = require('./rmno/rmno');
 const { createApi } = require('./haiserver/apigen');
 const { createWebpack } = require('./webpack/generate');
-const { createPuppeteerTest } = require('./gentest/generate')
+const { createPuppeteerTest } = require('./gentest/generate');
+const { supplementTypescript } = require('./gents/gents');
 
 const program = new Command();
 
 program
     .name('sin')
     .description('Project handler')
-    .version('1.4.0');
+    .version('1.5.0');
 
 program
     .command('init')
@@ -62,8 +63,16 @@ program
 program
     .command('pup')
     .description('Puppeteer test')
+    .action(async () => {
+        await createPuppeteerTest();
+    })
+
+program
+    .command('ts')
+    .description('Supplement with TypeScript')
     .action(() => {
-        createPuppeteerTest();
+        supplementTypescript();
     })
 
+
 program.parse();

package/tools/dep.js

@@ -0,0 +1,77 @@
+const {debug} = require('../config.json');
+const jsonfile = require('jsonfile');
+const util = require('util');
+const exec = util.promisify(require('child_process').exec);
+
+const addDep = async (filePath, packageNames) => {
+    await writeDependencies(filePath, packageNames, false);
+}
+
+const addDevDep = async (filePath, packageNames) => {
+    await writeDependencies(filePath, packageNames, true);
+}
+
+async function writeDependencies(filePath, packageNames, devDep) {  
+    var obj = await readJsonFile(filePath);
+    obj = await addDependencies(obj, packageNames, devDep);
+    await writeJsonFile(filePath, obj);
+}
+
+async function readJsonFile(filePath) {
+    try {
+        const obj = await jsonfile.readFile(filePath);
+        if(debug) {
+            console.log(`Readed JSON file`);
+        }        
+        return obj;
+    } catch (err) {
+        console.error(`Error! Failed to read ${filePath}`);
+        console.error(err);
+    }
+}
+
+async function addDependencies(obj, packageNames, devDep) {
+    for(const packageName of packageNames) {
+        try {
+            const newDependency = await getPackageInfo(packageName);
+            if(devDep) {
+                await Object.assign(obj.devDependencies, newDependency);
+            }else {
+                await Object.assign(obj.dependencies, newDependency);
+            }
+            
+        } catch (err) {
+            console.error(`Error! Failed add packages!`);
+            console.error(err);       
+        }
+    }
+    return obj;
+}
+
+async function getPackageInfo(packageName) {
+    try {
+        const { stdout, stderr } = await exec(`npm view ${packageName} version`);
+        if (stderr) {
+            throw new Error(`Error! Retrieving the version of package named ${packageName} failed: ${stderr}`);
+        }
+        const version = stdout.trim();
+        return { [packageName]: `^${version}` };
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+async function writeJsonFile(path, obj) {
+    try {
+        await jsonfile.writeFile(path, obj, { spaces: 2});
+        if(debug) {
+            console.log(`Added new depencies`);
+        }
+    } catch (err) {
+        console.error('Error! Failed to write package.json:');
+        console.error(err);
+    }
+}
+
+module.exports.addDep = addDep;
+module.exports.addDevDep = addDevDep;

package/artisan/artisan.js

@@ -1,5 +0,0 @@
-
-
-function egy() {
-    console.log('Egy...')
-}

package/cli.js

@@ -1,7 +0,0 @@
-
-const yargs = require('yargs/yargs')
-const { hideBin } = require('yargs/helpers')
-
-const cli = yargs(hideBin(process.argv));
-
-module.exports = cli;