1.1.42

changelog.md

@@ -0,0 +1,4 @@
+# Changelog
+
+## 1.1.41
+- fix(aidoc_classes): Improve commit message generation by handling empty diffs and updating changelog instructions

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@git.zone/tsdoc",
-  "version": "1.1.31",
+  "version": "1.1.42",
   "private": false,
   "description": "An advanced TypeScript documentation tool using AI to generate and enhance documentation for TypeScript projects.",
-  "main": "dist_ts/index.js",
-  "typings": "dist_ts/index.d.ts",
   "type": "module",
-  "author": "Lossless GmbH",
+  "exports": {
+    ".": "./dist_ts/index.js"
+  },
+  "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "bin": {
     "tsdoc": "cli.js"

test/test.aidoc.nonci.ts

@@ -15,12 +15,25 @@ tap.test('should create an AIdocs class', async () => {
 
 tap.test('should start AIdocs', async () => {
   await aidocs.start();
+});
+
+tap.skip.test('should start AIdocs', async () => {
   await aidocs.buildReadme('./');
 });
 
-tap.test('should start AIdocs', async () => {
+tap.skip.test('should start AIdocs', async () => {
-  await aidocs.start();
   await aidocs.buildDescription('./');
 });
 
+tap.test('should build commit object', async () => {
+  const commitObject = await aidocs.buildNextCommitObject('./');
+  console.log(commitObject);
+  expect(commitObject).not.toBeUndefined();
+  expect(commitObject).toHaveProperty('recommendedNextVersion');
+  expect(commitObject).toHaveProperty('recommendedNextVersionLevel');
+  expect(commitObject).toHaveProperty('recommendedNextVersionScope');
+  expect(commitObject).toHaveProperty('recommendedNextVersionMessage');
+
+})
+
 tap.start();

ts/00_commitinfo_data.ts

@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
   name: '@git.zone/tsdoc',
-  version: '1.1.31',
+  version: '1.1.42',
   description: 'An advanced TypeScript documentation tool using AI to generate and enhance documentation for TypeScript projects.'
 }

ts/aidocs_classes/commit.ts

@@ -2,6 +2,14 @@ import * as plugins from '../plugins.js';
 import { AiDoc } from '../classes.aidoc.js';
 import { ProjectContext } from './projectcontext.js';
 
+export interface INextCommitObject {
+  recommendedNextVersionLevel: 'fix' | 'feat' | 'BREAKING CHANGE'; // the recommended next version level of the project
+  recommendedNextVersionScope: string; // the recommended scope name of the next version, like "core" or "cli", or specific class names.
+  recommendedNextVersionMessage: string; // the commit message. Don't put fix() feat() or BREAKING CHANGE in the message. Please just the message itself.
+  recommendedNextVersion: string; // the recommended next version of the project, x.x.x
+  changelog?: string; // the changelog for the next version
+}
+
 export class Commit {
   private aiDocsRef: AiDoc;
   private projectDir: string;
@@ -11,9 +19,23 @@ export class Commit {
     this.projectDir = projectDirArg;
   }
 
-  public async build() {
+  public async buildNextCommitObject(): Promise<INextCommitObject> {
+    const smartgitInstance = new plugins.smartgit.Smartgit();
+    await smartgitInstance.init();
+    const gitRepo = await plugins.smartgit.GitRepo.fromOpeningRepoDir(
+      smartgitInstance,
+      this.projectDir
+    );
+    const diffString = await gitRepo.getUncommittedDiff();
     const projectContext = new ProjectContext(this.projectDir);
-    const contextString = await projectContext.update();
+    let contextString = await projectContext.update();
+    contextString = `
+${contextString}
+
+Below is the diff of the uncommitted changes. If nothing is changed, there are no changes:
+
+${diffString || 'No changes.'}
+    `;
 
     let result = await this.aiDocsRef.openaiInstance.chat({
       systemMessage: `
@@ -28,9 +50,10 @@ Your answer should be parseable with JSON.parse() without modifying anything.
 
 Here is the structure of the JSON you should return:
 {
-  recommendedNextVersionLevel: 'patch' | 'minor' | 'major'; // the recommended next version level of the project
+  recommendedNextVersionLevel: 'fix' | 'feat' | 'BREAKING CHANGE'; // the recommended next version level of the project
-  recommendedNextVersion: string; // the recommended next version of the project
+  recommendedNextVersionScope: string; // the recommended scope name of the next version, like "core" or "cli", or specific class names.
-  message: string; // the commit message. use conventional commits format
+  recommendedNextVersionMessage: string; // the commit message. Don't put fix() feat() or BREAKING CHANGE in the message. Please just the message itself.
+  recommendedNextVersion: string; // the recommended next version of the project, x.x.x
 }
 
 You are being given the files of the project. You should use them to create the commit message.
@@ -41,15 +64,51 @@ Also you are given a diff
       userMessage: contextString,
     });
 
-    console.log(result.message);
+    // console.log(result.message);
-    const resultObject = JSON.parse(result.message.replace('```json', '').replace('```', ''));
+    const resultObject: INextCommitObject = JSON.parse(
+      result.message.replace('```json', '').replace('```', '')
+    );
 
-    const npmextraJson = (await projectContext.gatherFiles()).smartfilesNpmextraJSON;
+    // lets build the changelog based on that
-    const npmextraJsonContent = JSON.parse(npmextraJson.contents.toString());
+    const commitMessages = await gitRepo.getAllCommitMessages();
+    const previousChangelogPath = plugins.path.join(this.projectDir, 'changelog.md');
+    let previousChangelog: plugins.smartfile.SmartFile;
+    if (await plugins.smartfile.fs.fileExists(previousChangelogPath)) {
+      previousChangelog = await plugins.smartfile.SmartFile.fromFilePath(previousChangelogPath);
+    }
+    let result2 = await this.aiDocsRef.openaiInstance.chat({
+      messageHistory: [],
+      systemMessage: `
+You are building a changelog file for the projext.
+Omit commits and versions that lack relevant changes.
 
-    npmextraJsonContent.gitzone.module.commit = resultObject.message;
+You are given
+* the previous changelog file (if available)
+* the commit messages of the project
 
-    npmextraJson.contents = Buffer.from(JSON.stringify(npmextraJsonContent, null, 2));
+Only return the changelog file, so it can be written directly to changelog.md
-    await npmextraJson.write();
+
+For the latest version, that is not yet part of the commit messages, add a placeholder entry that uses {{nextVersion}} and {{nextVersionMessage}} as variables to filled later.
+Only output newer versions and their changes compared to ones already mentioned. We take of appending your output later.
+      `,
+      userMessage: `
+The previous changelog file is:
+${!previousChangelog ? 'No previous changelog file found' : previousChangelog.contents.toString()}
+
+Here are the commit messages so far:
+
+${commitMessages.join('\n\n')}
+`,
+    });
+    if (previousChangelog) {
+      let newChangelog = result2.message;
+      newChangelog = newChangelog.replace('# Changelog\n\n', '');
+      let oldChangelog = previousChangelog.contents.toString().replace('# Changelog\n\n', '');
+      newChangelog = `# Changelog\n\n${newChangelog}\n\n${oldChangelog}`;
+      resultObject.changelog = newChangelog;
+    } else {
+      resultObject.changelog = result2.message;
+    }
+    return resultObject;
   }
 }

ts/aidocs_classes/index.ts

@@ -1,3 +1,4 @@
+export * from './commit.js';
 export * from './description.js';
 export * from './projectcontext.js';
 export * from './readme.js';

ts/classes.aidoc.ts

@@ -7,7 +7,7 @@ export class AiDoc {
 
   public npmextraKV: plugins.npmextra.KeyValueStore;
   public qenvInstance: plugins.qenv.Qenv;
-  public smartinteractInstance: plugins.smartinteract.SmartInteract;
+  public aidocInteract: plugins.smartinteract.SmartInteract;
   public openaiInstance: plugins.smartai.OpenAiProvider;
 
   argvArg: any;
@@ -33,7 +33,7 @@ export class AiDoc {
 
   public async start() {
     // lets care about prerequisites
-    this.smartinteractInstance = new plugins.smartinteract.SmartInteract();
+    this.aidocInteract = new plugins.smartinteract.SmartInteract();
     this.qenvInstance = new plugins.qenv.Qenv();
     if (!(await this.qenvInstance.getEnvVarOnDemand('OPENAI_TOKEN'))) {
       this.npmextraKV = new plugins.npmextra.KeyValueStore({
@@ -51,9 +51,9 @@ export class AiDoc {
           // lets try smartinteract
           // wait for a second until OpenAI fixes punycode problem...
           await plugins.smartdelay.delayFor(1000);
-          const answerObject = await this.smartinteractInstance.askQuestion({
+          const answerObject = await this.aidocInteract.askQuestion({
             type: 'input',
-            message: `Please provide your OpenAI token`,
+            message: `Please provide your OpenAI token. This will be persisted in your home directory.`,
             name: 'OPENAI_TOKEN',
             default: '',
           });
@@ -85,7 +85,10 @@ export class AiDoc {
     return await descriptionInstance.build();
   }
 
-  public async buildNextCommit(projectDirArg: string) {}
+  public async buildNextCommitObject(projectDirArg: string) {
+    const commitInstance = new aiDocsClasses.Commit(this, projectDirArg);
+    return await commitInstance.buildNextCommitObject();
+  }
 
   public async getProjectContext(projectDirArg: string) {
     const projectContextInstance = new aiDocsClasses.ProjectContext(projectDirArg);