Add GitClient methods for lastTag and log; update yarn.lock exclusion…

… patterns in scripts
microsoft · Oct 1, 2024 · 04def7d · 04def7d
1 parent cd9d0d8
commit 04def7d
Show file tree

Hide file tree

Showing 25 changed files with 455 additions and 9 deletions.
diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/auto/genaiscript.d.ts b/packages/auto/genaiscript.d.ts
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/git.ts b/packages/core/src/git.ts
@@ -148,6 +148,8 @@ export class GitClient implements Git {
         excludedPaths: string[],
         args: string[]
     ) {
+        paths = paths || []
+        excludedPaths = excludedPaths || []
         if (paths.length > 0 || excludedPaths.length > 0) {
             if (!paths.length) paths.push(".")
             args.push("--")
@@ -158,6 +160,50 @@ export class GitClient implements Git {
         }
     }
 
+    async lastTag(): Promise<string> {
+        const res = await this.exec([
+            "describe",
+            "--tags",
+            "--abbrev=0",
+            "HEAD^",
+        ])
+        return res.split("\n")[0]
+    }
+
+    async log(options?: {
+        base?: string
+        head?: string
+        merges?: boolean
+        excludedGrep?: string | RegExp
+        paths: string[]
+        excludedPaths: string[]
+    }): Promise<GitCommit[]> {
+        const { base, head, merges, excludedGrep, paths, excludedPaths } =
+            options || {}
+        const args = ["log", "--pretty=oneline"]
+        if (!merges) args.push("--no-merges")
+        if (excludedGrep) {
+            const pattern =
+                typeof excludedGrep === "string"
+                    ? excludedGrep
+                    : excludedGrep.source
+            args.push(`--grep='${pattern}'`, "--invert-grep")
+        }
+        if (base && head) args.push(`${base}..${head}`)
+        GitClient.addFileFilters(paths, excludedPaths, args)
+        const res = await this.exec(args)
+        const commits = res
+            .split("\n")
+            .map(
+                (line) =>
+                    /^(?<sha>[a-z0-9]{40,40})\s+(?<message>.*)$/.exec(line)
+                        ?.groups
+            )
+            .filter((g) => !!g)
+            .map((g) => <GitCommit>{ sha: g?.sha, message: g?.message })
+        return commits
+    }
+
     /**
      * Generates a diff of changes based on provided options.
      * @param options Options such as staged flag, base, head, paths, and exclusions.

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -1274,12 +1274,22 @@ interface HTML {
     convertToMarkdown(html: string): Promise<string>
 }
 
+interface GitCommit {
+    sha: string
+    message: string
+}
+
 interface Git {
     /**
      * Resolves the default branch for this repository
      */
     defaultBranch(): Promise<string>
 
+    /**
+     * Gets the last tag in the repository
+     */
+    lastTag(): Promise<string>
+
     /**
      * Gets the current branch of the repository
      */
@@ -1334,6 +1344,18 @@ interface Git {
          */
         llmify?: boolean
     }): Promise<string>
+
+    /**
+     * Lists the commits in the git repository
+     */
+    log(options?: {
+        base?: string
+        head?: string
+        merges?: boolean
+        excludedGrep?: string | RegExp
+        paths: string[]
+        excludedPaths: string[]
+    }): Promise<GitCommit[]>
 }
 
 interface GitHubOptions {

diff --git a/packages/sample/genaisrc/blog/genaiscript.d.ts b/packages/sample/genaisrc/blog/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/git-release-notes.genai.mjs b/packages/sample/genaisrc/git-release-notes.genai.mjs
@@ -1,4 +1,4 @@
-script({ system: ["system"], temperature: 0.5, model: "openai:gpt-4-turbo" })
+script({ system: ["system"], temperature: 0.5, model: "openai:gpt-4o" })
 
 const product = env.vars.product || "GenAIScript"
 
@@ -7,7 +7,7 @@ const { version } = await workspace.readJSON("package.json")
 const tag = await git.exec(["describe", "--tags", "--abbrev=0", "HEAD^"])
 const commits = await git.exec([
     "log",
-    "--grep='(skip ci|THIRD_PARTY_NOTICES)'",
+    "--grep='(skip ci|THIRD_PARTY_NOTICES|genai)'",
     "--invert-grep",
     "--no-merges",
     `HEAD...${tag}`,
@@ -22,8 +22,8 @@ const diff = await git.diff({
         "docs/**",
         ".github/*",
         ".vscode/*",
-        "*yarn.lock",
-        "*THIRD_PARTY_NOTICES.md",
+        "**/yarn.lock",
+        "THIRD_PARTY_NOTICES.md",
     ],
 })
 

diff --git a/packages/sample/genaisrc/git.genai.mts b/packages/sample/genaisrc/git.genai.mts
@@ -1,7 +1,8 @@
 const defaultBranch = await git.defaultBranch()
 const branch = await git.branch()
+const tag = await git.lastTag()
 const branches = await git.listBranches()
-console.log({ defaultBranch, branch, branches })
+console.log({ defaultBranch, branch, branches, tag })
 
 const mods = await git.listFiles("modified", {
     paths: ["**/*.ts"],
@@ -20,3 +21,6 @@ const files = await git.listFiles("modified-base", {
     excludedPaths: ["**/genaiscript.d.ts"],
 })
 console.log({ files })
+
+const log = await git.log()
+console.log({ log })