Merge pull request #36 from cuaklabs/refactor/update-il-without-xor

Update TypeMetadata without xor metadata
cuaklabs · Sep 21, 2023 · 1e4b958 · 1e4b958
2 parents f3b9467 + d5de829
commit 1e4b958
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 77 deletions.
diff --git a/packages/transformers/ajsttil/src/index.ts b/packages/transformers/ajsttil/src/index.ts
@@ -1,77 +1,36 @@
-import { JsonValue } from '@cuaklabs/json-schema-types';
+import {
+  AndTypeMetadata,
+  AnyTypeMetadata,
+  ArrayTypeMetadata,
+  BooleanTypeMetadata,
+  FloatTypeMetadata,
+  IntegerTypeMetadata,
+  LiteralTypeMetadata,
+  NoneTypeMetadata,
+  ObjectTypeMetadata,
+  OrTypeMetadata,
+  PropertyTypeMetadata,
+  StringIndexSignatureType,
+  StringTypeMetadata,
+  TypeMedatata,
+  TypeMetadataKind,
+} from './metadata/models/TypeMetadata';
 
-export enum TypeMetadataKind {
-  and,
-  anyType,
-  arrayType,
-  booleanType,
-  floatType,
-  integerType,
-  literalType,
-  noneType,
-  objectType,
-  or,
-  propertyType,
-  stringIndexSignatureType,
-  stringType,
-  xor,
-}
+export type {
+  AndTypeMetadata,
+  AnyTypeMetadata,
+  ArrayTypeMetadata,
+  BooleanTypeMetadata,
+  FloatTypeMetadata,
+  IntegerTypeMetadata,
+  LiteralTypeMetadata,
+  NoneTypeMetadata,
+  ObjectTypeMetadata,
+  OrTypeMetadata,
+  PropertyTypeMetadata,
+  StringIndexSignatureType,
+  StringTypeMetadata,
+  TypeMedatata,
+};
 
