fix: upgrade to new packages

Author: BelfordZ

package-lock.json

@@ -27,7 +27,8 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@open-rpc/schema-utils-js": "1.0.3",
+    "@open-rpc/schema-utils-js": "1.5.0",
+    "@types/lodash": "^4.14.123",
     "commander": "^2.19.0",
     "fs-extra": "^7.0.1",
     "is-url": "^1.2.4",
@@ -38,7 +39,7 @@
     "typescript": "^3.3.3333"
   },
   "devDependencies": {
-    "@open-rpc/examples": "1.0.16",
+    "@open-rpc/examples": "^1.2.1",
     "@types/fs-extra": "^5.0.5",
     "@types/jest": "^24.0.11",
     "ts-jest": "^24.0.0"

package.json

@@ -5,6 +5,9 @@ import path from "path";
 import examples from "@open-rpc/examples";
 import refParser from "json-schema-ref-parser";
 import { promisify } from "util";
+import { forEach } from "lodash";
+import { types } from "@open-rpc/meta-schema";
+import { parse } from "@open-rpc/schema-utils-js";
 
 const stat = promisify(fs.stat);
 const rmdir = promisify(fs.rmdir);
@@ -21,13 +24,13 @@ describe(`Examples to generate Js clients`, () => {
     return await rmdir(testDir);
   });
 
-  Object.values(examples).forEach((example) => {
-    it(`creates a new client for example: ${example.info.title}`, async () => {
+  forEach(examples, (example: types.OpenRPC, exampleName: string) => {
+    it(`creates a new client for example: ${exampleName}`, async () => {
       expect.assertions(1);
 
       await clientGen({
         clientName: "test",
-        schema: await refParser.dereference(example),
+        schema: await parse(JSON.stringify(example)),
       });
 
       await expect(stat(`${process.cwd()}/test`)).resolves.toBeTruthy();

src/index.test.ts

@@ -1,13 +1,13 @@
 import _bootstrapGeneratedPackage from "./bootstrapGeneratedPackage";
 import { exec } from "child_process";
-import { compile, compileFromFile } from "json-schema-to-typescript";
+import { compile } from "json-schema-to-typescript";
 import * as fs from "fs";
 import * as fsx from "fs-extra";
 import * as path from "path";
 import * as _ from "lodash";
 import { promisify } from "util";
 import jsTemplate from "../templates/js/templated/exported-class.template";
-import { makeIdForMethodContentDescriptors } from "@open-rpc/schema-utils-js";
+import { generateMethodParamId } from "@open-rpc/schema-utils-js";
 
 const cwd = process.cwd();
 
@@ -47,7 +47,7 @@ const getTypings = async ({ methods }: { methods: [any] }) => {
     })))
     .filter(({ contentDescriptor }) => contentDescriptor.schema !== undefined)
     .map(async ({ method, contentDescriptor }) => ({
-      typeId: makeIdForMethodContentDescriptors(method, contentDescriptor),
+      typeId: generateMethodParamId(method, contentDescriptor),
       typeName: getTypeName(contentDescriptor),
       typings: await compile(contentDescriptor.schema, getTypeName(contentDescriptor), { bannerComment: "" }),
     }))
@@ -62,7 +62,7 @@ const getTypings = async ({ methods }: { methods: [any] }) => {
 
 const compileTemplate = async (name: string, schema: any) => {
   const typeDefs = await getTypings(schema);
-  return jsTemplate({ className: name, methods: schema.methods, typeDefs, makeIdForMethodContentDescriptors });
+  return jsTemplate({ className: name, methods: schema.methods, typeDefs, generateMethodParamId });
 };
 
 const copyStatic = async (destinationDirectoryName: string) => {

src/index.ts

@@ -14,7 +14,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@open-rpc/schema-utils-js": "1.0.3",
+    "@open-rpc/schema-utils-js": "1.5.0",
     "json-schema": "^0.2.3",
     "ajv": "^6.10.0",
     "jayson": "^2.1.2",

templates/js/static/_package.json

@@ -8,6 +8,7 @@
     "sourceMap": true,
     "outDir": "build",
     "declarationDir": "build",
-    "declaration": true
+    "declaration": true,
+    "resolveJsonModule": true
   }
 }

templates/js/static/package-lock.json

@@ -4,7 +4,7 @@ export default template(`
 import * as jayson from "jayson/promise";
 import ajv from "ajv";
 import _ from "lodash";
-import { makeIdForMethodContentDescriptors } from "@open-rpc/schema-utils-js";
+import { generateMethodParamId } from "@open-rpc/schema-utils-js";
 
 class ParameterValidationError extends Error {
   constructor(public message: string, public errors: ajv.ErrorObject[] | undefined | null) {
@@ -28,7 +28,7 @@ export default class <%= className %> {
       method.params.forEach((param: any, i: number) => {
         return this.validator.addSchema(
           param.schema,
-          makeIdForMethodContentDescriptors(method, param),
+          generateMethodParamId(method, param),
         );
       })
     });
@@ -37,7 +37,7 @@ export default class <%= className %> {
   public validate(methodName: string, methodObject: any, params: any[]) {
     return _.chain((methodObject as any).params)
       .map((param: any, index: number) => {
-        const idForMethod = makeIdForMethodContentDescriptors(methodObject, param);
+        const idForMethod = generateMethodParamId(methodObject, param);
         const isValid = this.validator.validate(idForMethod, params[index]);
         if (!isValid) {
           const message = [
@@ -78,7 +78,7 @@ export default class <%= className %> {
   /**
    * <%= method.summary %>
    */
-  public <%= method.name %>(<%= _.map(method.params, (param, i) => paramNames[i] + ': ' + typeDefs[makeIdForMethodContentDescriptors(method, param)].typeName).join(', ') %>): Promise<<%= (typeDefs[makeIdForMethodContentDescriptors(method, method.result)] || {typeName: 'any'}).typeName %>> {
+  public <%= method.name %>(<%= _.map(method.params, (param, i) => paramNames[i] + ': ' + typeDefs[generateMethodParamId(method, param)].typeName).join(', ') %>): Promise<<%= (typeDefs[generateMethodParamId(method, method.result)] || {typeName: 'any'}).typeName %>> {
     return this.request({method: "<%= method.name %>", params: Array.from(arguments)});
   }<% }) %>
 }

templates/js/static/tsconfig.json

@@ -4,6 +4,8 @@
   ],
   "rules": {
     "ordered-imports": false,
-    "indent": [true, "spaces", 2]
+    "indent": [true, "spaces", 2],
+    "no-implicit-dependencies": true,
+    "no-unused-variable": true
   }
 }