Refactor imports and update changelog formatting across project files (…

…#739)
microsoft · Sep 30, 2024 · 3081ffa · 3081ffa
1 parent 3bb543e
commit 3081ffa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/docs/src/content/docs/reference/scripts/system.mdx b/docs/src/content/docs/reference/scripts/system.mdx
@@ -160,7 +160,7 @@ index N in the above snippets, and then be prefixed with exactly the same whites
 the original snippets above. See also the following examples of the expected response format.
 
 CHANGELOG:
-\`\`\`changelog
+\`\`\`\`\`changelog
 ChangeLog:1@<file>
 Description: <summary>.
 OriginalCode@4-6:
@@ -190,7 +190,7 @@ OriginalCode@23-23:
 [23] <white space> <original code line>
 ChangedCode@23-23:
 [23] <white space> <changed code line>
-\`\`\`
+\`\`\`\`\`
 `
 `````
 

diff --git a/packages/cli/src/run.ts b/packages/cli/src/run.ts
@@ -54,7 +54,6 @@ import {
     normalizeInt,
     logVerbose,
     logError,
-    delay,
     dotGenaiscriptPath,
 } from "../../core/src/util"
 import { YAMLStringify } from "../../core/src/yaml"
@@ -70,6 +69,7 @@ import { resolveTokenEncoder } from "../../core/src/encoders"
 import { writeFile } from "fs/promises"
 import { writeFileSync } from "node:fs"
 import { prettifyMarkdown } from "../../core/src/markdown"
+import { delay } from "es-toolkit"
 
 async function setupTraceWriting(trace: MarkdownTrace, filename: string) {
     logVerbose(`trace: ${filename}`)

diff --git a/packages/cli/src/test.ts b/packages/cli/src/test.ts
@@ -29,7 +29,6 @@ import {
     normalizeInt,
     logInfo,
     logVerbose,
-    delay,
     tagFilter,
     toStringList,
 } from "../../core/src/util"
@@ -40,6 +39,7 @@ import {
     PromptScriptTestResult,
 } from "../../core/src/server/messages"
 import { generatePromptFooConfiguration } from "../../core/src/test"
+import { delay } from "es-toolkit"
 
 /**
  * Parses model specifications from a string and returns a ModelOptions object.

diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -8,10 +8,6 @@ export function trimNewlines(s: string) {
     return s?.replace(/^\n*/, "").replace(/\n*$/, "")
 }
 
-export function delay<T>(millis: number, value?: T): Promise<T | undefined> {
-    return new Promise((resolve) => setTimeout(() => resolve(value), millis))
-}
-
 export function strcmp(a: string, b: string) {
     if (a == b) return 0
     if (a < b) return -1
@@ -197,14 +193,6 @@ export function concatArrays<T>(...arrays: T[][]): T[] {
     return arrays[0].concat(...arrays.slice(1))
 }
 
-export function randomRange(min: number, max: number) {
-    return Math.round(Math.random() * (max - min) + min)
-}
-
-export function last<T>(a: ArrayLike<T>) {
-    return a[a.length - 1]
-}
-
 export function groupBy<T>(
     list: T[],
     key: (value: T) => string

diff --git a/packages/vscode/src/state.ts b/packages/vscode/src/state.ts
@@ -28,14 +28,14 @@ import { MarkdownTrace } from "../../core/src/trace"
 import {
     dotGenaiscriptPath,
     sha256string,
-    delay,
     logInfo,
     groupBy,
 } from "../../core/src/util"
 import { CORE_VERSION } from "../../core/src/version"
 import { Fragment, GenerationResult } from "../../core/src/generation"
 import { parametersToVars } from "../../core/src/parameters"
 import { randomHex } from "../../core/src/crypto"
+import { delay } from "es-toolkit"
 
 export const FRAGMENTS_CHANGE = "fragmentsChange"
 export const AI_REQUEST_CHANGE = "aiRequestChange"