test: finish pre/post generation scripts

Author: constewart9

types/codegen/custom-templates/typescript/models.index.mustache

@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-import { Position, Range, TextDocumentIdentifier } from 'vscode-languageserver-types'
 
 {{#models}}
 {{#model}}

types/codegen/openapitools.json

@@ -8,7 +8,7 @@
                 "generatorName": "typescript-fetch",
                 "disabled": false,
                 "output": "#{cwd}/generated/typescript",
-                "inputSpec": "#{cwd}/schema/chatTypes.json",
+                "inputSpec": "#{cwd}/schema/final-output.json",
                 "templateDir": "#{cwd}/custom-templates/typescript",
                 "additionalProperties": {
                     "supportsES6": true,
@@ -30,13 +30,18 @@
                 },
                 "typeMappings": {
                     "Date": "Date"
+                },
+                "importMappings": {
+                    "Position": "vscode-languageserver-types",
+                    "Range": "vscode-languageserver-types",
+                    "TextDocumentIdentifier": "vscode-languageserver-types"
                 }
             },
             "java": {
                 "generatorName": "java",
                 "disabled": false,
                 "output": "#{cwd}/generated/java",
-                "inputSpec": "#{cwd}/schema/chatTypes.json",
+                "inputSpec": "#{cwd}/schema/final-output.json",
                 "templateDir": "#{cwd}/custom-templates/java",
                 "additionalProperties": {
                     "useOneOfInterfaces": true,

types/codegen/package.json

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