create-blocklet 0.3.2 → 0.3.3

package/index.js

@@ -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'),
         },
       ],
       {

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.2",
+  "version": "0.3.3",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",