Skip to content

Commit bd9f521

Browse files
committed
Put programName inside pkg info
1 parent 1ade790 commit bd9f521

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

bin/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ import {
1414
handleDisplayConfigList,
1515
handleUseAction,
1616
handleUpgrade,
17-
getProgramName
1817
} from '../lib/handler.js';
1918

2019
const program = new Command();
2120

2221
program
23-
.name(getProgramName())
22+
.name(pkg.programName)
2423
.version(pkg.version)
2524
.addHelpCommand(false)
2625
.addHelpText('beforeAll', program => {

lib/handler.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import os from 'node:os';
44
import { stdin } from 'node:process';
55
import { execSync } from 'node:child_process';
66

7-
import { pkg, config, configPath, configDownloadPath } from './static.js'
7+
import { config, configPath, configDownloadPath } from './static.js'
88
import { parse } from './parse.js';
99
import { preview } from './preview/index.js';
1010
import { render } from './render.js';
@@ -124,11 +124,6 @@ export function handleDisplayConfigList() {
124124
console.log(JSON.stringify(config, null, 2));
125125
}
126126

127-
export function getProgramName() {
128-
let name = path.basename(process.argv[1]);
129-
return pkg.bin[name] ? name : 'cssd';
130-
}
131-
132127
export function handleUpgrade() {
133128
console.log('Upgrading CLI...');
134129
execSync('npm update -g @css-doodle/cli', { stdio: 'inherit' });

lib/static.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import fs from 'node:fs';
22
import os from 'node:os';
3-
import { dirname, join } from 'node:path';
3+
import { dirname, join, basename } from 'node:path';
44
import { fileURLToPath } from 'node:url';
55

66
const isLinux = os.platform() === 'linux';
77
const root = dirname(fileURLToPath(import.meta.url));
88
const configDir = join(os.homedir(), '.css-doodle');
99
const configFilePath = join(configDir, 'config.json');
1010
const configDownloadDir = join(configDir, 'download');
11+
const pkgInfo = JSON.parse(read('../package.json'));
1112

1213
if (!fs.existsSync(configDir)) {
1314
fs.mkdirSync(configDir);
@@ -45,6 +46,12 @@ function getDefaultAppArgs() {
4546
return args;
4647
}
4748

49+
function getPackageInfo() {
50+
let name = basename(process.argv[1]);
51+
let programName = pkgInfo.bin?.[name] ? name : 'cssd';
52+
return Object.assign(pkgInfo, { programName });
53+
}
54+
4855
export function getCssDoodleLib() {
4956
const libPath = config['css-doodle'];
5057
if (libPath) {
@@ -78,7 +85,7 @@ export const config = JSON.parse(fs.readFileSync(configFilePath), 'utf8');
7885
export const configPath = configFilePath;
7986
export const configDownloadPath = configDownloadDir;
8087

81-
export const pkg = JSON.parse(read('../package.json'));
8288
export const previewClient = read('./preview/client.html');
8389
export const previewServerPath = join(root, './preview/server.js');
8490
export const defaultAppArgs = getDefaultAppArgs();
91+
export const pkg = getPackageInfo();

0 commit comments

Comments
 (0)