Tsconfig improvements (#1391)

* various tsconfig imporments

* ✨ Add JSON module support and remove debug console log

Added JSON import capability with type inference for .mjs/.mts files. Removed unused debug console log statement in bundleprompts.js.

* move file

* pre-filter by diff

* tiny change

* m,ore logging

* ✨ improve: enhance diff function documentation

Updated and clarified JSDoc comments for better code readability.

Author: pelikhan

docs/genaisrc/tsconfig.json

@@ -11,7 +11,9 @@
         "allowJs": true,
         "skipLibCheck": true,
         "noEmit": true,
-        "allowImportingTsExtensions": true
+        "allowImportingTsExtensions": true,
+        "verbatimModuleSyntax": true,
+        "resolveJsonModule": true
     },
     "include": [
         "*.mjs",

docs/src/content/docs/reference/scripts/imports.mdx

@@ -92,6 +92,25 @@ export function summarize(_, files) {
 }
 ```
 
+## JSON Modules
+
+You can import JSON files using the `import` statement and get automatic type inference.
+
+```js title="data.json"
+{
+    "name": "GenAIScript"
+}
+```
+
+Use the `with { type: "json" }` syntax to import JSON files in `.mjs` or `.mts` files.
+The file path is relative to the genaiscript source file.
+
+```js title="script.genai.mts"
+import data from "./data.json" with { type: "json" }
+
+console.log(data.name) // GenAIScript
+```
+
 ## Default function export
 
 If you set a function as the default export, GenAIScript will call it.

eval/extrism/genaisrc/tsconfig.json

@@ -11,7 +11,9 @@
         "allowJs": true,
         "skipLibCheck": true,
         "noEmit": true,
-        "allowImportingTsExtensions": true
+        "allowImportingTsExtensions": true,
+        "verbatimModuleSyntax": true,
+        "resolveJsonModule": true
     },
     "include": [
         "*.mjs",

genaisrc/ast-docs.genai.mts genaisrc/docs.genai.mtsgenaisrc/ast-docs.genai.mts renamed to genaisrc/docs.genai.mts

@@ -36,9 +36,12 @@ script({
         },
     },
 })
-const { files, output, dbg, vars } = env
+const { output, dbg, vars } = env
+let { files } = env
 const { applyEdits, diff, pretty, missing, update } = vars
 
+dbg({ applyEdits, diff, pretty, missing, update })
+
 if (!missing && !update) cancel(`not generating or updating docs, exiting...`)
 
 if (!applyEdits)
@@ -48,6 +51,15 @@ if (!applyEdits)
 
 // filter by diff
 const gitDiff = diff ? await git.diff({ base: "main" }) : undefined
+console.debug(gitDiff)
+const diffFiles = gitDiff ? DIFF.parse(gitDiff) : undefined
+if (diffFiles?.length) {
+    dbg(`diff files: ${diffFiles.map((f) => f.to)}`)
+    files = files.filter(({ filename }) =>
+        diffFiles.some((f) => path.resolve(f.to) === path.resolve(filename))
+    )
+    dbg(`diff filtered files: ${files.length}`)
+}
 const sg = await host.astGrep()
 const stats = []
 for (const file of files) {
@@ -208,7 +220,7 @@ async function updateDocs(file: WorkspaceFile, fileStats: any) {
         },
         { diff: gitDiff }
     )
-
+    dbg(`found ${matches.length} docs to update`)
     const edits = sg.changeset()
     // for each match, generate a docstring for functions not documented
     for (const match of matches) {

genaisrc/tsconfig.json

@@ -11,7 +11,9 @@
         "allowJs": true,
         "skipLibCheck": true,
         "noEmit": true,
-        "allowImportingTsExtensions": true
+        "allowImportingTsExtensions": true,
+        "verbatimModuleSyntax": true,
+        "resolveJsonModule": true
     },
     "include": [
         "*.mjs",

package.json

@@ -89,7 +89,7 @@
         "genai": "node packages/cli/built/genaiscript.cjs run",
         "genai:convert": "node packages/cli/built/genaiscript.cjs convert",
         "genai:debug": "yarn compile-debug && node packages/cli/built/genaiscript.cjs run",
-        "genai:docs": "yarn genai ast-docs \"packages/cli/src/**.ts\" \"packages/core/src/**.ts\" --vars diff=true --vars applyEdits=true",
+        "genai:docs": "yarn genai docs \"packages/cli/src/**.ts\" \"packages/core/src/**.ts\" --vars diff=true --vars applyEdits=true",
         "upgrade:deps": "zx scripts/upgrade-deps.mjs",
         "cli": "node packages/cli/built/genaiscript.cjs",
         "ffmpeg:install": "sudo apt-get update && sudo apt-get install ffmpeg -y",

packages/auto/tsconfig.json

@@ -11,7 +11,9 @@
         "allowJs": true,
         "skipLibCheck": true,
         "noEmit": true,
-        "allowImportingTsExtensions": true
+        "allowImportingTsExtensions": true,
+        "verbatimModuleSyntax": true,
+        "resolveJsonModule": true
     },
     "include": [
         "*.mjs",

packages/core/bundleprompts.js

@@ -38,9 +38,10 @@ async function main() {
             )
                 .toString("utf8")
                 .matchAll(/debug\("genaiscript:(?<category>[^"]+)"\)/g)
-        ).sort().map((m) => m.groups.category),
+        )
+            .sort()
+            .map((m) => m.groups.category),
     ])
-    console.log({ logCategories })
     writeFileSync(
         "./src/dbg.ts",
         dedent`// auto-generated: do not edit
@@ -91,6 +92,8 @@ async function main() {
                     skipLibCheck: true,
                     noEmit: true,
                     allowImportingTsExtensions: true,
+                    verbatimModuleSyntax: true,
+                    resolveJsonModule: true,
                 },
                 include: ["*.mjs", "*.mts", "src/*.mts", "./genaiscript.d.ts"],
             },

packages/core/src/astgrep.ts

@@ -167,11 +167,13 @@ export async function astGrepFindFiles(
     // apply diff
     if (diffFiles?.length) {
         matches = matches.filter((m) => {
-            const chunk = diffFindChunk(
-                m.getRoot().filename(),
-                [m.range().start.line, m.range().end.line],
-                diffFiles
-            )
+            const range = [m.range().start.line, m.range().end.line]
+            const { chunk } =
+                diffFindChunk(m.getRoot().filename(), range, diffFiles) || {}
+            if (chunk)
+                dbg(
+                    `diff overlap at (${range[0]},${range[1]}) x (${chunk.newStart},${chunk.newStart + chunk.newLines})`
+                )
             return chunk
         })
         dbg(`matches filtered by diff: ${matches.length}`)

packages/core/src/diff.ts

@@ -33,10 +33,10 @@ export function diffResolve(
 
 /**
  * Attempts to parse a diff string into a structured format.
- * If parsing fails, logs the error and returns an empty array.
+ * If parsing fails, logs the error message and returns an empty array.
  *
  * @param diff - The diff string to parse.
- * @returns An array of parsed file objects if successful, or an empty array if parsing fails.
+ * @returns An array of parsed file objects if successful, or an empty array if parsing fails. Logs an error message if parsing fails.
  */
 export function tryDiffParse(diff: string) {
     try {
@@ -49,10 +49,13 @@ export function tryDiffParse(diff: string) {
 
 /**
  * Creates a unified diff between two workspace files.
- * @param left - The original workspace file or its content. If a string, it is wrapped in a WorkspaceFile object with a default filename.
- * @param right - The modified workspace file or its content. If a string, it is wrapped in a WorkspaceFile object with a default filename.
- * @param options - Optional parameters, such as the number of context lines, case sensitivity, and whitespace handling.
- * @returns The diff as a string, with redundant headers removed.
+ * If the input is a string, it is wrapped in a WorkspaceFile object with a default filename.
+ * If the input is an object, it should contain a filename and content.
+ *
+ * @param left - The original workspace file or its content. If a string, it is wrapped in a WorkspaceFile object with the filename "left".
+ * @param right - The modified workspace file or its content. If a string, it is wrapped in a WorkspaceFile object with the filename "right".
+ * @param options - Optional parameters, such as the number of context lines, case sensitivity, and whitespace handling. Defaults to ignoring case and whitespace. Additional options can be provided.
+ * @returns The diff as a string, with redundant headers removed. The diff is generated using createTwoFilesPatch.
  */
 export function diffCreatePatch(
     left: string | WorkspaceFile,
@@ -94,7 +97,7 @@ export function diffFindChunk(
     line: ElementOrArray<number>,
     diff: ElementOrArray<DiffFile>
 ): { file?: DiffFile; chunk?: DiffChunk } | undefined {
-    // line is zero-based
+    // line is zero-based!
     const fn = file ? resolve(file) : undefined
     const df = arrayify(diff).find(
         (f) => (!file && !f.to) || resolve(f.to) === fn