Merge branch 'master' of git.wkit.fun:yutent/bash-calendar

build.mjs

@@ -1,5 +1,7 @@
-const esbuild = require('esbuild')
+import esbuild from 'esbuild'
-const { version } = require('./package.json')
+import pkg from './package.json' assert { type: 'json' }
+
+const { version } = pkg
 
 esbuild.build({
   entryPoints: ['src/index.js'],

src/calendar.js

@@ -221,8 +221,11 @@ function drawTbody(year, month) {
                 : tmp.weekend
                 ? chalk.redBright(tmp.lunar)
                 : chalk.grey(tmp.lunar)
+              //
+              tr += ' '.repeat(pad + 2) + tmp.lunar + ' '.repeat(pad + 2) + VLINE
+            } else {
+              tr += ' '.repeat(pad * 2) + VLINE
             }
-            tr += ' '.repeat(pad + 2) + tmp.lunar + ' '.repeat(pad + 2) + VLINE
           }
           break
       }

src/index.js

@@ -11,10 +11,10 @@ import chalk from 'chalk'
 import { CACHE_FILE } from './lunar/config.js'
 import { getThisYearMonth, drawCalendar } from './calendar.js'
 
-var version = process.env.APP_VERSION
+const version = process.env.APP_VERSION
-var argvs = process.argv.slice(2)
+const argvs = process.argv.slice(2)
-var action = argvs.shift()
+let action = argvs.shift()
-var [year, month] = getThisYearMonth()
+let [year, month] = getThisYearMonth()
 
 function drawOneYear(y) {
   for (let i = 0; i < 12; i++) {