@git.zone/cli 2.7.0 โ 2.8.0
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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_commit/index.js +24 -3
- package/dist_ts/mod_commit/mod.ui.d.ts +1 -0
- package/dist_ts/mod_commit/mod.ui.js +5 -1
- package/dist_ts/mod_config/classes.commitconfig.d.ts +41 -0
- package/dist_ts/mod_config/classes.commitconfig.js +83 -0
- package/dist_ts/mod_config/index.d.ts +2 -1
- package/dist_ts/mod_config/index.js +119 -3
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_commit/index.ts +30 -2
- package/ts/mod_commit/mod.ui.ts +5 -0
- package/ts/mod_config/classes.commitconfig.ts +104 -0
- package/ts/mod_config/index.ts +129 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.8.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
|
|
@@ -6,9 +6,14 @@ import * as helpers from './mod.helpers.js';
|
|
|
6
6
|
import * as ui from './mod.ui.js';
|
|
7
7
|
import { ReleaseConfig } from '../mod_config/classes.releaseconfig.js';
|
|
8
8
|
export const run = async (argvArg) => {
|
|
9
|
-
//
|
|
9
|
+
// Read commit config from npmextra.json
|
|
10
|
+
const npmextraConfig = new plugins.npmextra.Npmextra();
|
|
11
|
+
const gitzoneConfig = npmextraConfig.dataFor('@git.zone/cli', {});
|
|
12
|
+
const commitConfig = gitzoneConfig.commit || {};
|
|
13
|
+
// Check flags and merge with config options
|
|
10
14
|
const wantsRelease = !!(argvArg.r || argvArg.release);
|
|
11
|
-
const
|
|
15
|
+
const wantsTest = !!(argvArg.t || argvArg.test || commitConfig.alwaysTest);
|
|
16
|
+
const wantsBuild = !!(argvArg.b || argvArg.build || commitConfig.alwaysBuild);
|
|
12
17
|
let releaseConfig = null;
|
|
13
18
|
if (wantsRelease) {
|
|
14
19
|
releaseConfig = await ReleaseConfig.fromCwd();
|
|
@@ -24,6 +29,7 @@ export const run = async (argvArg) => {
|
|
|
24
29
|
ui.printExecutionPlan({
|
|
25
30
|
autoAccept: !!(argvArg.y || argvArg.yes),
|
|
26
31
|
push: !!(argvArg.p || argvArg.push),
|
|
32
|
+
test: wantsTest,
|
|
27
33
|
build: wantsBuild,
|
|
28
34
|
release: wantsRelease,
|
|
29
35
|
format: !!argvArg.format,
|
|
@@ -33,6 +39,20 @@ export const run = async (argvArg) => {
|
|
|
33
39
|
const formatMod = await import('../mod_format/index.js');
|
|
34
40
|
await formatMod.run();
|
|
35
41
|
}
|
|
42
|
+
// Run tests early to fail fast before analysis
|
|
43
|
+
if (wantsTest) {
|
|
44
|
+
ui.printHeader('๐งช Running tests...');
|
|
45
|
+
const smartshellForTest = new plugins.smartshell.Smartshell({
|
|
46
|
+
executor: 'bash',
|
|
47
|
+
sourceFilePaths: [],
|
|
48
|
+
});
|
|
49
|
+
const testResult = await smartshellForTest.exec('pnpm test');
|
|
50
|
+
if (testResult.exitCode !== 0) {
|
|
51
|
+
logger.log('error', 'Tests failed. Aborting commit.');
|
|
52
|
+
process.exit(1);
|
|
53
|
+
}
|
|
54
|
+
logger.log('success', 'All tests passed.');
|
|
55
|
+
}
|
|
36
56
|
ui.printHeader('๐ Analyzing repository changes...');
|
|
37
57
|
const aidoc = new plugins.tsdoc.AiDoc();
|
|
38
58
|
await aidoc.start();
|
|
@@ -145,6 +165,7 @@ export const run = async (argvArg) => {
|
|
|
145
165
|
}
|
|
146
166
|
}
|
|
147
167
|
// Determine total steps based on options
|
|
168
|
+
// Note: test runs early (like format) so not counted in numbered steps
|
|
148
169
|
const willPush = answerBucket.getAnswerFor('pushToOrigin') && !(process.env.CI === 'true');
|
|
149
170
|
const willRelease = answerBucket.getAnswerFor('createRelease') && releaseConfig?.hasRegistries();
|
|
150
171
|
let totalSteps = 5; // Base steps: commitinfo, changelog, staging, commit, version
|
|
@@ -273,4 +294,4 @@ const createCommitStringFromAnswerBucket = (answerBucket) => {
|
|
|
273
294
|
const commitDescription = answerBucket.getAnswerFor('commitDescription');
|
|
274
295
|
return `${commitType}(${commitScope}): ${commitDescription}`;
|
|
275
296
|
};
|
|
276
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_commit/index.ts"],"names":[],"mappings":"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"}
|
|
297
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_commit/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEvE,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;IACxC,wCAAwC;IACxC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACvD,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAKzC,eAAe,EAAE,EAAE,CAAC,CAAC;IACxB,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC;IAEhD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,aAAa,GAAyB,IAAI,CAAC;IAE/C,IAAI,YAAY,EAAE,CAAC;QACjB,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,oCAAoC;IACpC,EAAE,CAAC,kBAAkB,CAAC;QACpB,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC;QACxC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;QACnC,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,UAAU;QACjB,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;QACxB,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE;KAC3C,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QACzD,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,+CAA+C;IAC/C,IAAI,SAAS,EAAE,CAAC;QACd,EAAE,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACtC,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;YAC1D,QAAQ,EAAE,MAAM;YAChB,eAAe,EAAE,EAAE;SACpB,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,UAAU,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAC;YACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC7C,CAAC;IAED,EAAE,CAAC,WAAW,CAAC,oCAAoC,CAAC,CAAC;IAErD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IAEpB,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IAEnB,EAAE,CAAC,mBAAmB,CAAC;QACrB,sBAAsB,EAAE,gBAAgB,CAAC,sBAAsB;QAC/D,2BAA2B,EAAE,gBAAgB,CAAC,2BAA2B;QACzE,2BAA2B,EAAE,gBAAgB,CAAC,2BAA2B;QACzE,6BAA6B,EAAE,gBAAgB,CAAC,6BAA6B;KAC9E,CAAC,CAAC;IAEH,IAAI,YAAgD,CAAC;IAErD,qEAAqE;IACrE,4EAA4E;IAC5E,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,2BAA2B,KAAK,iBAAiB,CAAC;IAC5F,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC;IAEtE,IAAI,aAAa,EAAE,CAAC;QAClB,kDAAkD;QAClD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,CAAC,CAAC;QAEvE,YAAY,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QACxD,YAAY,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,gBAAgB,CAAC,2BAA2B;SACpD,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,gBAAgB,CAAC,2BAA2B;SACpD,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,gBAAgB,CAAC,6BAA6B;SACtD,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,qCAAqC;SAC5E,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,qFAAqF;QACrF,IAAI,gBAAgB,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6DAA6D,CAAC,CAAC;QACpF,CAAC;QACD,0CAA0C;QAC1C,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACjE,cAAc,CAAC,YAAY,CAAC;YAC1B;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,4BAA4B;gBACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC;gBAC3C,OAAO,EAAE,gBAAgB,CAAC,2BAA2B;aACtD;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,kCAAkC;gBAC3C,OAAO,EAAE,gBAAgB,CAAC,2BAA2B;aACtD;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,gBAAgB,CAAC,6BAA6B;aACxD;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,uCAAuC;gBAChD,OAAO,EAAE,IAAI;aACd;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,2CAA2C;gBACpD,OAAO,EAAE,YAAY;aACtB;SACF,CAAC,CAAC;QACH,YAAY,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,YAAY,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE;QAC9B,QAAQ,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC;YACjB,KAAK,MAAM;gBACT,OAAO,OAAO,CAAC;YACjB,KAAK,iBAAiB;gBACpB,OAAO,OAAO,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,EAAE,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;IAC7C,EAAE,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAC3D,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,EAAE;KACpB,CAAC,CAAC;IAEH,wEAAwE;IACxE,IAAI,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACjE,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,uEAAuE;IACvE,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IAC3F,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,aAAa,EAAE,aAAa,EAAE,CAAC;IACjG,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,8DAA8D;IAClF,IAAI,UAAU;QAAE,UAAU,IAAI,CAAC,CAAC,CAAC,iCAAiC;IAClE,IAAI,QAAQ;QAAE,UAAU,EAAE,CAAC;IAC3B,IAAI,WAAW;QAAE,UAAU,EAAE,CAAC;IAC9B,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,4BAA4B;IAC5B,WAAW,EAAE,CAAC;IACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,iCAAiC,EAAE,aAAa,CAAC,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAClD,KAAK,CAAC,GAAG,EACT,iBAAiB,CAClB,CAAC;IACF,MAAM,UAAU,CAAC,sBAAsB,EAAE,CAAC;IAC1C,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,iCAAiC,EAAE,MAAM,CAAC,CAAC;IAEjF,4BAA4B;IAC5B,WAAW,EAAE,CAAC;IACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,4BAA4B,EAAE,aAAa,CAAC,CAAC;IACnF,IAAI,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;IAC3C,SAAS,GAAG,SAAS,CAAC,UAAU,CAC9B,iBAAiB,EACjB,CAAC,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC,aAAa,CACzD,CAAC;IACF,SAAS,GAAG,SAAS,CAAC,UAAU,CAC9B,sBAAsB,EACtB,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,MAAM,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CACtG,CAAC;IACF,SAAS,GAAG,SAAS,CAAC,UAAU,CAC9B,wBAAwB,EACxB,gBAAgB,CAAC,6BAA6B,CAC/C,CAAC;IACF,IAAI,gBAAgB,CAAC,6BAA6B,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/D,SAAS,GAAG,SAAS,CAAC,UAAU,CAC9B,wBAAwB,EACxB,IAAI,GAAG,gBAAgB,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CACnE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,OAAO,CAAC,OAAO;SAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;SAClD,QAAQ,CAAC,MAAM,CAAC;SAChB,KAAK,CAAC,SAAS,CAAC,CAAC;IACpB,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAC;IAE5E,wBAAwB;IACxB,WAAW,EAAE,CAAC;IACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;IACzE,MAAM,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;IAElE,0BAA0B;IAC1B,WAAW,EAAE,CAAC;IACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,wBAAwB,EAAE,aAAa,CAAC,CAAC;IAC/E,MAAM,kBAAkB,CAAC,IAAI,CAAC,kBAAkB,YAAY,GAAG,CAAC,CAAC;IACjE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,CAAC,CAAC;IAExE,0BAA0B;IAC1B,WAAW,EAAE,CAAC;IACd,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAE7G,+BAA+B;IAC/B,IAAI,UAAU,EAAE,CAAC;QACf,WAAW,EAAE,CAAC;QACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAChE,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iCAAiC,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAElE,wCAAwC;QACxC,WAAW,EAAE,CAAC;QACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,iCAAiC,EAAE,aAAa,CAAC,CAAC;QACxF,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC7E,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACtC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,iCAAiC,EAAE,OAAO,CAAC,CAAC;YAClF,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wFAAwF,CAAC,CAAC;YAC9G,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mEAAmE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,iCAAiC,EAAE,MAAM,CAAC,CAAC;IACnF,CAAC;IAED,kCAAkC;IAClC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC1D,IAAI,QAAQ,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,wBAAwB,aAAa,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9F,MAAM,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,aAAa,gBAAgB,CAAC,CAAC;QAChF,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,wBAAwB,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;IACzF,CAAC;IAED,+CAA+C;IAC/C,IAAI,kBAAkB,GAAa,EAAE,CAAC;IACtC,IAAI,WAAW,IAAI,aAAa,EAAE,CAAC;QACjC,WAAW,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;QACjD,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,oBAAoB,UAAU,CAAC,MAAM,WAAW,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,aAAa,CAAC,CAAC;QAE9I,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;QACnD,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,kBAAkB,CAAC,IAAI,CAAC,0BAA0B,QAAQ,aAAa,WAAW,EAAE,CAAC,CAAC;gBAC5F,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wBAAwB,QAAQ,KAAK,KAAK,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACpD,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,oBAAoB,UAAU,CAAC,MAAM,WAAW,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzI,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,oBAAoB,UAAU,CAAC,MAAM,WAAW,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1I,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,6BAA6B;IAE9C,6BAA6B;IAC7B,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAEhD,sBAAsB;IACtB,EAAE,CAAC,YAAY,CAAC;QACd,WAAW;QACX,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC;QACnD,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC7D,UAAU,EAAE,UAAU;QACtB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,kBAAkB,CAAC,MAAM,GAAG,CAAC;QACvC,kBAAkB,EAAE,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS;KACnF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,kCAAkC,GAAG,CACzC,YAAgD,EAChD,EAAE;IACF,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,iBAAiB,GAAG,YAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACzE,OAAO,GAAG,UAAU,IAAI,WAAW,MAAM,iBAAiB,EAAE,CAAC;AAC/D,CAAC,CAAC"}
|
|
@@ -26,6 +26,7 @@ export function printExecutionPlan(options) {
|
|
|
26
26
|
console.log(' Options:');
|
|
27
27
|
console.log(` Auto-accept ${options.autoAccept ? 'โ enabled (-y)' : 'โ interactive mode'}`);
|
|
28
28
|
console.log(` Push to remote ${options.push ? 'โ enabled (-p)' : 'โ disabled'}`);
|
|
29
|
+
console.log(` Test first ${options.test ? 'โ enabled (-t)' : 'โ disabled'}`);
|
|
29
30
|
console.log(` Build & verify ${options.build ? 'โ enabled (-b)' : 'โ disabled'}`);
|
|
30
31
|
console.log(` Release to npm ${options.release ? 'โ enabled (-r)' : 'โ disabled'}`);
|
|
31
32
|
if (options.format) {
|
|
@@ -38,6 +39,9 @@ export function printExecutionPlan(options) {
|
|
|
38
39
|
if (options.format) {
|
|
39
40
|
console.log(` ${stepNum++}. Format project files`);
|
|
40
41
|
}
|
|
42
|
+
if (options.test) {
|
|
43
|
+
console.log(` ${stepNum++}. Run tests`);
|
|
44
|
+
}
|
|
41
45
|
console.log(` ${stepNum++}. Analyze repository changes`);
|
|
42
46
|
console.log(` ${stepNum++}. Bake commit info into code`);
|
|
43
47
|
console.log(` ${stepNum++}. Generate changelog.md`);
|
|
@@ -198,4 +202,4 @@ export function printError(message) {
|
|
|
198
202
|
export function printCommitMessage(commitString) {
|
|
199
203
|
console.log(`\n ๐ Commit: ${commitString}\n`);
|
|
200
204
|
}
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
205
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.ui.js","sourceRoot":"","sources":["../../ts/mod_commit/mod.ui.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export interface ICommitConfig {
|
|
2
|
+
alwaysTest: boolean;
|
|
3
|
+
alwaysBuild: boolean;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Manages commit configuration stored in npmextra.json
|
|
7
|
+
* under @git.zone/cli.commit namespace
|
|
8
|
+
*/
|
|
9
|
+
export declare class CommitConfig {
|
|
10
|
+
private cwd;
|
|
11
|
+
private config;
|
|
12
|
+
constructor(cwd?: string);
|
|
13
|
+
/**
|
|
14
|
+
* Create a CommitConfig instance from current working directory
|
|
15
|
+
*/
|
|
16
|
+
static fromCwd(cwd?: string): Promise<CommitConfig>;
|
|
17
|
+
/**
|
|
18
|
+
* Load configuration from npmextra.json
|
|
19
|
+
*/
|
|
20
|
+
load(): Promise<void>;
|
|
21
|
+
/**
|
|
22
|
+
* Save configuration to npmextra.json
|
|
23
|
+
*/
|
|
24
|
+
save(): Promise<void>;
|
|
25
|
+
/**
|
|
26
|
+
* Get alwaysTest setting
|
|
27
|
+
*/
|
|
28
|
+
getAlwaysTest(): boolean;
|
|
29
|
+
/**
|
|
30
|
+
* Set alwaysTest setting
|
|
31
|
+
*/
|
|
32
|
+
setAlwaysTest(value: boolean): void;
|
|
33
|
+
/**
|
|
34
|
+
* Get alwaysBuild setting
|
|
35
|
+
*/
|
|
36
|
+
getAlwaysBuild(): boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Set alwaysBuild setting
|
|
39
|
+
*/
|
|
40
|
+
setAlwaysBuild(value: boolean): void;
|
|
41
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import * as plugins from './mod.plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Manages commit configuration stored in npmextra.json
|
|
4
|
+
* under @git.zone/cli.commit namespace
|
|
5
|
+
*/
|
|
6
|
+
export class CommitConfig {
|
|
7
|
+
constructor(cwd = process.cwd()) {
|
|
8
|
+
this.cwd = cwd;
|
|
9
|
+
this.config = { alwaysTest: false, alwaysBuild: false };
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Create a CommitConfig instance from current working directory
|
|
13
|
+
*/
|
|
14
|
+
static async fromCwd(cwd = process.cwd()) {
|
|
15
|
+
const instance = new CommitConfig(cwd);
|
|
16
|
+
await instance.load();
|
|
17
|
+
return instance;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Load configuration from npmextra.json
|
|
21
|
+
*/
|
|
22
|
+
async load() {
|
|
23
|
+
const npmextraInstance = new plugins.npmextra.Npmextra(this.cwd);
|
|
24
|
+
const gitzoneConfig = npmextraInstance.dataFor('@git.zone/cli', {});
|
|
25
|
+
this.config = {
|
|
26
|
+
alwaysTest: gitzoneConfig?.commit?.alwaysTest ?? false,
|
|
27
|
+
alwaysBuild: gitzoneConfig?.commit?.alwaysBuild ?? false,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Save configuration to npmextra.json
|
|
32
|
+
*/
|
|
33
|
+
async save() {
|
|
34
|
+
const npmextraPath = plugins.path.join(this.cwd, 'npmextra.json');
|
|
35
|
+
let npmextraData = {};
|
|
36
|
+
// Read existing npmextra.json
|
|
37
|
+
if (await plugins.smartfs.file(npmextraPath).exists()) {
|
|
38
|
+
const content = await plugins.smartfs.file(npmextraPath).encoding('utf8').read();
|
|
39
|
+
npmextraData = JSON.parse(content);
|
|
40
|
+
}
|
|
41
|
+
// Ensure @git.zone/cli namespace exists
|
|
42
|
+
if (!npmextraData['@git.zone/cli']) {
|
|
43
|
+
npmextraData['@git.zone/cli'] = {};
|
|
44
|
+
}
|
|
45
|
+
// Ensure commit object exists
|
|
46
|
+
if (!npmextraData['@git.zone/cli'].commit) {
|
|
47
|
+
npmextraData['@git.zone/cli'].commit = {};
|
|
48
|
+
}
|
|
49
|
+
// Update commit settings
|
|
50
|
+
npmextraData['@git.zone/cli'].commit.alwaysTest = this.config.alwaysTest;
|
|
51
|
+
npmextraData['@git.zone/cli'].commit.alwaysBuild = this.config.alwaysBuild;
|
|
52
|
+
// Write back to file
|
|
53
|
+
await plugins.smartfs
|
|
54
|
+
.file(npmextraPath)
|
|
55
|
+
.encoding('utf8')
|
|
56
|
+
.write(JSON.stringify(npmextraData, null, 2));
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Get alwaysTest setting
|
|
60
|
+
*/
|
|
61
|
+
getAlwaysTest() {
|
|
62
|
+
return this.config.alwaysTest;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Set alwaysTest setting
|
|
66
|
+
*/
|
|
67
|
+
setAlwaysTest(value) {
|
|
68
|
+
this.config.alwaysTest = value;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Get alwaysBuild setting
|
|
72
|
+
*/
|
|
73
|
+
getAlwaysBuild() {
|
|
74
|
+
return this.config.alwaysBuild;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Set alwaysBuild setting
|
|
78
|
+
*/
|
|
79
|
+
setAlwaysBuild(value) {
|
|
80
|
+
this.config.alwaysBuild = value;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jb21taXRjb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfY29uZmlnL2NsYXNzZXMuY29tbWl0Y29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFPNUM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFJdkIsWUFBWSxNQUFjLE9BQU8sQ0FBQyxHQUFHLEVBQUU7UUFDckMsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsTUFBTSxHQUFHLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLENBQUM7SUFDMUQsQ0FBQztJQUVEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBYyxPQUFPLENBQUMsR0FBRyxFQUFFO1FBQ3JELE1BQU0sUUFBUSxHQUFHLElBQUksWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3RCLE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxJQUFJO1FBQ2YsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqRSxNQUFNLGFBQWEsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQU0sZUFBZSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRXpFLElBQUksQ0FBQyxNQUFNLEdBQUc7WUFDWixVQUFVLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxVQUFVLElBQUksS0FBSztZQUN0RCxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxXQUFXLElBQUksS0FBSztTQUN6RCxDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLElBQUk7UUFDZixNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBQ2xFLElBQUksWUFBWSxHQUFRLEVBQUUsQ0FBQztRQUUzQiw4QkFBOEI7UUFDOUIsSUFBSSxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7WUFDdEQsTUFBTSxPQUFPLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDakYsWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBaUIsQ0FBQyxDQUFDO1FBQy9DLENBQUM7UUFFRCx3Q0FBd0M7UUFDeEMsSUFBSSxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQ25DLFlBQVksQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDckMsQ0FBQztRQUVELDhCQUE4QjtRQUM5QixJQUFJLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQzVDLENBQUM7UUFFRCx5QkFBeUI7UUFDekIsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7UUFDekUsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUM7UUFFM0UscUJBQXFCO1FBQ3JCLE1BQU0sT0FBTyxDQUFDLE9BQU87YUFDbEIsSUFBSSxDQUFDLFlBQVksQ0FBQzthQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDO2FBQ2hCLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxhQUFhO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7SUFDaEMsQ0FBQztJQUVEOztPQUVHO0lBQ0ksYUFBYSxDQUFDLEtBQWM7UUFDakMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDO0lBQ2pDLENBQUM7SUFFRDs7T0FFRztJQUNJLGNBQWM7UUFDbkIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxjQUFjLENBQUMsS0FBYztRQUNsQyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUM7SUFDbEMsQ0FBQztDQUNGIn0=
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
// gitzone config - manage release registry configuration
|
|
2
2
|
import * as plugins from './mod.plugins.js';
|
|
3
3
|
import { ReleaseConfig } from './classes.releaseconfig.js';
|
|
4
|
+
import { CommitConfig } from './classes.commitconfig.js';
|
|
4
5
|
import { runFormatter } from '../mod_format/index.js';
|
|
5
|
-
export { ReleaseConfig };
|
|
6
|
+
export { ReleaseConfig, CommitConfig };
|
|
6
7
|
/**
|
|
7
8
|
* Format npmextra.json with diff preview
|
|
8
9
|
* Shows diff first, asks for confirmation, then applies
|
|
@@ -45,6 +46,12 @@ export const run = async (argvArg) => {
|
|
|
45
46
|
case 'accessLevel':
|
|
46
47
|
await handleAccessLevel(value);
|
|
47
48
|
break;
|
|
49
|
+
case 'commit':
|
|
50
|
+
await handleCommit(argvArg._?.[2], argvArg._?.[3]);
|
|
51
|
+
break;
|
|
52
|
+
case 'services':
|
|
53
|
+
await handleServices();
|
|
54
|
+
break;
|
|
48
55
|
case 'help':
|
|
49
56
|
showHelp();
|
|
50
57
|
break;
|
|
@@ -59,7 +66,7 @@ export const run = async (argvArg) => {
|
|
|
59
66
|
async function handleInteractiveMenu() {
|
|
60
67
|
console.log('');
|
|
61
68
|
console.log('โญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ');
|
|
62
|
-
console.log('โ gitzone config -
|
|
69
|
+
console.log('โ gitzone config - Project Configuration โ');
|
|
63
70
|
console.log('โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ');
|
|
64
71
|
console.log('');
|
|
65
72
|
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
@@ -74,6 +81,8 @@ async function handleInteractiveMenu() {
|
|
|
74
81
|
{ name: 'Remove a registry', value: 'remove' },
|
|
75
82
|
{ name: 'Clear all registries', value: 'clear' },
|
|
76
83
|
{ name: 'Set access level (public/private)', value: 'access' },
|
|
84
|
+
{ name: 'Configure commit options', value: 'commit' },
|
|
85
|
+
{ name: 'Configure services', value: 'services' },
|
|
77
86
|
{ name: 'Show help', value: 'help' },
|
|
78
87
|
],
|
|
79
88
|
});
|
|
@@ -94,6 +103,12 @@ async function handleInteractiveMenu() {
|
|
|
94
103
|
case 'access':
|
|
95
104
|
await handleAccessLevel();
|
|
96
105
|
break;
|
|
106
|
+
case 'commit':
|
|
107
|
+
await handleCommit();
|
|
108
|
+
break;
|
|
109
|
+
case 'services':
|
|
110
|
+
await handleServices();
|
|
111
|
+
break;
|
|
97
112
|
case 'help':
|
|
98
113
|
showHelp();
|
|
99
114
|
break;
|
|
@@ -243,6 +258,102 @@ async function handleAccessLevel(level) {
|
|
|
243
258
|
plugins.logger.log('success', `Access level set to: ${level}`);
|
|
244
259
|
await formatNpmextraWithDiff();
|
|
245
260
|
}
|
|
261
|
+
/**
|
|
262
|
+
* Handle commit configuration
|
|
263
|
+
*/
|
|
264
|
+
async function handleCommit(setting, value) {
|
|
265
|
+
const config = await CommitConfig.fromCwd();
|
|
266
|
+
// No setting = interactive mode
|
|
267
|
+
if (!setting) {
|
|
268
|
+
await handleCommitInteractive(config);
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
// Direct setting
|
|
272
|
+
switch (setting) {
|
|
273
|
+
case 'alwaysTest':
|
|
274
|
+
await handleCommitSetting(config, 'alwaysTest', value);
|
|
275
|
+
break;
|
|
276
|
+
case 'alwaysBuild':
|
|
277
|
+
await handleCommitSetting(config, 'alwaysBuild', value);
|
|
278
|
+
break;
|
|
279
|
+
default:
|
|
280
|
+
plugins.logger.log('error', `Unknown commit setting: ${setting}`);
|
|
281
|
+
showCommitHelp();
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
/**
|
|
285
|
+
* Interactive commit configuration
|
|
286
|
+
*/
|
|
287
|
+
async function handleCommitInteractive(config) {
|
|
288
|
+
console.log('');
|
|
289
|
+
console.log('โญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ');
|
|
290
|
+
console.log('โ Commit Configuration โ');
|
|
291
|
+
console.log('โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ');
|
|
292
|
+
console.log('');
|
|
293
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
294
|
+
const response = await interactInstance.askQuestion({
|
|
295
|
+
type: 'checkbox',
|
|
296
|
+
name: 'commitOptions',
|
|
297
|
+
message: 'Select commit options to enable:',
|
|
298
|
+
choices: [
|
|
299
|
+
{ name: 'Always run tests before commit (-t)', value: 'alwaysTest' },
|
|
300
|
+
{ name: 'Always build after commit (-b)', value: 'alwaysBuild' },
|
|
301
|
+
],
|
|
302
|
+
default: [
|
|
303
|
+
...(config.getAlwaysTest() ? ['alwaysTest'] : []),
|
|
304
|
+
...(config.getAlwaysBuild() ? ['alwaysBuild'] : []),
|
|
305
|
+
],
|
|
306
|
+
});
|
|
307
|
+
const selected = response.value || [];
|
|
308
|
+
config.setAlwaysTest(selected.includes('alwaysTest'));
|
|
309
|
+
config.setAlwaysBuild(selected.includes('alwaysBuild'));
|
|
310
|
+
await config.save();
|
|
311
|
+
plugins.logger.log('success', 'Commit configuration updated');
|
|
312
|
+
await formatNpmextraWithDiff();
|
|
313
|
+
}
|
|
314
|
+
/**
|
|
315
|
+
* Set a specific commit setting
|
|
316
|
+
*/
|
|
317
|
+
async function handleCommitSetting(config, setting, value) {
|
|
318
|
+
// Parse boolean value
|
|
319
|
+
const boolValue = value === 'true' || value === '1' || value === 'on';
|
|
320
|
+
if (setting === 'alwaysTest') {
|
|
321
|
+
config.setAlwaysTest(boolValue);
|
|
322
|
+
}
|
|
323
|
+
else if (setting === 'alwaysBuild') {
|
|
324
|
+
config.setAlwaysBuild(boolValue);
|
|
325
|
+
}
|
|
326
|
+
await config.save();
|
|
327
|
+
plugins.logger.log('success', `Set ${setting} to ${boolValue}`);
|
|
328
|
+
await formatNpmextraWithDiff();
|
|
329
|
+
}
|
|
330
|
+
/**
|
|
331
|
+
* Show help for commit subcommand
|
|
332
|
+
*/
|
|
333
|
+
function showCommitHelp() {
|
|
334
|
+
console.log('');
|
|
335
|
+
console.log('Usage: gitzone config commit [setting] [value]');
|
|
336
|
+
console.log('');
|
|
337
|
+
console.log('Settings:');
|
|
338
|
+
console.log(' alwaysTest [true|false] Always run tests before commit');
|
|
339
|
+
console.log(' alwaysBuild [true|false] Always build after commit');
|
|
340
|
+
console.log('');
|
|
341
|
+
console.log('Examples:');
|
|
342
|
+
console.log(' gitzone config commit # Interactive mode');
|
|
343
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
344
|
+
console.log(' gitzone config commit alwaysBuild false');
|
|
345
|
+
console.log('');
|
|
346
|
+
}
|
|
347
|
+
/**
|
|
348
|
+
* Handle services configuration
|
|
349
|
+
*/
|
|
350
|
+
async function handleServices() {
|
|
351
|
+
// Import and use ServiceManager's configureServices
|
|
352
|
+
const { ServiceManager } = await import('../mod_services/classes.servicemanager.js');
|
|
353
|
+
const serviceManager = new ServiceManager();
|
|
354
|
+
await serviceManager.init();
|
|
355
|
+
await serviceManager.configureServices();
|
|
356
|
+
}
|
|
246
357
|
/**
|
|
247
358
|
* Show help for config command
|
|
248
359
|
*/
|
|
@@ -256,6 +367,8 @@ function showHelp() {
|
|
|
256
367
|
console.log(' remove [url] Remove a registry URL');
|
|
257
368
|
console.log(' clear Clear all registries');
|
|
258
369
|
console.log(' access [public|private] Set npm access level for publishing');
|
|
370
|
+
console.log(' commit [setting] [value] Configure commit options');
|
|
371
|
+
console.log(' services Configure which services are enabled');
|
|
259
372
|
console.log('');
|
|
260
373
|
console.log('Examples:');
|
|
261
374
|
console.log(' gitzone config show');
|
|
@@ -265,6 +378,9 @@ function showHelp() {
|
|
|
265
378
|
console.log(' gitzone config clear');
|
|
266
379
|
console.log(' gitzone config access public');
|
|
267
380
|
console.log(' gitzone config access private');
|
|
381
|
+
console.log(' gitzone config commit # Interactive');
|
|
382
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
383
|
+
console.log(' gitzone config services # Interactive');
|
|
268
384
|
console.log('');
|
|
269
385
|
}
|
|
270
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_config/index.ts"],"names":[],"mappings":"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"}
|
|
386
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_config/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.8.0",
|
|
5
5
|
"description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
|
|
6
6
|
"main": "dist_ts/index.ts",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.8.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
}
|
package/ts/mod_commit/index.ts
CHANGED
|
@@ -8,9 +8,20 @@ import * as ui from './mod.ui.js';
|
|
|
8
8
|
import { ReleaseConfig } from '../mod_config/classes.releaseconfig.js';
|
|
9
9
|
|
|
10
10
|
export const run = async (argvArg: any) => {
|
|
11
|
-
//
|
|
11
|
+
// Read commit config from npmextra.json
|
|
12
|
+
const npmextraConfig = new plugins.npmextra.Npmextra();
|
|
13
|
+
const gitzoneConfig = npmextraConfig.dataFor<{
|
|
14
|
+
commit?: {
|
|
15
|
+
alwaysTest?: boolean;
|
|
16
|
+
alwaysBuild?: boolean;
|
|
17
|
+
};
|
|
18
|
+
}>('@git.zone/cli', {});
|
|
19
|
+
const commitConfig = gitzoneConfig.commit || {};
|
|
20
|
+
|
|
21
|
+
// Check flags and merge with config options
|
|
12
22
|
const wantsRelease = !!(argvArg.r || argvArg.release);
|
|
13
|
-
const
|
|
23
|
+
const wantsTest = !!(argvArg.t || argvArg.test || commitConfig.alwaysTest);
|
|
24
|
+
const wantsBuild = !!(argvArg.b || argvArg.build || commitConfig.alwaysBuild);
|
|
14
25
|
let releaseConfig: ReleaseConfig | null = null;
|
|
15
26
|
|
|
16
27
|
if (wantsRelease) {
|
|
@@ -28,6 +39,7 @@ export const run = async (argvArg: any) => {
|
|
|
28
39
|
ui.printExecutionPlan({
|
|
29
40
|
autoAccept: !!(argvArg.y || argvArg.yes),
|
|
30
41
|
push: !!(argvArg.p || argvArg.push),
|
|
42
|
+
test: wantsTest,
|
|
31
43
|
build: wantsBuild,
|
|
32
44
|
release: wantsRelease,
|
|
33
45
|
format: !!argvArg.format,
|
|
@@ -39,6 +51,21 @@ export const run = async (argvArg: any) => {
|
|
|
39
51
|
await formatMod.run();
|
|
40
52
|
}
|
|
41
53
|
|
|
54
|
+
// Run tests early to fail fast before analysis
|
|
55
|
+
if (wantsTest) {
|
|
56
|
+
ui.printHeader('๐งช Running tests...');
|
|
57
|
+
const smartshellForTest = new plugins.smartshell.Smartshell({
|
|
58
|
+
executor: 'bash',
|
|
59
|
+
sourceFilePaths: [],
|
|
60
|
+
});
|
|
61
|
+
const testResult = await smartshellForTest.exec('pnpm test');
|
|
62
|
+
if (testResult.exitCode !== 0) {
|
|
63
|
+
logger.log('error', 'Tests failed. Aborting commit.');
|
|
64
|
+
process.exit(1);
|
|
65
|
+
}
|
|
66
|
+
logger.log('success', 'All tests passed.');
|
|
67
|
+
}
|
|
68
|
+
|
|
42
69
|
ui.printHeader('๐ Analyzing repository changes...');
|
|
43
70
|
|
|
44
71
|
const aidoc = new plugins.tsdoc.AiDoc();
|
|
@@ -161,6 +188,7 @@ export const run = async (argvArg: any) => {
|
|
|
161
188
|
}
|
|
162
189
|
|
|
163
190
|
// Determine total steps based on options
|
|
191
|
+
// Note: test runs early (like format) so not counted in numbered steps
|
|
164
192
|
const willPush = answerBucket.getAnswerFor('pushToOrigin') && !(process.env.CI === 'true');
|
|
165
193
|
const willRelease = answerBucket.getAnswerFor('createRelease') && releaseConfig?.hasRegistries();
|
|
166
194
|
let totalSteps = 5; // Base steps: commitinfo, changelog, staging, commit, version
|
package/ts/mod_commit/mod.ui.ts
CHANGED
|
@@ -21,6 +21,7 @@ interface ICommitSummary {
|
|
|
21
21
|
interface IExecutionPlanOptions {
|
|
22
22
|
autoAccept: boolean;
|
|
23
23
|
push: boolean;
|
|
24
|
+
test: boolean;
|
|
24
25
|
build: boolean;
|
|
25
26
|
release: boolean;
|
|
26
27
|
format: boolean;
|
|
@@ -64,6 +65,7 @@ export function printExecutionPlan(options: IExecutionPlanOptions): void {
|
|
|
64
65
|
console.log(' Options:');
|
|
65
66
|
console.log(` Auto-accept ${options.autoAccept ? 'โ enabled (-y)' : 'โ interactive mode'}`);
|
|
66
67
|
console.log(` Push to remote ${options.push ? 'โ enabled (-p)' : 'โ disabled'}`);
|
|
68
|
+
console.log(` Test first ${options.test ? 'โ enabled (-t)' : 'โ disabled'}`);
|
|
67
69
|
console.log(` Build & verify ${options.build ? 'โ enabled (-b)' : 'โ disabled'}`);
|
|
68
70
|
console.log(` Release to npm ${options.release ? 'โ enabled (-r)' : 'โ disabled'}`);
|
|
69
71
|
if (options.format) {
|
|
@@ -77,6 +79,9 @@ export function printExecutionPlan(options: IExecutionPlanOptions): void {
|
|
|
77
79
|
if (options.format) {
|
|
78
80
|
console.log(` ${stepNum++}. Format project files`);
|
|
79
81
|
}
|
|
82
|
+
if (options.test) {
|
|
83
|
+
console.log(` ${stepNum++}. Run tests`);
|
|
84
|
+
}
|
|
80
85
|
console.log(` ${stepNum++}. Analyze repository changes`);
|
|
81
86
|
console.log(` ${stepNum++}. Bake commit info into code`);
|
|
82
87
|
console.log(` ${stepNum++}. Generate changelog.md`);
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import * as plugins from './mod.plugins.js';
|
|
2
|
+
|
|
3
|
+
export interface ICommitConfig {
|
|
4
|
+
alwaysTest: boolean;
|
|
5
|
+
alwaysBuild: boolean;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Manages commit configuration stored in npmextra.json
|
|
10
|
+
* under @git.zone/cli.commit namespace
|
|
11
|
+
*/
|
|
12
|
+
export class CommitConfig {
|
|
13
|
+
private cwd: string;
|
|
14
|
+
private config: ICommitConfig;
|
|
15
|
+
|
|
16
|
+
constructor(cwd: string = process.cwd()) {
|
|
17
|
+
this.cwd = cwd;
|
|
18
|
+
this.config = { alwaysTest: false, alwaysBuild: false };
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Create a CommitConfig instance from current working directory
|
|
23
|
+
*/
|
|
24
|
+
public static async fromCwd(cwd: string = process.cwd()): Promise<CommitConfig> {
|
|
25
|
+
const instance = new CommitConfig(cwd);
|
|
26
|
+
await instance.load();
|
|
27
|
+
return instance;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Load configuration from npmextra.json
|
|
32
|
+
*/
|
|
33
|
+
public async load(): Promise<void> {
|
|
34
|
+
const npmextraInstance = new plugins.npmextra.Npmextra(this.cwd);
|
|
35
|
+
const gitzoneConfig = npmextraInstance.dataFor<any>('@git.zone/cli', {});
|
|
36
|
+
|
|
37
|
+
this.config = {
|
|
38
|
+
alwaysTest: gitzoneConfig?.commit?.alwaysTest ?? false,
|
|
39
|
+
alwaysBuild: gitzoneConfig?.commit?.alwaysBuild ?? false,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Save configuration to npmextra.json
|
|
45
|
+
*/
|
|
46
|
+
public async save(): Promise<void> {
|
|
47
|
+
const npmextraPath = plugins.path.join(this.cwd, 'npmextra.json');
|
|
48
|
+
let npmextraData: any = {};
|
|
49
|
+
|
|
50
|
+
// Read existing npmextra.json
|
|
51
|
+
if (await plugins.smartfs.file(npmextraPath).exists()) {
|
|
52
|
+
const content = await plugins.smartfs.file(npmextraPath).encoding('utf8').read();
|
|
53
|
+
npmextraData = JSON.parse(content as string);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// Ensure @git.zone/cli namespace exists
|
|
57
|
+
if (!npmextraData['@git.zone/cli']) {
|
|
58
|
+
npmextraData['@git.zone/cli'] = {};
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// Ensure commit object exists
|
|
62
|
+
if (!npmextraData['@git.zone/cli'].commit) {
|
|
63
|
+
npmextraData['@git.zone/cli'].commit = {};
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// Update commit settings
|
|
67
|
+
npmextraData['@git.zone/cli'].commit.alwaysTest = this.config.alwaysTest;
|
|
68
|
+
npmextraData['@git.zone/cli'].commit.alwaysBuild = this.config.alwaysBuild;
|
|
69
|
+
|
|
70
|
+
// Write back to file
|
|
71
|
+
await plugins.smartfs
|
|
72
|
+
.file(npmextraPath)
|
|
73
|
+
.encoding('utf8')
|
|
74
|
+
.write(JSON.stringify(npmextraData, null, 2));
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Get alwaysTest setting
|
|
79
|
+
*/
|
|
80
|
+
public getAlwaysTest(): boolean {
|
|
81
|
+
return this.config.alwaysTest;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Set alwaysTest setting
|
|
86
|
+
*/
|
|
87
|
+
public setAlwaysTest(value: boolean): void {
|
|
88
|
+
this.config.alwaysTest = value;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* Get alwaysBuild setting
|
|
93
|
+
*/
|
|
94
|
+
public getAlwaysBuild(): boolean {
|
|
95
|
+
return this.config.alwaysBuild;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Set alwaysBuild setting
|
|
100
|
+
*/
|
|
101
|
+
public setAlwaysBuild(value: boolean): void {
|
|
102
|
+
this.config.alwaysBuild = value;
|
|
103
|
+
}
|
|
104
|
+
}
|
package/ts/mod_config/index.ts
CHANGED
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
import * as plugins from './mod.plugins.js';
|
|
4
4
|
import { ReleaseConfig } from './classes.releaseconfig.js';
|
|
5
|
+
import { CommitConfig } from './classes.commitconfig.js';
|
|
5
6
|
import { runFormatter, type ICheckResult } from '../mod_format/index.js';
|
|
6
7
|
|
|
7
|
-
export { ReleaseConfig };
|
|
8
|
+
export { ReleaseConfig, CommitConfig };
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* Format npmextra.json with diff preview
|
|
@@ -55,6 +56,12 @@ export const run = async (argvArg: any) => {
|
|
|
55
56
|
case 'accessLevel':
|
|
56
57
|
await handleAccessLevel(value);
|
|
57
58
|
break;
|
|
59
|
+
case 'commit':
|
|
60
|
+
await handleCommit(argvArg._?.[2], argvArg._?.[3]);
|
|
61
|
+
break;
|
|
62
|
+
case 'services':
|
|
63
|
+
await handleServices();
|
|
64
|
+
break;
|
|
58
65
|
case 'help':
|
|
59
66
|
showHelp();
|
|
60
67
|
break;
|
|
@@ -70,7 +77,7 @@ export const run = async (argvArg: any) => {
|
|
|
70
77
|
async function handleInteractiveMenu(): Promise<void> {
|
|
71
78
|
console.log('');
|
|
72
79
|
console.log('โญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ');
|
|
73
|
-
console.log('โ gitzone config -
|
|
80
|
+
console.log('โ gitzone config - Project Configuration โ');
|
|
74
81
|
console.log('โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ');
|
|
75
82
|
console.log('');
|
|
76
83
|
|
|
@@ -86,6 +93,8 @@ async function handleInteractiveMenu(): Promise<void> {
|
|
|
86
93
|
{ name: 'Remove a registry', value: 'remove' },
|
|
87
94
|
{ name: 'Clear all registries', value: 'clear' },
|
|
88
95
|
{ name: 'Set access level (public/private)', value: 'access' },
|
|
96
|
+
{ name: 'Configure commit options', value: 'commit' },
|
|
97
|
+
{ name: 'Configure services', value: 'services' },
|
|
89
98
|
{ name: 'Show help', value: 'help' },
|
|
90
99
|
],
|
|
91
100
|
});
|
|
@@ -108,6 +117,12 @@ async function handleInteractiveMenu(): Promise<void> {
|
|
|
108
117
|
case 'access':
|
|
109
118
|
await handleAccessLevel();
|
|
110
119
|
break;
|
|
120
|
+
case 'commit':
|
|
121
|
+
await handleCommit();
|
|
122
|
+
break;
|
|
123
|
+
case 'services':
|
|
124
|
+
await handleServices();
|
|
125
|
+
break;
|
|
111
126
|
case 'help':
|
|
112
127
|
showHelp();
|
|
113
128
|
break;
|
|
@@ -278,6 +293,113 @@ async function handleAccessLevel(level?: string): Promise<void> {
|
|
|
278
293
|
await formatNpmextraWithDiff();
|
|
279
294
|
}
|
|
280
295
|
|
|
296
|
+
/**
|
|
297
|
+
* Handle commit configuration
|
|
298
|
+
*/
|
|
299
|
+
async function handleCommit(setting?: string, value?: string): Promise<void> {
|
|
300
|
+
const config = await CommitConfig.fromCwd();
|
|
301
|
+
|
|
302
|
+
// No setting = interactive mode
|
|
303
|
+
if (!setting) {
|
|
304
|
+
await handleCommitInteractive(config);
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
// Direct setting
|
|
309
|
+
switch (setting) {
|
|
310
|
+
case 'alwaysTest':
|
|
311
|
+
await handleCommitSetting(config, 'alwaysTest', value);
|
|
312
|
+
break;
|
|
313
|
+
case 'alwaysBuild':
|
|
314
|
+
await handleCommitSetting(config, 'alwaysBuild', value);
|
|
315
|
+
break;
|
|
316
|
+
default:
|
|
317
|
+
plugins.logger.log('error', `Unknown commit setting: ${setting}`);
|
|
318
|
+
showCommitHelp();
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
/**
|
|
323
|
+
* Interactive commit configuration
|
|
324
|
+
*/
|
|
325
|
+
async function handleCommitInteractive(config: CommitConfig): Promise<void> {
|
|
326
|
+
console.log('');
|
|
327
|
+
console.log('โญโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฎ');
|
|
328
|
+
console.log('โ Commit Configuration โ');
|
|
329
|
+
console.log('โฐโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโฏ');
|
|
330
|
+
console.log('');
|
|
331
|
+
|
|
332
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
333
|
+
const response = await interactInstance.askQuestion({
|
|
334
|
+
type: 'checkbox',
|
|
335
|
+
name: 'commitOptions',
|
|
336
|
+
message: 'Select commit options to enable:',
|
|
337
|
+
choices: [
|
|
338
|
+
{ name: 'Always run tests before commit (-t)', value: 'alwaysTest' },
|
|
339
|
+
{ name: 'Always build after commit (-b)', value: 'alwaysBuild' },
|
|
340
|
+
],
|
|
341
|
+
default: [
|
|
342
|
+
...(config.getAlwaysTest() ? ['alwaysTest'] : []),
|
|
343
|
+
...(config.getAlwaysBuild() ? ['alwaysBuild'] : []),
|
|
344
|
+
],
|
|
345
|
+
});
|
|
346
|
+
|
|
347
|
+
const selected = (response as any).value || [];
|
|
348
|
+
config.setAlwaysTest(selected.includes('alwaysTest'));
|
|
349
|
+
config.setAlwaysBuild(selected.includes('alwaysBuild'));
|
|
350
|
+
await config.save();
|
|
351
|
+
|
|
352
|
+
plugins.logger.log('success', 'Commit configuration updated');
|
|
353
|
+
await formatNpmextraWithDiff();
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
/**
|
|
357
|
+
* Set a specific commit setting
|
|
358
|
+
*/
|
|
359
|
+
async function handleCommitSetting(config: CommitConfig, setting: string, value?: string): Promise<void> {
|
|
360
|
+
// Parse boolean value
|
|
361
|
+
const boolValue = value === 'true' || value === '1' || value === 'on';
|
|
362
|
+
|
|
363
|
+
if (setting === 'alwaysTest') {
|
|
364
|
+
config.setAlwaysTest(boolValue);
|
|
365
|
+
} else if (setting === 'alwaysBuild') {
|
|
366
|
+
config.setAlwaysBuild(boolValue);
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
await config.save();
|
|
370
|
+
plugins.logger.log('success', `Set ${setting} to ${boolValue}`);
|
|
371
|
+
await formatNpmextraWithDiff();
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
/**
|
|
375
|
+
* Show help for commit subcommand
|
|
376
|
+
*/
|
|
377
|
+
function showCommitHelp(): void {
|
|
378
|
+
console.log('');
|
|
379
|
+
console.log('Usage: gitzone config commit [setting] [value]');
|
|
380
|
+
console.log('');
|
|
381
|
+
console.log('Settings:');
|
|
382
|
+
console.log(' alwaysTest [true|false] Always run tests before commit');
|
|
383
|
+
console.log(' alwaysBuild [true|false] Always build after commit');
|
|
384
|
+
console.log('');
|
|
385
|
+
console.log('Examples:');
|
|
386
|
+
console.log(' gitzone config commit # Interactive mode');
|
|
387
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
388
|
+
console.log(' gitzone config commit alwaysBuild false');
|
|
389
|
+
console.log('');
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
/**
|
|
393
|
+
* Handle services configuration
|
|
394
|
+
*/
|
|
395
|
+
async function handleServices(): Promise<void> {
|
|
396
|
+
// Import and use ServiceManager's configureServices
|
|
397
|
+
const { ServiceManager } = await import('../mod_services/classes.servicemanager.js');
|
|
398
|
+
const serviceManager = new ServiceManager();
|
|
399
|
+
await serviceManager.init();
|
|
400
|
+
await serviceManager.configureServices();
|
|
401
|
+
}
|
|
402
|
+
|
|
281
403
|
/**
|
|
282
404
|
* Show help for config command
|
|
283
405
|
*/
|
|
@@ -291,6 +413,8 @@ function showHelp(): void {
|
|
|
291
413
|
console.log(' remove [url] Remove a registry URL');
|
|
292
414
|
console.log(' clear Clear all registries');
|
|
293
415
|
console.log(' access [public|private] Set npm access level for publishing');
|
|
416
|
+
console.log(' commit [setting] [value] Configure commit options');
|
|
417
|
+
console.log(' services Configure which services are enabled');
|
|
294
418
|
console.log('');
|
|
295
419
|
console.log('Examples:');
|
|
296
420
|
console.log(' gitzone config show');
|
|
@@ -300,5 +424,8 @@ function showHelp(): void {
|
|
|
300
424
|
console.log(' gitzone config clear');
|
|
301
425
|
console.log(' gitzone config access public');
|
|
302
426
|
console.log(' gitzone config access private');
|
|
427
|
+
console.log(' gitzone config commit # Interactive');
|
|
428
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
429
|
+
console.log(' gitzone config services # Interactive');
|
|
303
430
|
console.log('');
|
|
304
431
|
}
|