Patch TypeScript types (#17)

* Fixes bug in TypeScript gen

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nasa-jpl/seq-json-schema",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -15,11 +15,11 @@
     "format": "prettier --write .",
     "prepublishOnly": "npm run types",
     "test": "node --no-warnings test/test.js",
-    "types": "json2ts --input schema.json --output types.ts && npm run format"
+    "types": "node scripts/generate-types.js && npm run format"
   },
   "devDependencies": {
     "ajv": "^8.12.0",
-    "json-schema-to-typescript": "^11.0.3",
-    "prettier": "^2.8.3"
+    "json-schema-to-typescript": "^13.0.1",
+    "prettier": "^2.8.8"
   }
 }

scripts/generate-types.js

@@ -0,0 +1,27 @@
+import { compileFromFile } from 'json-schema-to-typescript';
+import { writeFileSync } from 'fs';
+
+/**
+ * Patches the types generated from 'json-schema-to-typescript' since the library has bugs.
+ * @param {string} types
+ * @return {string}
+ */
+function patchTypes(types) {
+  // Remove the 'Request1' object since the library  does not generate the
+  // correct type for the request 'oneOf' in the schema.
+  // See: https://github.com/bcherny/json-schema-to-typescript/issues/381
+  types = types.replace(/ \& Request1/, '');
+  types = types.replace(
+    `export type Request1 =\n  | {\n      [k: string]: unknown;\n    }\n  | {\n      [k: string]: unknown;\n    };\n`,
+    '',
+  );
+  return types;
+}
+
+async function main() {
+  let types = await compileFromFile('schema.json');
+  types = patchTypes(types);
+  writeFileSync('types.ts', types);
+}
+
+main();

types.ts

@@ -54,7 +54,7 @@ export type Request = {
   steps: [Step, ...Step[]];
   time?: Time;
   type: 'request';
-} & Request1;
+};
 /**
  * Description. Can be attached to any sequence step.
  */
@@ -71,13 +71,6 @@ export type Args = (
   | HexArgument
   | RepeatArgument
 )[];
-export type Request1 =
-  | {
-      [k: string]: unknown;
-    }
-  | {
-      [k: string]: unknown;
-    };
 
 export interface SeqJson {
   /**