@haibun/utils 1.43.0 → 1.44.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/util/index.d.ts +2 -2
- package/build/util/index.d.ts.map +1 -1
- package/build/util/index.js +43 -19
- package/build/util/index.js.map +1 -1
- package/build/version.js +27 -17
- package/build/version.js.map +1 -1
- package/package.json +2 -2
package/build/util/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function spawnCommand(command: string[], module?: string, opts?: {
|
|
2
2
|
show?: boolean;
|
|
3
3
|
env?: {
|
|
4
4
|
[key: string]: string;
|
|
5
5
|
};
|
|
6
|
-
}): string
|
|
6
|
+
}): Promise<string>;
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,SAAM,EACZ,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAAE,GACxD,OAAO,CAAC,MAAM,CAAC,CA+CjB"}
|
package/build/util/index.js
CHANGED
|
@@ -1,21 +1,45 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export function
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
export function spawnCommand(command, module = '.', opts) {
|
|
3
|
+
return new Promise((resolve, reject) => {
|
|
4
|
+
const place = module === '.' ? '<root>' : module;
|
|
5
|
+
console.group(`${place}$ ${command.join(' ')}`);
|
|
6
|
+
const [cmd, ...args] = command;
|
|
7
|
+
const child = spawn(cmd, args, {
|
|
8
|
+
cwd: module,
|
|
9
|
+
env: opts?.env || process.env,
|
|
10
|
+
stdio: ['inherit', 'pipe', 'pipe'] // inherit stdin, pipe stdout/stderr
|
|
11
|
+
});
|
|
12
|
+
let stdoutData = '';
|
|
13
|
+
let stderrData = '';
|
|
14
|
+
child.stdout.on('data', (data) => {
|
|
15
|
+
const str = data.toString();
|
|
16
|
+
stdoutData += str;
|
|
17
|
+
if (opts?.show) {
|
|
18
|
+
process.stdout.write(str); // Stream output if show is true
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
child.stderr.on('data', (data) => {
|
|
22
|
+
const str = data.toString();
|
|
23
|
+
stderrData += str;
|
|
24
|
+
process.stderr.write(str); // Always show stderr
|
|
25
|
+
});
|
|
26
|
+
child.on('error', (error) => {
|
|
27
|
+
console.error(`${place}> Error spawning command: ${error.message}`);
|
|
28
|
+
console.groupEnd();
|
|
29
|
+
reject(error);
|
|
30
|
+
});
|
|
31
|
+
child.on('close', (code) => {
|
|
32
|
+
console.log(`${place}> exited with code ${code}`);
|
|
33
|
+
console.groupEnd();
|
|
34
|
+
if (code === 0) {
|
|
35
|
+
resolve(stdoutData);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
const errorMessage = `${place}: Command failed with code ${code}\nStderr: ${stderrData.trim()}`;
|
|
39
|
+
console.error(errorMessage);
|
|
40
|
+
reject(new Error(errorMessage));
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
});
|
|
20
44
|
}
|
|
21
45
|
//# sourceMappingURL=index.js.map
|
package/build/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,MAAM,UAAU,YAAY,CAC3B,OAAiB,EACjB,MAAM,GAAG,GAAG,EACZ,IAA0D;IAE1D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;QAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;YAC9B,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG;YAC7B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,oCAAoC;SACvE,CAAC,CAAC;QAEH,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,UAAU,GAAG,EAAE,CAAC;QAEpB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,UAAU,IAAI,GAAG,CAAC;YAClB,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,gCAAgC;YAC5D,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,UAAU,IAAI,GAAG,CAAC;YAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;QACjD,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,CAAC,KAAK,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,sBAAsB,IAAI,EAAE,CAAC,CAAC;YAClD,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBAChB,OAAO,CAAC,UAAU,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACP,MAAM,YAAY,GAAG,GAAG,KAAK,8BAA8B,IAAI,aAAa,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC5B,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YACjC,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
package/build/version.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
|
3
3
|
import prettier from 'prettier';
|
|
4
|
-
import {
|
|
4
|
+
import { spawnCommand } from './util/index.js';
|
|
5
5
|
import { createVitest } from 'vitest/node';
|
|
6
6
|
const [, me, version, ...extra] = process.argv;
|
|
7
|
+
async function format(contents) {
|
|
8
|
+
return await prettier.format(JSON.stringify(contents), { parser: 'json' });
|
|
9
|
+
}
|
|
7
10
|
class Versioner {
|
|
8
11
|
version;
|
|
9
12
|
localAndExtraModules = {};
|
|
10
13
|
noTest = false;
|
|
14
|
+
noPublish = false;
|
|
11
15
|
haibunPackageVersions = {};
|
|
12
16
|
constructor(version) {
|
|
13
17
|
this.version = version;
|
|
@@ -20,24 +24,26 @@ class Versioner {
|
|
|
20
24
|
this.noTest = true;
|
|
21
25
|
extra.splice(extra.indexOf('--notest'), 1);
|
|
22
26
|
}
|
|
27
|
+
if (extra.includes('--nopublish')) {
|
|
28
|
+
this.noPublish = true;
|
|
29
|
+
extra.splice(extra.indexOf('--nopublish'), 1);
|
|
30
|
+
}
|
|
23
31
|
}
|
|
24
32
|
async doVersion() {
|
|
25
33
|
const haibunPackageJson = this.updateHaibunPackageVersions();
|
|
26
34
|
haibunPackageJson.version = this.version;
|
|
27
|
-
writeFileSync('./package.json',
|
|
35
|
+
writeFileSync('./package.json', await format(haibunPackageJson));
|
|
28
36
|
this.setLocalAndExtraModules();
|
|
29
37
|
await this.forLocalAndExtraModules(this.updateModule);
|
|
30
38
|
this.updateSourceCurrentVersion();
|
|
31
|
-
this.gitCommit('haibun', '.', ['./modules/core/src/currentVersion.ts']);
|
|
39
|
+
await this.gitCommit('haibun', '.', ['./modules/core/src/currentVersion.ts']);
|
|
32
40
|
await this.forLocalAndExtraModules(this.npmInstall);
|
|
41
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
33
42
|
await this.forLocalAndExtraModules(this.runTest);
|
|
34
43
|
await this.forLocalAndExtraModules(this.gitCommit);
|
|
35
44
|
await this.forLocalAndExtraModules(this.npmPublish);
|
|
36
45
|
await this.forLocalAndExtraModules(this.gitPush);
|
|
37
46
|
}
|
|
38
|
-
format(contents) {
|
|
39
|
-
return prettier.format(JSON.stringify(contents), { parser: 'json' });
|
|
40
|
-
}
|
|
41
47
|
async forLocalAndExtraModules(someFunction) {
|
|
42
48
|
console.info(`\n## ${someFunction.name}`);
|
|
43
49
|
for (const [name, module] of Object.entries(this.localAndExtraModules)) {
|
|
@@ -70,17 +76,20 @@ class Versioner {
|
|
|
70
76
|
this.localAndExtraModules[name] = module;
|
|
71
77
|
}
|
|
72
78
|
}
|
|
73
|
-
npmPublish(name, module) {
|
|
74
|
-
|
|
79
|
+
async npmPublish(name, module) {
|
|
80
|
+
if (this.noPublish) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
await spawnCommand(['npm', 'publish'], module);
|
|
75
84
|
}
|
|
76
|
-
gitPush(name, module) {
|
|
77
|
-
|
|
85
|
+
async gitPush(name, module) {
|
|
86
|
+
await spawnCommand(['git', 'push'], module);
|
|
78
87
|
}
|
|
79
|
-
updateModule(name, location) {
|
|
88
|
+
async updateModule(name, location) {
|
|
80
89
|
const pkgFile = `${location}/package.json`;
|
|
81
90
|
const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
|
|
82
91
|
if (!pkg.publish && pkg.publish !== undefined) {
|
|
83
|
-
return
|
|
92
|
+
return;
|
|
84
93
|
}
|
|
85
94
|
const { main } = pkg;
|
|
86
95
|
if (main && !main.includes('*') && !existsSync(`${location}/${main}`)) {
|
|
@@ -89,7 +98,8 @@ class Versioner {
|
|
|
89
98
|
pkg.version = this.version;
|
|
90
99
|
this.updateDependencies(pkg.dependencies);
|
|
91
100
|
this.updateDependencies(pkg.devDependencies);
|
|
92
|
-
writeFileSync(pkgFile,
|
|
101
|
+
writeFileSync(pkgFile, await format(pkg));
|
|
102
|
+
return;
|
|
93
103
|
}
|
|
94
104
|
updateDependencies(dependencies) {
|
|
95
105
|
for (const d in dependencies) {
|
|
@@ -103,10 +113,10 @@ class Versioner {
|
|
|
103
113
|
}
|
|
104
114
|
}
|
|
105
115
|
}
|
|
106
|
-
gitCommit(name, location, extraPackages = []) {
|
|
116
|
+
async gitCommit(name, location, extraPackages = []) {
|
|
107
117
|
const packages = [...extraPackages, 'package.json'];
|
|
108
118
|
try {
|
|
109
|
-
|
|
119
|
+
await spawnCommand(['git', 'commit', '-m', `'update ${name} to version ${this.version}'`, ...packages], location);
|
|
110
120
|
}
|
|
111
121
|
catch (e) {
|
|
112
122
|
console.error(`git commit failed for ${name}: ${e}`);
|
|
@@ -132,9 +142,9 @@ class Versioner {
|
|
|
132
142
|
process.chdir(originalDir);
|
|
133
143
|
}
|
|
134
144
|
}
|
|
135
|
-
npmInstall(name, location) {
|
|
145
|
+
async npmInstall(name, location) {
|
|
136
146
|
try {
|
|
137
|
-
|
|
147
|
+
await spawnCommand(['npm', 'install'], location);
|
|
138
148
|
}
|
|
139
149
|
catch (e) {
|
|
140
150
|
console.error(`npm install failed for ${name}: ${e}`);
|
package/build/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/utils",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.44.4",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"files": ["ref.package.json", "build/**", "scaffold/**"],
|
|
@@ -21,5 +21,5 @@
|
|
|
21
21
|
"author": "",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5",
|
|
24
|
-
"dependencies": { "@haibun/cli": "1.
|
|
24
|
+
"dependencies": { "@haibun/cli": "1.44.4", "@haibun/core": "1.44.4" }
|
|
25
25
|
}
|