refactor: update commits config

Author: zdm

lib/commands/git/commit-msg.js

@@ -91,9 +91,9 @@ git commit -m"feat(core)!: commit description"
             }
 
             const type = types[ commit.type ],
-                scopes = new Map( Object.entries( pkg.cliConfig?.commits[ type?.primaryChange
-                    ? "primaryScopes"
-                    : "secondaryScopes" ] || {} ).filter( ( [ key, value ] ) => value ) );
+                scopes = new Map( Object.entries( type?.primaryChange
+                    ? pkg.cliConfig?.commits.scopes || {}
+                    : type?.scopes || {} ).filter( ( [ key, value ] ) => value ) );
 
             // check strict type
             if ( pkg.cliConfig?.commits.strictType ) {

lib/debian-repository.js

@@ -86,7 +86,7 @@ export default class DebianRepository {
                 res = await git.exec( [ "init", "--initial-branch", "dists", this.distsRoot ] );
                 if ( !res.ok ) return res;
 
-                res = await git.exec( [ "commit", "--allow-empty", "-m", "chore(build): init" ] );
+                res = await git.exec( [ "commit", "--allow-empty", "-m", "build: init" ] );
                 if ( !res.ok ) return res;
 
                 res = await git.exec( [ "push", "--set-upstream", upstream.sshCloneUrl, "dists" ] );
@@ -335,7 +335,7 @@ export default class DebianRepository {
         if ( !res.ok ) return res;
 
         // overwrite the first commit
-        res = await this.git.exec( [ "commit", "--amend", "-m", "chore(build): update distributions" ] );
+        res = await this.git.exec( [ "commit", "--amend", "-m", "build: update distributions" ] );
         if ( !res.ok ) return res;
 
         // push

lib/package.js

@@ -982,7 +982,7 @@ export default class Package {
 
             // commit changes
             res = await repeatAction( async () => {
-                const res = await this.git.exec( [ "commit", "-m", "chore(deps): update package dependencies" ] );
+                const res = await this.git.exec( [ "commit", "-m", "deps: update package dependencies" ] );
 
                 if ( !res.ok ) console.log( ansi.error( res + "" ) );
 
@@ -1335,7 +1335,7 @@ export default class Package {
                 if ( !res.ok ) return res;
 
                 // commit changes
-                res = await this.git.exec( [ "commit", "-m", "chore(metadata): update package metadata" ] );
+                res = await this.git.exec( [ "commit", "-m", "metadata: update package metadata" ] );
                 if ( !res.ok ) return res;
 
                 // push

lib/package/release.js

@@ -179,7 +179,7 @@ export default class Publish {
                 res = await repeatAction( async () => {
                     process.stdout.write( "Commiting docs ... " );
 
-                    const res = await this.#pkg.git.exec( [ "commit", "-m", `chore(docs): update docs` ] );
+                    const res = await this.#pkg.git.exec( [ "commit", "-m", `docs: update docs` ] );
 
                     console.log( res + "" );
 
@@ -209,7 +209,7 @@ export default class Publish {
         res = await repeatAction( async () => {
             process.stdout.write( "Commiting ... " );
 
-            const res = await this.#pkg.git.exec( [ "commit", "--cleanup=verbatim", "-m", `chore(release): release ${ this.#currentRelease.versionString }\n\n${ this.#changelogText }\n` ] );
+            const res = await this.#pkg.git.exec( [ "commit", "--cleanup=verbatim", "-m", `release: release ${ this.#currentRelease.versionString }\n\n${ this.#changelogText }\n` ] );
 
             console.log( res + "" );
 

resources/cli.config.yaml

@@ -78,21 +78,36 @@ commits:
       notableChange: false
       requireScope: true
       strictScope: true
+
+    build:
+      description: package build related changes
+      requireScope: true
+      strictScope: true
     chore:
       description: a commit that does not affect main codebase
-      primaryChange: false
-      notableChange: false
+      requireScope: true
+      strictScope: true
+    deps:
+      description: package dependencies updates
+      requireScope: true
+      strictScope: true
+    docs:
+      description: documentation changes
+      requireScope: true
+      strictScope: true
+    metadata:
+      description: package metadata changes
+      requireScope: true
+      strictScope: true
+    release:
+      description: package release
+      requireScope: true
+      strictScope: true
+    style:
+      description: code stylistic changes
       requireScope: true
       strictScope: true
 
-  primaryScopes: ~
-
-  secondaryScopes:
-    build: package build related changes
-    deps: package dependencies updates
-    docs: documentation changes
-    metadata: package metadata changes
-    release: package release
-    style: code stylistic changes
+  scopes: ~
 
 docs: ~

resources/schemas/cli.config.schema.yaml

@@ -161,20 +161,19 @@ properties:
                 notableChange: { type: boolean }
                 requireScope: { type: boolean }
                 strictScope: { type: boolean }
+                scopes:
+                  anyOf:
+                    - type: "null"
+                    - type: object
+                      propertyNames: { type: string, format: kebab-case }
+                      additionalProperties:
+                        anyOf:
+                          - const: false
+                          - type: string
               additionalProperties: false
-              required: [description, primaryChange, notableChange, requireScope, strictScope]
+              required: [description]
 
-      primaryScopes:
-        anyOf:
-          - type: "null"
-          - type: object
-            propertyNames: { type: string, format: kebab-case }
-            additionalProperties:
-              anyOf:
-                - const: false
-                - type: string
-
-      secondaryScopes:
+      scopes:
         anyOf:
           - type: "null"
           - type: object
@@ -185,7 +184,7 @@ properties:
                 - type: string
 
     additionalProperties: false
-    required: [requireType, strictType, types, primaryScopes, secondaryScopes]
+    required: [requireType, strictType, types, scopes]
 
   docs:
     anyOf: