@amritk/generate-validators 0.4.1 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amritk/generate-validators",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Generate TypeScript validation functions from JSON Schemas.",
   "module": "./dist/index.js",
   "type": "module",
@@ -31,23 +31,23 @@
     "access": "public"
   },
   "scripts": {
-    "build": "bun run build:code && bun run build:types",
-    "build:code": "bun build ./src/index.ts --outdir=dist --target=node",
-    "build:types": "tsc -p ."
+    "build": "tsgo -p tsconfig.build.json && tsc-alias -p tsconfig.build.json -f",
+    "types:check": "tsgo -p . --noEmit",
+    "test": "NODE_ENV=production vitest run --root ../.. generate-validators"
   },
   "imports": {
     "#generators/*": "./src/generators/*.ts"
   },
   "exports": {
     ".": {
-      "bun": "./src/index.ts",
+      "development": "./src/index.ts",
       "default": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
   },
   "dependencies": {
     "json-schema-typed": "^8.0.1",
-    "@amritk/helpers": "0.6.1"
+    "@amritk/helpers": "0.7.0"
   },
   "devDependencies": {
     "@scalar/openapi-parser": "^0.26.1"

package/src/generators/build-schema.ts

@@ -1,10 +1,5 @@
-import { buildDynamicRefMap } from '@amritk/helpers/build-dynamic-ref-map'
-import { extractRefs } from '@amritk/helpers/extract-refs'
-import { refToFilename } from '@amritk/helpers/ref-to-filename'
-import { refToName } from '@amritk/helpers/ref-to-name'
-import { resolveDynamicRefs } from '@amritk/helpers/resolve-dynamic-refs'
-import { resolveRef } from '@amritk/helpers/resolve-ref'
-import { upgradeDraft07Schema } from '@amritk/helpers/upgrade-draft07-schema'
+import { generateIndexBarrel } from '@amritk/helpers/generate-index-barrel'
+import { walkRefGraph } from '@amritk/helpers/walk-ref-graph'
 import type { JSONSchema } from 'json-schema-typed/draft-2020-12'
 
 import { generateValidatorFile } from './generate-files'
@@ -35,8 +30,9 @@ export type ValidationResult = true | { valid: false; errors: ValidationError[]
 `
 
 /**
- * Builds all TypeScript validator files from a JSON Schema by traversing
- * all $ref references recursively, mirroring the generate-parsers pipeline.
+ * Builds all TypeScript validator files from a JSON Schema by traversing all
+ * `$ref` / `$dynamicRef` references recursively (via the shared
+ * `@amritk/helpers/walk-ref-graph` walker).
  *
  * Each generated file exports:
  * - A TypeScript type definition
@@ -60,87 +56,26 @@ export const buildValidatorSchema = async (
   rootTypeName: string,
   typeSuffix = '',
 ): Promise<GeneratedFile[]> => {
-  rootSchema = upgradeDraft07Schema(rootSchema as Record<string, unknown>) as JSONSchema
-
   const files: GeneratedFile[] = []
-  const processedRefs = new Set<string>()
-  const processedFilenames = new Set<string>()
-  const refsToProcess: string[] = []
-
-  const dynamicRefMap = buildDynamicRefMap(rootSchema)
-
-  // Root schema
-  const processedRootSchema = resolveDynamicRefs(rootSchema, dynamicRefMap)
-  const rootContent = generateValidatorFile(processedRootSchema, rootTypeName, {
-    rootSchema: rootSchema as Record<string, unknown>,
-    typeSuffix,
-  })
-  const rootFilename = rootTypeName.toLowerCase()
 
-  if (rootFilename !== 'validation-result') {
-    processedFilenames.add(rootFilename)
-    files.push({ filename: `${rootFilename}.ts`, content: rootContent })
-  }
+  walkRefGraph(rootSchema, rootTypeName, { typeSuffix }, (node) => {
+    // `validation-result` and `index` are reserved output filenames, so never
+    // let a definition of either name overwrite them.
+    if (node.filename === 'validation-result' || node.filename === 'index') return
 
-  const rootRefs = extractRefs(rootSchema)
-  refsToProcess.push(...rootRefs)
-
-  while (refsToProcess.length > 0) {
-    const ref = refsToProcess.shift()
-    if (!ref || processedRefs.has(ref)) continue
-    processedRefs.add(ref)
-
-    const resolvedSchema = resolveRef(ref, rootSchema as Record<string, unknown>)
-    if (!resolvedSchema) {
-      console.warn(`Warning: Could not resolve ref: ${ref}`)
-      continue
-    }
-
-    const typeName = refToName(ref, typeSuffix)
-    const filename = refToFilename(ref)
-    const processedSchema = resolveDynamicRefs(resolvedSchema as JSONSchema, dynamicRefMap)
-    const content = generateValidatorFile(processedSchema, typeName, {
-      selfRef: ref,
-      rootSchema: rootSchema as Record<string, unknown>,
+    const content = generateValidatorFile(node.schema, node.typeName, {
+      rootSchema: node.rootSchema,
       typeSuffix,
+      ...(node.ref !== undefined ? { selfRef: node.ref } : {}),
     })
-
-    if (filename !== 'validation-result' && !processedFilenames.has(filename)) {
-      processedFilenames.add(filename)
-      files.push({ filename: `${filename}.ts`, content })
-    }
-
-    for (const nestedRef of extractRefs(resolvedSchema as JSONSchema)) {
-      if (!processedRefs.has(nestedRef)) refsToProcess.push(nestedRef)
-    }
-  }
+    files.push({ filename: `${node.filename}.ts`, content })
+  })
 
   // Emit the runtime contract for validators. ValidationResult is mjst-defined
   // (not derived from the input schema), so its content is fixed.
   files.push({ filename: 'validation-result.ts', content: VALIDATION_RESULT_CONTENT })
 
-  // Generate index.ts
-  const TYPE_EXPORT_RE = /^export type (\w+)/gm
-  const CONST_EXPORT_RE = /^export const (\w+)/gm
-
-  const sortedFiles = [...files].sort((a, b) => a.filename.localeCompare(b.filename))
-  let indexContent = ''
-
-  for (const file of sortedFiles) {
-    const moduleName = file.filename.replace(/\.ts$/, '')
-    const typeNames: string[] = []
-    const constNames: string[] = []
-
-    for (const match of file.content.matchAll(TYPE_EXPORT_RE)) typeNames.push(match[1] as string)
-    for (const match of file.content.matchAll(CONST_EXPORT_RE)) constNames.push(match[1] as string)
-
-    if (typeNames.length === 0 && constNames.length === 0) continue
-
-    const typeExports = typeNames.map((n) => `type ${n}`)
-    indexContent += `export { ${[...typeExports, ...constNames].join(', ')} } from './${moduleName}';\n`
-  }
-
-  files.push({ filename: 'index.ts', content: indexContent })
+  files.push({ filename: 'index.ts', content: generateIndexBarrel(files) })
 
   return files
 }