refactor: change output schema name

Author: constewart9

types/codegen/openapitools.json

@@ -8,7 +8,7 @@
                 "generatorName": "typescript-fetch",
                 "disabled": false,
                 "output": "#{cwd}/generated/typescript",
-                "inputSpec": "#{cwd}/schema/final-output.json",
+                "inputSpec": "#{cwd}/schema/complete-schema.json",
                 "templateDir": "#{cwd}/custom-templates/typescript",
                 "additionalProperties": {
                     "supportsES6": true,
@@ -41,7 +41,7 @@
                 "generatorName": "java",
                 "disabled": false,
                 "output": "#{cwd}/generated/java",
-                "inputSpec": "#{cwd}/schema/final-output.json",
+                "inputSpec": "#{cwd}/schema/complete-schema.json",
                 "templateDir": "#{cwd}/custom-templates/java",
                 "additionalProperties": {
                     "useOneOfInterfaces": true,

types/codegen/package.json

@@ -4,7 +4,7 @@
     "description": "Generate TypeScript defintiinons from JSON Schema using OpenAPI Generator",
     "main": "generated/typescript/src/index.ts",
     "scripts": {
-        "generate-schema": "node scripts/pre-all.js",
+        "generate-schema": "node scripts/generate-complete-schema.js",
         "generate": "npm run generate-schema && openapi-generator-cli generate && node scripts/post-typescript.js && npm run test",
         "generate:no-post": "npm run generate-schema && openapi-generator-cli generate",
         "test": "node scripts/post-test.js",

types/codegen/scripts/pre-all.js renamed to types/codegen/scripts/generate-complete-schema.js

@@ -4,10 +4,10 @@ const fs = require('fs')
 const path = require('path')
 
 // Pre-generation script for all generators
-// Combines all schema files in the schema directory and creates final-output.json with OpenAPI wrapper
+// Combines all schema files in the schema directory and creates complete-schema.json with OpenAPI wrapper
 
 const schemaDir = path.join(__dirname, '../schema')
-const finalOutputPath = path.join(__dirname, '../schema/final-output.json')
+const completeSchemaPath = path.join(__dirname, '../schema/complete-schema.json')
 const openapiConfigPath = path.join(__dirname, '../openapitools.json')
 
 // Validate required directories and files exist
@@ -72,8 +72,8 @@ function processSchemaFiles() {
     try {
         const files = fs.readdirSync(schemaDir)
 
-        // Filter for JSON files, excluding final-output.json
-        const jsonFiles = files.filter(file => file.endsWith('.json') && file !== 'final-output.json')
+        // Filter for JSON files, excluding complete-schema.json
+        const jsonFiles = files.filter(file => file.endsWith('.json') && file !== 'complete-schema.json')
 
         if (jsonFiles.length === 0) {
             console.error('Error: No JSON schema files found in schema directory')
@@ -185,25 +185,25 @@ if (!schemas || Object.keys(schemas).length === 0) {
     process.exit(1)
 }
 
-// create the final output with header + schemas + footer
-const finalOutput = {
+// create the complete schema with header + schemas + footer
+const completeSchema = {
     ...openApiHeader,
     components: {
         schemas: schemas,
     },
 }
 
-// write full OpenAPI spec to final-output.json
+// write full OpenAPI spec to complete-schema.json
 try {
-    fs.writeFileSync(finalOutputPath, JSON.stringify(finalOutput, null, 4))
+    fs.writeFileSync(completeSchemaPath, JSON.stringify(completeSchema, null, 4))
 
-    console.log(`\nComplete OpenAPI structure created in final-output.json (version: ${version})`)
+    console.log(`\nComplete OpenAPI structure created in complete-schema.json (version: ${version})`)
     console.log(`Combined ${Object.keys(schemas).length} total schemas from ${files.length} files: ${files.join(', ')}`)
 
     if (skipped > 0 || errors > 0) {
         console.log(`Processing summary: ${files.length} successful, ${skipped} skipped, ${errors} errors`)
     }
 } catch (error) {
-    console.error('Error writing final-output.json:', error.message)
+    console.error('Error writing complete-schema.json:', error.message)
     process.exit(1)
 }

types/codegen/scripts/post-test.js

@@ -4,24 +4,24 @@ const fs = require('fs')
 const path = require('path')
 
 // Post-test script to validate generated models against schema definitions
-// Compares models in final-output.json with generated TypeScript and Java models
+// Compares models in complete-schema.json with generated TypeScript and Java models
 // Usage: node post-test.js [--verbose]
 
 // Parse command line arguments
 const args = process.argv.slice(2)
 const verbose = args.includes('--verbose') || args.includes('-v')
 
 // File paths
-const finalOutputPath = path.join(__dirname, '../schema/final-output.json')
+const completeSchemaPath = path.join(__dirname, '../schema/complete-schema.json')
 const typescriptModelsPath = path.join(__dirname, '../generated/typescript/src/models/index.ts')
 const javaModelsDir = path.join(__dirname, '../generated/java/src/main/java/org/openapitools/client/model')
 const openapiConfigPath = path.join(__dirname, '../openapitools.json')
 
 console.log('Starting model validation...\n')
 
-// Check if final-output.json exists
-if (!fs.existsSync(finalOutputPath)) {
-    console.error('Error: final-output.json not found in schema directory')
+// Check if complete-schema.json exists
+if (!fs.existsSync(completeSchemaPath)) {
+    console.error('Error: complete-schema.json not found in schema directory')
     console.error('   Run "npm run generate-schema" first to create the schema file')
     process.exit(1)
 }
@@ -49,21 +49,21 @@ try {
     console.warn('Warning: Could not read OpenAPI configuration:', error.message)
 }
 
-// Load and parse final-output.json
+// Load and parse complete-schema.json
 let schemaModels = new Set()
 try {
-    const finalOutput = JSON.parse(fs.readFileSync(finalOutputPath, 'utf8'))
+    const completeSchema = JSON.parse(fs.readFileSync(completeSchemaPath, 'utf8'))
 
-    if (!finalOutput.components || !finalOutput.components.schemas) {
-        console.error('Error: Invalid OpenAPI structure in final-output.json')
+    if (!completeSchema.components || !completeSchema.components.schemas) {
+        console.error('Error: Invalid OpenAPI structure in complete-schema.json')
         console.error('   Missing components.schemas section')
         process.exit(1)
     }
 
-    schemaModels = new Set(Object.keys(finalOutput.components.schemas))
+    schemaModels = new Set(Object.keys(completeSchema.components.schemas))
     console.log(`Found ${schemaModels.size} models in schema\n`)
 } catch (error) {
-    console.error('Error parsing final-output.json:', error.message)
+    console.error('Error parsing complete-schema.json:', error.message)
     process.exit(1)
 }