Merge pull request #167 from open-rpc/fix/switch-compiler

feat: switch to json-schema-to-types

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
   test:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:lts
     steps:
       - checkout
       - restore_cache: *restore-deps-cache
@@ -42,7 +42,7 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:lts
     steps:
       - checkout
       - restore_cache: *restore-deps-cache
@@ -53,7 +53,7 @@ jobs:
   release:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:lts
     steps:
       - checkout
       - restore_cache: *restore-deps-cache

bin/build.js

@@ -1,19 +1,25 @@
 #!/usr/bin/env node
 
 const schema = require('../schema.json');
-const { compile } = require('json-schema-to-typescript');
 const fs = require('fs');
 const path = require('path');
 const { promisify } = require('util');
 const writeFile = promisify(fs.writeFile);
 const { ensureDir } = require('fs-extra');
 const {listReleases} = require("@etclabscore/dl-github-releases");
-
-// errors if you try to run with $ref to draft 7 json schema
-schema.definitions.schema.$ref = undefined;
+const {JsonSchemaToTypes} = require("@etclabscore/json-schema-to-types");
+const refParser = require("json-schema-ref-parser");
 
 const generateTypes = async (s) => {
-  const ts = await compile(s, "OpenRPC");
+  const parsed = await refParser.dereference(s);
+  // the title set is particularly ugly, so we set a new one
+  parsed.definitions.schema.title = "JSONSchema";
+
+  // we must fix a bug with the deref util...
+  parsed.definitions.contentDescriptorObject.properties.schema = parsed.definitions.schema;
+
+  const transpiler = new JsonSchemaToTypes(parsed);
+  const ts = transpiler.toTs();
   const dir = path.resolve(__dirname, "../build/src/");
   await ensureDir(dir);
   await writeFile(`${dir}/index.d.ts`, ts, "utf8");
@@ -29,12 +35,18 @@ const setOpenRPCVersionEnum = async (s) => {
 const build = async () => {
   const withVersionEnum = await setOpenRPCVersionEnum(schema);
 
-  await generateTypes(withVersionEnum);
-
   const dir = path.resolve(__dirname, "../build/");
   await ensureDir(dir);
-
   await writeFile(`${dir}/schema.json`, JSON.stringify(withVersionEnum, undefined, "  "));
+  console.log("wrote schema.json");
+
+  try {
+    await generateTypes(withVersionEnum);
+  } catch (e) {
+    console.error(e);
+    process.exit(1);
+  }
+
 
   console.log("Finished building");
 };