-export interface BaseTypeMetadata<TKind extends TypeMetadataKind> {
-  id?: string;
-  kind: TKind;
-}
-
-export interface OneChildTypeMetadata<TKind extends TypeMetadataKind>
-  extends BaseTypeMetadata<TKind> {
-  child: TypeMedatata;
-}
-
-export interface ManyChildrenTypeMetadata<
-  TKind extends TypeMetadataKind,
-  TChildren extends TypeMedatata[] = TypeMedatata[],
-> extends BaseTypeMetadata<TKind> {
-  children: TChildren;
-}
-
-export type AndTypeMetadata = ManyChildrenTypeMetadata<TypeMetadataKind.and>;
-export type AnyTypeMetadata = BaseTypeMetadata<TypeMetadataKind.anyType>;
-export type ArrayTypeMetadata =
-  OneChildTypeMetadata<TypeMetadataKind.arrayType>;
-export type BooleanTypeMetadata =
-  BaseTypeMetadata<TypeMetadataKind.booleanType>;
-export type FloatTypeMetadata = BaseTypeMetadata<TypeMetadataKind.floatType>;
-export type IntegerTypeMetadata =
-  BaseTypeMetadata<TypeMetadataKind.integerType>;
-export interface LiteralTypeMetadata
-  extends BaseTypeMetadata<TypeMetadataKind.literalType> {
-  literal: JsonValue;
-}
-export type NoneTypeMetadata = BaseTypeMetadata<TypeMetadataKind.noneType>;
-export type ObjectTypeMetadata = BaseTypeMetadata<TypeMetadataKind.objectType>;
-export type OrTypeMetadata = ManyChildrenTypeMetadata<TypeMetadataKind.or>;
-export interface PropertyTypeMetadata
-  extends OneChildTypeMetadata<TypeMetadataKind.propertyType> {
-  isOptional: boolean;
-  property: string;
-}
-export type StringIndexSignatureType =
-  OneChildTypeMetadata<TypeMetadataKind.stringIndexSignatureType>;
-export type StringTypeMetadata = BaseTypeMetadata<TypeMetadataKind.stringType>;
-export type XorTypeMetadata = ManyChildrenTypeMetadata<TypeMetadataKind.xor>;
-
-export type TypeMedatata =
-  | AndTypeMetadata
-  | AnyTypeMetadata
-  | ArrayTypeMetadata
-  | BooleanTypeMetadata
-  | FloatTypeMetadata
-  | IntegerTypeMetadata
-  | LiteralTypeMetadata
-  | NoneTypeMetadata
-  | ObjectTypeMetadata
-  | OrTypeMetadata
-  | PropertyTypeMetadata
-  | StringIndexSignatureType
-  | StringTypeMetadata
-  | XorTypeMetadata;
+export { TypeMetadataKind };
diff --git a/packages/transformers/ajsttil/src/metadata/models/TypeMetadata.ts b/packages/transformers/ajsttil/src/metadata/models/TypeMetadata.ts
@@ -0,0 +1,74 @@
+import { JsonValue } from '@cuaklabs/json-schema-types';
+
+export enum TypeMetadataKind {
+  and,
+  anyType,
+  arrayType,
+  booleanType,
+  floatType,
+  integerType,
+  literalType,
+  noneType,
+  objectType,
+  or,
+  propertyType,
+  stringIndexSignatureType,
+  stringType,
+}
+
+export interface BaseTypeMetadata<TKind extends TypeMetadataKind> {
+  id?: string;
+  kind: TKind;
+}
+
+export interface OneChildTypeMetadata<TKind extends TypeMetadataKind>
+  extends BaseTypeMetadata<TKind> {
+  child: TypeMedatata;
+}
+
+export interface ManyChildrenTypeMetadata<
+  TKind extends TypeMetadataKind,
+  TChildren extends TypeMedatata[] = TypeMedatata[],
+> extends BaseTypeMetadata<TKind> {
+  children: TChildren;
+}
+
+export type AndTypeMetadata = ManyChildrenTypeMetadata<TypeMetadataKind.and>;
+export type AnyTypeMetadata = BaseTypeMetadata<TypeMetadataKind.anyType>;
+export type ArrayTypeMetadata =
+  OneChildTypeMetadata<TypeMetadataKind.arrayType>;
+export type BooleanTypeMetadata =
+  BaseTypeMetadata<TypeMetadataKind.booleanType>;
+export type FloatTypeMetadata = BaseTypeMetadata<TypeMetadataKind.floatType>;
+export type IntegerTypeMetadata =
+  BaseTypeMetadata<TypeMetadataKind.integerType>;
+export interface LiteralTypeMetadata
+  extends BaseTypeMetadata<TypeMetadataKind.literalType> {
+  literal: JsonValue;
+}
+export type NoneTypeMetadata = BaseTypeMetadata<TypeMetadataKind.noneType>;
+export type ObjectTypeMetadata = BaseTypeMetadata<TypeMetadataKind.objectType>;
+export type OrTypeMetadata = ManyChildrenTypeMetadata<TypeMetadataKind.or>;
+export interface PropertyTypeMetadata
+  extends OneChildTypeMetadata<TypeMetadataKind.propertyType> {
+  isOptional: boolean;
+  property: string;
+}
+export type StringIndexSignatureType =
+  OneChildTypeMetadata<TypeMetadataKind.stringIndexSignatureType>;
+export type StringTypeMetadata = BaseTypeMetadata<TypeMetadataKind.stringType>;
+
+export type TypeMedatata =
+  | AndTypeMetadata
+  | AnyTypeMetadata
+  | ArrayTypeMetadata
+  | BooleanTypeMetadata
+  | FloatTypeMetadata
+  | IntegerTypeMetadata
+  | LiteralTypeMetadata
+  | NoneTypeMetadata
+  | ObjectTypeMetadata
+  | OrTypeMetadata
+  | PropertyTypeMetadata
+  | StringIndexSignatureType
+  | StringTypeMetadata;
diff --git a/...mers/json-schema-2-ajsttil/src/jsonSchema/202012/calculations/transformJsonSchema.spec.ts b/...mers/json-schema-2-ajsttil/src/jsonSchema/202012/calculations/transformJsonSchema.spec.ts
@@ -388,7 +388,7 @@ describe(transformJsonSchema.name, () => {
             property: 'bar',
           },
         ],
-        kind: TypeMetadataKind.xor,
+        kind: TypeMetadataKind.or,
       },
     ],
     [
@@ -436,6 +436,10 @@ describe(transformJsonSchema.name, () => {
           {
             kind: TypeMetadataKind.floatType,
           },
+          {
+            kind: TypeMetadataKind.literalType,
+            literal: null,
+          },
           {
             kind: TypeMetadataKind.objectType,
           },

diff --git a/...nsformers/json-schema-2-ajsttil/src/jsonSchema/202012/calculations/transformJsonSchema.ts b/...nsformers/json-schema-2-ajsttil/src/jsonSchema/202012/calculations/transformJsonSchema.ts
@@ -102,6 +102,10 @@ function handleJsonSchemaChildren(
         {
           kind: TypeMetadataKind.floatType,
         },
+        {
+          kind: TypeMetadataKind.literalType,
+          literal: null,
+        },
         {
           kind: TypeMetadataKind.objectType,
         },
@@ -198,7 +202,7 @@ function handleJsonSchemaSubschemas(
       children: schema.oneOf.map((schema: JsonSchema) =>
         transformJsonSchema(schema, context),
       ),
-      kind: TypeMetadataKind.xor,
+      kind: TypeMetadataKind.or,
     });
   }
 }