feat: 🎸 improve discriminator expression builder

Author: streamich

src/__tests__/fixtures.ts

@@ -7,7 +7,11 @@
 import {RandomJson} from '@jsonjoy.com/json-random';
 import {genRandomExample} from '@jsonjoy.com/json-random/lib/examples';
 import {s} from '../schema';
-import {t} from '../type';
+import {ModuleType} from '../type/classes/ModuleType';
+import type {Type} from '../type';
+
+const mod = new ModuleType();
+export const t = mod.t;
 
 export const randomJson = () => {
   return Math.random() < 0.5 ? genRandomExample() : RandomJson.generate();
@@ -78,6 +82,18 @@ export const schemaCategories = {
   all: allSchemas,
 } as const;
 
+const primitivesModule = new ModuleType();
+export const primitiveTypes = Object.entries(primitiveSchemas).reduce((acc, [key, schema]) => {
+  acc[key] = primitivesModule.t.import(schema);
+  return acc;
+}, {} as Record<string, Type>);
+
+const compositesModule = new ModuleType();
+export const compositeTypes = Object.entries(compositeSchemas).reduce((acc, [key, schema]) => {
+  acc[key] = compositesModule.t.import(schema);
+  return acc;
+}, {} as Record<string, Type>);
+
 /**
  * User profile schema with nested objects and optional fields
  */
@@ -92,7 +108,8 @@ export const User = t
     age: t.Number({gte: 0, lte: 150}),
     verified: t.bool,
   })
-  .opt('avatar', t.String({format: 'ascii'}));
+  .opt('avatar', t.String({format: 'ascii'}))
+  .alias('User').type;
 
 /**
  * Product catalog schema with arrays and formatted numbers
@@ -189,7 +206,7 @@ export const Event = t.Object(
   t.Key('location', t.Tuple([t.Number({format: 'f64'}), t.Number({format: 'f64'})])),
   t.Key('metadata', t.Map(t.Or(t.str, t.num, t.bool))),
   t.KeyOpt('sessionId', t.str),
-);
+).alias('Event').type;
 
 /**
  * Contact information schema with formatted strings
@@ -287,3 +304,18 @@ export const ComplexNested = t.Object(
     }),
   ),
 );
+
+export const allSerializableTypes = {
+  ...primitiveTypes,
+  ...compositeTypes,
+  User,
+  Product,
+  BlogPost,
+  ApiResponse,
+  FileMetadata,
+  Configuration,
+  Event,
+  ContactInfo,
+  DatabaseRecord,
+  ComplexNested,
+} as const;

src/codegen/binary/cbor/__tests__/automated.spec.ts

@@ -0,0 +1,28 @@
+import {Writer} from '@jsonjoy.com/buffers/lib/Writer';
+import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder';
+import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder';
+import {CborCodegen} from '../CborCodegen';
+import {Random} from '../../../../random';
+import {allSerializableTypes} from '../../../../__tests__/fixtures';
+
+const encoder = new CborEncoder(new Writer(16));
+const decoder = new CborDecoder();
+
+for (const [name, type] of Object.entries(allSerializableTypes)) {
+  test(`can encode and decode ${name}`, () => {
+    for (let i = 0; i < 100; i++) {
+      const json = Random.gen(type);
+      try {
+        const fn = CborCodegen.get(type);
+        fn(json, encoder);
+        const encoded = encoder.writer.flush();
+        const decoded = decoder.decode(encoded);
+        expect(decoded).toEqual(json);
+      } catch (error) {
+        console.log(JSON.stringify(json, null, 2));
+        console.log(type + '');
+        throw error;
+      }
+    }
+  });
+}

src/type/classes/ModuleType/index.ts

@@ -1,10 +1,10 @@
 import {printTree} from 'tree-dump/lib/printTree';
-import type {Printable} from 'tree-dump/lib/types';
-import type {KeySchema, ModuleSchema, ObjSchema, Schema, TypeMap} from '../../../schema';
 import {Walker} from '../../../schema/Walker';
-import type {Type} from '../../../type';
 import {TypeBuilder} from '../../TypeBuilder';
 import {AliasType} from '../AliasType';
+import type {Printable} from 'tree-dump/lib/types';
+import type {KeySchema, ModuleSchema, ObjSchema, Schema, TypeMap} from '../../../schema';
+import type {Type} from '../../../type';
 import type {RefType} from '../RefType';
 
 export class ModuleType implements Printable {

src/type/discriminator.ts

@@ -1,5 +1,5 @@
-import type {Expr} from '@jsonjoy.com/json-expression';
 import {ArrType, BoolType, ConType, NumType, type KeyType, ObjType, StrType} from './classes';
+import type {Expr} from '@jsonjoy.com/json-expression';
 import type {OrType, RefType, Type} from './types';
 
 /**
@@ -79,7 +79,10 @@ export class Discriminator {
     const length = types.length;
     const expanded: Type[] = [];
     const expand = (type: Type): Type[] => {
-      if (type.kind() === 'ref') type = (type as RefType).resolve();
+      while (type.kind() === 'ref' || type.kind() === 'key') {
+        if (type.kind() === 'ref') type = (type as RefType).resolve();
+        if (type.kind() === 'key') type = (type as KeyType<any, Type>).val;
+      }
       if (type.kind() === 'or') return (type as OrType).types.flatMap((t: Type) => expand(t));
       return [type];
     };
@@ -108,7 +111,7 @@ export class Discriminator {
   ) {}
 
   condition(): Expr {
-    if (this.type instanceof ConType) return ['==', this.type.literal(), ['$', this.path]];
+    if (this.type instanceof ConType) return ['==', this.type.literal(), ['$', this.path, this.type.literal() === null ? '' : null]];
     if (this.type instanceof BoolType) return ['==', ['type', ['$', this.path]], 'boolean'];
     if (this.type instanceof NumType) return ['==', ['type', ['$', this.path]], 'number'];
     if (this.type instanceof StrType) return ['==', ['type', ['$', this.path]], 'string'];