Revert "Break up spec into domain-based zod models."

This reverts commit 7d1536a.

Author: lkacenja

docs/architecture-decisions/workspace-restructure.md

@@ -73,11 +73,10 @@ safety-net-openapi/
 │   └── clients/                    # Generated API clients
 │       ├── package.json
 │       ├── generated/
+│       │   ├── zodios/
 │       │   └── postman-collection.json
-│       ├── dist-packages/          # Built state packages
 │       └── scripts/
-│           ├── generate-modular-zod.js
-│           ├── build-state-package.js
+│           ├── generate-zodios.js
 │           └── generate-postman.js
 ```
 

docs/reference/project-structure.md

@@ -54,15 +54,11 @@ safety-net-openapi/
 │   └── clients/                    # Generated API clients
 │       ├── package.json
 │       ├── scripts/                # Generator scripts
-│       │   ├── generate-modular-zod.js  # Zod schema generator
-│       │   ├── build-state-package.js   # State package builder
+│       │   ├── generate-zodios.js
 │       │   └── generate-postman.js
-│       ├── generated/              # Output directory
-│       │   └── postman-collection.json
-│       ├── dist-packages/          # Built npm packages
-│       │   ├── california/
-│       │   └── colorado/
-│       └── templates/              # Package templates
+│       └── generated/              # Output directory
+│           ├── zodios/             # TypeScript clients
+│           └── postman-collection.json
 │
 └── docs/                           # Documentation
     ├── getting-started/            # Persona-based onboarding

package.json

@@ -22,6 +22,7 @@
     "overlay:list": "npm run overlay:list -w @safety-net/schemas",
     "clients:generate": "npm run generate -w @safety-net/clients",
     "clients:build-package": "node packages/clients/scripts/build-state-package.js",
+    "clients:validate": "npm run validate -w @safety-net/clients",
     "postman:generate": "npm run postman -w @safety-net/clients",
     "mock:start": "npm start -w @safety-net/mock-server",
     "mock:start:all": "npm run start:all -w @safety-net/mock-server",

packages/clients/domain-mapping.yaml

@@ -4,17 +4,19 @@
   "description": "Generated API clients and collections for Safety Net APIs",
   "type": "module",
   "scripts": {
-    "generate": "node scripts/generate-modular-zod.js --all",
+    "generate": "node scripts/generate-zodios.js",
     "postman": "node scripts/generate-postman.js",
-    "build-package": "node scripts/build-state-package.js"
+    "validate": "tsc --noEmit -p tsconfig.validate.json"
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^11.7.2",
     "@safety-net/schemas": "*",
+    "@zodios/core": "^10.9.6",
     "js-yaml": "^4.1.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "openapi-zod-client": "^1.18.2",
     "typescript": "^5.3.3"
   }
 }

packages/clients/package.json

@@ -110,28 +110,32 @@ async function main() {
   console.log('\n1. Resolving state overlay...');
   await exec('npm', ['run', 'overlay:resolve', '-w', '@safety-net/schemas', '--', `--state=${state}`]);
 
-  // Step 2: Generate modular Zod schemas from overlay-resolved specs
-  console.log('\n2. Generating modular Zod schemas...');
-  const specDir = join(repoRoot, 'packages', 'schemas', 'openapi', 'resolved');
-  const generatorScript = join(clientsRoot, 'scripts', 'generate-modular-zod.js');
-  const domains = ['applications', 'households', 'incomes', 'persons'];
-
-  for (const domain of domains) {
-    const specPath = join(specDir, `${domain}.yaml`);
-    const outputPath = join(srcDir, `${domain}.ts`);
-    if (existsSync(specPath)) {
-      await exec('node', [generatorScript, specPath, outputPath]);
+  // Step 2: Generate Zodios clients
+  console.log('\n2. Generating Zodios clients...');
+  await exec('npm', ['run', 'clients:generate']);
+
+  // Step 3: Copy generated TypeScript files to src/
+  console.log('\n3. Copying generated clients...');
+  const generatedDir = join(clientsRoot, 'generated', 'clients', 'zodios');
+  const clientFiles = ['applications.ts', 'households.ts', 'incomes.ts', 'persons.ts'];
+
+  for (const file of clientFiles) {
+    const srcPath = join(generatedDir, file);
+    const destPath = join(srcDir, file);
+    if (existsSync(srcPath)) {
+      cpSync(srcPath, destPath);
+      console.log(`  Copied ${file}`);
     } else {
-      console.warn(`  Warning: ${specPath} not found`);
+      console.warn(`  Warning: ${file} not found`);
     }
   }
 
   // Copy search helpers utility
   cpSync(join(templatesDir, 'search-helpers.ts'), join(srcDir, 'search-helpers.ts'));
   console.log('  Copied search-helpers.ts');
 
-  // Step 3: Generate package.json and README from templates
-  console.log('\n3. Generating package metadata...');
+  // Step 4: Generate package.json from template
+  console.log('\n4. Generating package.json...');
   const packageTemplate = readFileSync(join(templatesDir, 'package.template.json'), 'utf8');
   const packageJson = packageTemplate
     .replace(/\{\{STATE\}\}/g, state)
@@ -140,27 +144,20 @@ async function main() {
   writeFileSync(join(outputDir, 'package.json'), packageJson);
   console.log('  Generated package.json');
 
-  const readmeTemplate = readFileSync(join(templatesDir, 'README.template.md'), 'utf8');
-  const readme = readmeTemplate
-    .replace(/\{\{STATE\}\}/g, state)
-    .replace(/\{\{STATE_TITLE\}\}/g, stateTitle);
-  writeFileSync(join(outputDir, 'README.md'), readme);
-  console.log('  Generated README.md');
-
-  // Step 4: Generate index.ts from template
-  console.log('\n4. Generating index.ts...');
+  // Step 5: Generate index.ts from template
+  console.log('\n5. Generating index.ts...');
   const indexTemplate = readFileSync(join(templatesDir, 'index.template.ts'), 'utf8');
   const indexTs = indexTemplate.replace(/\{\{STATE_TITLE\}\}/g, stateTitle);
   writeFileSync(join(srcDir, 'index.ts'), indexTs);
   console.log('  Generated index.ts');
 
-  // Step 5: Copy tsconfig for compilation
-  console.log('\n5. Setting up TypeScript compilation...');
+  // Step 6: Copy tsconfig for compilation
+  console.log('\n6. Setting up TypeScript compilation...');
   cpSync(join(templatesDir, 'tsconfig.build.json'), join(outputDir, 'tsconfig.json'));
   console.log('  Copied tsconfig.json');
 
-  // Step 6: Compile TypeScript
-  console.log('\n6. Compiling TypeScript...');
+  // Step 7: Compile TypeScript
+  console.log('\n7. Compiling TypeScript...');
   await exec('npx', ['tsc'], { cwd: outputDir });
   console.log('  Compilation complete');