fix: typings

Author: P0lip

src/components/SchemaRow.tsx

@@ -2,7 +2,7 @@ import { IRowRendererOptions, Tree } from '@stoplight/tree-list';
 import cn from 'classnames';
 import * as React from 'react';
 
-import { MetadataStore } from '../tree/metadata';
+import { metadataStore } from '../tree/metadata';
 import { GoToRefHandler, SchemaTreeListNode } from '../types';
 import { Caret, Description, Divider, Property, Validations } from './shared';
 
@@ -18,15 +18,15 @@ const ICON_DIMENSION = 20;
 const ROW_OFFSET = 7;
 
 export const SchemaRow: React.FunctionComponent<ISchemaRow> = ({ className, node, rowOptions, onGoToRef }) => {
-  const metadata = MetadataStore[node.id];
+  const metadata = metadataStore[node.id];
   if (!metadata) {
     throw new Error('Missing metadata');
   }
 
   const { path, schema: schemaNode } = metadata;
 
   const parentSchemaNode =
-    node.parent === null || !(node.parent.id in MetadataStore) ? null : MetadataStore[node.parent.id].schema;
+    node.parent === null || !(node.parent.id in metadataStore) ? null : metadataStore[node.parent.id].schema;
   const description = 'annotations' in schemaNode ? schemaNode.annotations.description : null;
 
   return (

src/components/shared/Property.tsx

@@ -14,7 +14,7 @@ export interface IProperty {
 
 export const Property: React.FunctionComponent<IProperty> = ({ node, path, onGoToRef }) => {
   const type = isRefNode(node) ? '$ref' : isCombinerNode(node) ? node.combiner : node.type;
-  const subtype = isArrayNodeWithItems(node) ? inferType(node.items) : undefined;
+  const subtype = isArrayNodeWithItems(node) ? inferType(node.items) : void 0;
 
   const childrenCount = React.useMemo<number | null>(() => {
     if (type === SchemaKind.Object) {

src/components/shared/Types.tsx

@@ -1,4 +1,4 @@
-import { Dictionary } from '@stoplight/types';
+import { Dictionary, Optional } from '@stoplight/types';
 import cn from 'classnames';
 import { JSONSchema4TypeName } from 'json-schema';
 import * as React from 'react';
@@ -9,8 +9,8 @@ import { JSONSchema4CombinerName } from '../../types';
  * TYPE
  */
 export interface IType {
-  type: JSONSchema4TypeName | JSONSchema4CombinerName | 'binary' | '$ref';
-  subtype?: JSONSchema4TypeName;
+  type: JSONSchema4TypeName | JSONSchema4CombinerName | '$ref';
+  subtype: Optional<JSONSchema4TypeName | JSONSchema4TypeName[]>;
   className?: string;
 }
 
@@ -30,12 +30,12 @@ Type.displayName = 'JsonSchemaViewer.Type';
  */
 interface ITypes {
   className?: string;
-  type?: JSONSchema4TypeName | JSONSchema4TypeName[] | JSONSchema4CombinerName | '$ref';
-  subtype?: JSONSchema4TypeName;
+  type: Optional<JSONSchema4TypeName | JSONSchema4TypeName[] | JSONSchema4CombinerName | '$ref'>;
+  subtype: Optional<JSONSchema4TypeName | JSONSchema4TypeName[]>;
 }
 
 export const Types: React.FunctionComponent<ITypes> = ({ className, type, subtype, children }) => {
-  if (!type) return null;
+  if (type === void 0) return null;
 
   if (!Array.isArray(type)) {
     return <Type className={className} type={type} subtype={subtype} children={children} />;
@@ -75,7 +75,7 @@ export const PropertyTypeColors: Dictionary<string, IType['type']> = {
   integer: 'text-red-7 dark:text-red-6',
   number: 'text-red-7 dark:text-red-6',
   boolean: 'text-red-4',
-  binary: 'text-green-4',
+  // binary: 'text-green-4',
   string: 'text-green-7 dark:text-green-5',
   $ref: 'text-purple-6 dark:text-purple-4',
 };

src/tree/metadata.ts

@@ -1,9 +1,9 @@
-import { Dictionary, JsonPath } from '@stoplight/types';
-import { SchemaNode } from '../types';
+import { JsonPath } from '@stoplight/types';
+import { SchemaNode, SchemaTreeListNode } from '../types';
 
 export interface ITreeNodeMeta {
   path: JsonPath;
   schema: SchemaNode;
 }
 
-export const MetadataStore: Dictionary<ITreeNodeMeta, string> = {}; // todo: can be a weakmap I guess since no stringyfing is needed
+export const metadataStore = new WeakMap<SchemaTreeListNode, ITreeNodeMeta>();

src/tree/populateTree.ts

@@ -6,7 +6,7 @@ import { IArrayNode, IObjectNode, SchemaKind, SchemaNode, SchemaTreeListNode } f
 import { getPrimaryType } from '../utils/getPrimaryType';
 import { isCombinerNode, isRefNode } from '../utils/guards';
 import { isCombiner } from '../utils/isCombiner';
-import { MetadataStore } from './metadata';
+import { metadataStore } from './metadata';
 import { walk } from './walk';
 
 export type WalkingOptions = {
@@ -34,7 +34,7 @@ export const populateTree: Walker = (schema, parent, level, path, options) => {
     };
 
     parent.children.push(treeNode);
-    MetadataStore[treeNode.id] = {
+    metadataStore[treeNode.id] = {
       schema: node,
       path,
     };

src/tree/tree.ts

@@ -5,7 +5,7 @@ import { JSONSchema4 } from 'json-schema';
 import { get } from 'lodash-es';
 import { SchemaNode } from '../types';
 import { isRefNode } from '../utils/guards';
-import { MetadataStore } from './metadata';
+import { metadataStore } from './metadata';
 import { populateTree } from './populateTree';
 
 export class SchemaTree extends Tree {
@@ -23,7 +23,7 @@ export class SchemaTree extends Tree {
           expanded[node.id] = false;
         }
 
-        if (MetadataStore[parentTreeNode.id] && isRefNode(MetadataStore[parentTreeNode.id].schema)) return false;
+        if (metadataStore[parentTreeNode.id] && isRefNode(metadataStore[parentTreeNode.id].schema)) return false;
         return level <= this.defaultExpandedDepth + 1;
       },
     });
@@ -45,7 +45,7 @@ export class SchemaTree extends Tree {
       return super.unwrap(node);
     }
 
-    const { path, schema } = MetadataStore[node.id];
+    const { path, schema } = metadataStore[node.id];
     if (isRefNode(schema)) {
       this.populateTreeFragment(node, pointerToPath(schema.$ref)); // DO NOTE THAT NODES PLACED UNDER THE REF WON'T HAVE CORREC PATHS
     } else {

src/types.ts

@@ -55,7 +55,7 @@ export type SchemaNode = ICombinerNode | IBaseNode | IArrayNode | IObjectNode |
 
 export type SchemaTreeListNode = TreeListNode;
 
-export type GoToRefHandler = (path: string, node: SchemaTreeListNode) => void;
+export type GoToRefHandler = (path: string, node: IRefNode) => void;
 
 export type RowRenderer = (
   node: TreeListNode,

src/utils/inferType.ts

@@ -1,7 +1,8 @@
+import { Optional } from '@stoplight/types';
 import { JSONSchema4, JSONSchema4TypeName } from 'json-schema';
 import { SchemaKind } from '../types';
 
-export function inferType(node: JSONSchema4): JSONSchema4TypeName | JSONSchema4TypeName[] | undefined {
+export function inferType(node: JSONSchema4): Optional<JSONSchema4TypeName | JSONSchema4TypeName[]> {
   if ('type' in node) {
     return node.type;
   }