fix: jsonbinpack preset and runtime tests (#1718)

examples/typescript-generate-jsonbinpack/__snapshots__/index.spec.ts.snap

@@ -35,7 +35,6 @@ Array [
   
     return instance;
   }
-
   public async jsonbinSerialize(): Promise<Buffer>{
     const jsonData = JSON.parse(this.marshal());
     const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\",\\"$id\\":\\"Test\\",\\"type\\":\\"object\\",\\"additionalProperties\\":false,\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});

src/generators/typescript/presets/JsonBinPackPreset.ts

@@ -26,19 +26,18 @@ function getInputSchema(originalInput: any): string {
 export const TS_JSONBINPACK_PRESET: TypeScriptPreset = {
   class: {
     async additionalContent({ renderer, content, model }) {
-      renderer.dependencyManager.addTypeScriptDependency(
-        'jsonbinpack',
-        'jsonbinpack'
+      renderer.dependencyManager.addDependency(
+        "const jsonbinpack = require('jsonbinpack')"
       );
 
       const jsonSchema = await alterschema(
         model.originalInput,
         getInputSchema(model.originalInput),
         '2020-12'
       );
+      jsonSchema['$schema'] = 'https://json-schema.org/draft/2020-12/schema';
       const json = JSON.stringify(jsonSchema);
-      const packContent = `
-public async jsonbinSerialize(): Promise<Buffer>{
+      const packContent = `public async jsonbinSerialize(): Promise<Buffer>{
   const jsonData = JSON.parse(this.marshal());
   const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema(${json});
   return jsonbinpack.serialize(jsonbinpackEncodedSchema, jsonData);

test/generators/typescript/preset/__snapshots__/JsonBinPackPreset.spec.ts.snap

@@ -50,15 +50,14 @@ exports[`JsonBinPack preset should work fine with AsyncAPI inputs 1`] = `
     }
     return instance;
   }
-
   public async jsonbinSerialize(): Promise<Buffer>{
     const jsonData = JSON.parse(this.marshal());
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-parser-schema-id\\":\\"<anonymous-schema-2>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_2\\"}},\\"x-parser-schema-id\\":\\"<anonymous-schema-1>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_1\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-parser-schema-id\\":\\"<anonymous-schema-2>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_2\\"}},\\"x-parser-schema-id\\":\\"<anonymous-schema-1>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_1\\",\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\"});
     return jsonbinpack.serialize(jsonbinpackEncodedSchema, jsonData);
   }
 
   public static async jsonbinDeserialize(buffer: Buffer): Promise<AnonymousSchema_1> {
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-parser-schema-id\\":\\"<anonymous-schema-2>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_2\\"}},\\"x-parser-schema-id\\":\\"<anonymous-schema-1>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_1\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-parser-schema-id\\":\\"<anonymous-schema-2>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_2\\"}},\\"x-parser-schema-id\\":\\"<anonymous-schema-1>\\",\\"x-modelgen-inferred-name\\":\\"anonymous_schema_1\\",\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\"});
     const json = jsonbinpack.deserialize(jsonbinpackEncodedSchema, buffer);
     return AnonymousSchema_1.unmarshal(json);
   }
@@ -115,15 +114,14 @@ exports[`JsonBinPack preset should work fine with JSON Schema draft 4 1`] = `
     }
     return instance;
   }
-
   public async jsonbinSerialize(): Promise<Buffer>{
     const jsonData = JSON.parse(this.marshal());
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"http://json-schema.org/draft-04/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
     return jsonbinpack.serialize(jsonbinpackEncodedSchema, jsonData);
   }
 
   public static async jsonbinDeserialize(buffer: Buffer): Promise<Root> {
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"http://json-schema.org/draft-04/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
     const json = jsonbinpack.deserialize(jsonbinpackEncodedSchema, buffer);
     return Root.unmarshal(json);
   }
@@ -180,15 +178,14 @@ exports[`JsonBinPack preset should work fine with JSON Schema draft 6 1`] = `
     }
     return instance;
   }
-
   public async jsonbinSerialize(): Promise<Buffer>{
     const jsonData = JSON.parse(this.marshal());
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"http://json-schema.org/draft-06/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
     return jsonbinpack.serialize(jsonbinpackEncodedSchema, jsonData);
   }
 
   public static async jsonbinDeserialize(buffer: Buffer): Promise<Root> {
-    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"http://json-schema.org/draft-06/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
+    const jsonbinpackEncodedSchema = await jsonbinpack.compileSchema({\\"$schema\\":\\"https://json-schema.org/draft/2020-12/schema\\",\\"type\\":\\"object\\",\\"properties\\":{\\"email\\":{\\"type\\":\\"string\\",\\"format\\":\\"email\\",\\"x-modelgen-inferred-name\\":\\"email\\"}},\\"x-modelgen-inferred-name\\":\\"root\\"});
     const json = jsonbinpack.deserialize(jsonbinpackEncodedSchema, buffer);
     return Root.unmarshal(json);
   }

test/runtime/runtime-typescript.ts

@@ -2,7 +2,6 @@ import { TS_COMMON_PRESET, TS_JSONBINPACK_PRESET, TypeScriptFileGenerator } from
 import path from 'path';
 import input from './generic-input.json';
 
-
 async function generateNamedExport() {
   const generator = new TypeScriptFileGenerator({});
 
@@ -16,6 +15,7 @@ async function generateNamedExport() {
     { exportType: 'named' }
   );
 }
+
 async function generateDefaultExport() {
   const generator = new TypeScriptFileGenerator({});
 
@@ -63,8 +63,29 @@ async function generateJsonBinPack() {
       TS_JSONBINPACK_PRESET
     ]
   });
+  const simplifiedInput = {
+    "$id": "Address",
+    "description": "This object contains all types of MetaModel generations",
+    "type": "object",
+    "properties": {
+      "street_name": {
+        "type": "string"
+      },
+      "house_number": {
+        "type": "number"
+      },
+      "marriage": {
+        "type": "boolean",
+        "description": "Status if marriage live in given house"
+      },
+    },
+    "required": [
+      "street_name",
+      "house_number",
+    ]
+  }
   await generator.generateToFiles(
-    input,
+    simplifiedInput,
     path.resolve(
       // eslint-disable-next-line no-undef
       __dirname,

test/runtime/runtime-typescript/test/JsonBinPackPreset.spec.ts

@@ -1,17 +1,10 @@
 import { Address } from '../src/jsonbinpack/Address';
-import { NestedObject } from '../src/jsonbinpack/NestedObject';
 
 describe('Address', () => {
-  const nestedObj = new NestedObject({
-    test: 'test'
-  });
   const address = new Address({
     streetName: 'test',
     houseNumber: 1,
-    marriage: true,
-    members: 2,
-    arrayType: [1, 'test'],
-    nestedObject: nestedObj
+    marriage: true
   });
   test('be able to serialize model and turning it back to a model with the same values', async () => {
     const serialized = await address.jsonbinSerialize();