create-blocklet 0.3.1 → 0.3.4

package/index.js

@@ -5,7 +5,7 @@ import boxen from 'boxen';
 import { fileURLToPath } from 'url';
 import { execSync } from 'child_process';
 import { cd, argv, fs, YAML, chalk, path } from 'zx';
-import { startSpinner } from 'zx/experimental';
+import ora from 'ora';
 import prompts from 'prompts';
 import * as envfile from 'envfile';
 
@@ -182,12 +182,14 @@ async function init() {
           name: 'authorName',
           message: 'Author name:',
           initial: authorInfo?.name || '',
+          validate: (name) => (name ? true : 'Author name is required'),
         },
         {
           type: 'text',
           name: 'authorEmail',
           message: 'Author email:',
           initial: authorInfo?.email || '',
+          validate: (email) => (email ? true : 'Author email is required'),
         },
       ],
       {
@@ -204,7 +206,7 @@ async function init() {
   // user choice associated with prompts
   const { type, framework, overwrite, packageName, authorName, authorEmail } = result;
 
-  const stopSpinner = startSpinner();
+  await echoDocument();
 
   const root = path.join(cwd, targetDir);
 
@@ -214,15 +216,18 @@ async function init() {
     fs.mkdirSync(root);
   }
 
-  await echoDocument();
-
-  console.log('Checking blocklet server runtime environment...', '\n');
+  const checkSpinner = ora({
+    text: 'Checking blocklet server runtime environment\n',
+  }).start();
 
   const isServerInstalled = await checkServerInstalled();
   const isSatisfiedVersion = await checkSatisfiedVersion();
   const isServerRunning = await checkServerRunning();
+  checkSpinner.succeed('Done');
+
+  console.log(`\nScaffolding project in ${cyan(root)}`);
 
-  console.log(`\n\nScaffolding project in ${root}...`);
+  const scaffoldSpinner = ora('Creating project...').start();
 
   const templateDir = path.join(__dirname, `template-${type}/${framework}`);
   const name = packageName || targetDir;
@@ -305,9 +310,9 @@ async function init() {
     // fs.writeFileSync(path.join(root, 'logo.png'), pngIcon);
   })();
 
+  scaffoldSpinner.succeed('✨  Done. Now run:\n');
+
   const related = path.relative(cwd, root);
-  console.log('\n\n✨  Done. Now run:\n');
-  stopSpinner();
 
   // const pkgManager =
   //   // eslint-disable-next-line no-nested-ternary
@@ -317,19 +322,20 @@ async function init() {
   //     ? 'yarn'
   //     : 'npm';
   try {
-    const { yes } = await prompts(
-      {
-        type: 'confirm',
-        name: 'yes',
-        initial: 'Y',
-        message: 'Install and start it now?',
-      },
-      {
-        onCancel: () => {
-          throw new Error(`${red('✖')} Operation cancelled`);
-        },
-      }
-    );
+    // const { yes } = await prompts(
+    //   {
+    //     type: 'confirm',
+    //     name: 'yes',
+    //     initial: 'Y',
+    //     message: 'Install and start it now?',
+    //   },
+    //   {
+    //     onCancel: () => {
+    //       throw new Error(`${red('✖')} Operation cancelled`);
+    //     },
+    //   }
+    // );
+    const yes = false;
     let hasStart = false;
 
     await initGitRepo(root);
@@ -463,9 +469,10 @@ async function init() {
       const env = envfile.parse(envContent);
       modifyFn(env);
       write('.env', envfile.stringify(env));
-    } else {
-      console.warn(`\n${yellow('No .env file found, please add one.')}`);
     }
+    // else {
+    //   console.warn(`\n${yellow('No .env file found, please add one.')}`);
+    // }
   }
 }
 

package/lib/arcblock.js

@@ -16,7 +16,7 @@ export function echoBrand({ version = '' }) {
       const indent = (symbolLen - 10) / 2;
       const msgList = [`\n${' '.repeat(indent)}Powered By`, data];
       if (version) {
-        msgList.push(`${' '.repeat((symbolLen - 20) / 2)}Create Blocklet v0.3.0\n`);
+        msgList.push(`${' '.repeat((symbolLen - 20) / 2)}Create Blocklet v${version}\n`);
       }
       msg = gradient(['cyan', 'rgb(0, 111, 150)', 'rgb(0, 246,136)']).multiline(msgList.join('\n'));
       console.log(msg);

package/lib/did.js

@@ -7,7 +7,7 @@ import { fromPublicKey } from '@arcblock/did';
 const { types } = Mcrypto;
 
 export function toBlockletDid(name) {
-  const pk = toHex(name);
+  const pk = toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
   return fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 }
 

package/lib/git.js

@@ -19,7 +19,14 @@ export async function initGitRepo(root) {
 }
 
 export async function getUserInfo() {
-  const { stdout: name } = await $`git config user.name`;
-  const { stdout: email } = await $`git config user.email`;
-  return { name: name.trim(), email: email.trim() };
+  try {
+    const { stdout: name } = await $`git config user.name`;
+    const { stdout: email } = await $`git config user.email`;
+    return { name: name.trim(), email: email.trim() };
+  } catch {
+    return {
+      name: '',
+      email: '',
+    };
+  }
 }

package/lib/index.js

@@ -1,6 +1,7 @@
 import { $ } from 'zx';
 import { getAuthor } from './npm.js';
 import { getUserInfo } from './git.js';
+import { getUserInfo as getServerUserInfo } from './server.js';
 
 $.verbose = false;
 
@@ -10,10 +11,9 @@ export async function getOutput(cmd) {
 }
 
 export async function getUser() {
-  const npmAuthor = await getAuthor();
-  const gitUser = await getUserInfo();
+  const [npmAuthor, gitUser, serverUser] = await Promise.all([getAuthor(), getUserInfo(), getServerUserInfo()]);
   return {
-    name: npmAuthor.name || gitUser.name,
-    email: npmAuthor.email || gitUser.email,
+    name: serverUser.name || npmAuthor.name || gitUser.name || '',
+    email: serverUser.email || npmAuthor.email || gitUser.email || '',
   };
 }

package/lib/npm.js

@@ -4,8 +4,15 @@ import { $ } from 'zx';
 $.verbose = false;
 
 export async function getAuthor() {
-  const { stdout: name } = await $`npm config get init.author.name`;
-  const { stdout: email } = await $`npm config get init.author.email`;
+  try {
+    const { stdout: name } = await $`npm config get init.author.name`;
+    const { stdout: email } = await $`npm config get init.author.email`;
 
-  return { name: name.trim(), email: email.trim() };
+    return { name: name.trim(), email: email.trim() };
+  } catch {
+    return {
+      name: '',
+      email: '',
+    };
+  }
 }

package/lib/server.js

@@ -45,3 +45,19 @@ export async function getServerDirectory() {
   const directory = matchStr.replace(/Blocklet Server Data Directory:[\s]*([\S]+)\/\.abtnode\n/gm, '$1');
   return directory;
 }
+
+export async function getUserInfo() {
+  try {
+    const { stdout: user } = await $`blocklet config get user`;
+    const { stdout: email } = await $`blocklet config get email`;
+    return {
+      user: user?.trim(),
+      email: email?.trim(),
+    };
+  } catch {
+    return {
+      user: '',
+      email: '',
+    };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.3.1",
+  "version": "0.3.4",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",
@@ -40,6 +40,7 @@
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.0",
     "jdenticon": "^3.1.1",
+    "ora": "^6.1.0",
     "prompts": "^2.4.2",
     "semver": "^7.3.5",
     "terminal-link": "^3.0.0",

package/template-api/express/blocklet.yml

@@ -33,10 +33,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-dapp/nextjs/blocklet.yml

@@ -34,10 +34,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-dapp/react/blocklet.yml

@@ -34,10 +34,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-dapp/vue/blocklet.yml

@@ -34,10 +34,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-dapp/vue2/blocklet.yml

@@ -33,10 +33,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-static/react/blocklet.yml

@@ -32,10 +32,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-static/vue/blocklet.yml

@@ -32,10 +32,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/template-static/vue2/blocklet.yml

@@ -32,10 +32,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements: