Moved Unknown type from hiku.typedef.types to the hiku.types

hiku/checker.py

@@ -5,8 +5,8 @@
 from .refs import NamedRef, Ref
 from .nodes import NodeTransformer, Symbol, Keyword, Tuple, List
 from .types import Sequence, SequenceMeta, Record, RecordMeta, Optional
-from .types import MappingMeta, OptionalMeta
-from .typedef.types import TypeRef, TypeRefMeta, Unknown, UnknownMeta
+from .types import MappingMeta, OptionalMeta, Unknown, UnknownMeta
+from .typedef.types import TypeRef, TypeRefMeta
 
 
 class GraphTypes(graph.GraphVisitor):

hiku/expr.py

@@ -4,10 +4,9 @@
 
 from .edn import loads
 from .query import Edge, Link, Field
-from .types import Record, Callable
+from .types import Record, Callable, Unknown
 from .nodes import Symbol, Tuple, List, Keyword, Dict
 from .compat import text_type, string_types
-from .typedef.types import Unknown
 from .readers.simple import transform
 
 

hiku/sources/graph.py

@@ -6,10 +6,10 @@
 from ..graph import Link, Field, Many
 from ..query import merge
 from ..utils import kw_only
+from ..types import Unknown
 from ..engine import Query, store_fields, subquery
 from ..checker import check, graph_types, fn_types
 from ..compiler import ExpressionCompiler
-from ..typedef.types import Unknown
 
 
 THIS_LINK_NAME = '__link_to_this'

hiku/typedef/kinko.py

@@ -3,9 +3,8 @@
 from contextlib import contextmanager
 
 from ..types import Record, RecordMeta, OptionalMeta, SequenceMeta, MappingMeta
-from ..types import GenericMeta
+from ..types import GenericMeta, Unknown
 from ..checker import GraphTypes
-from ..typedef.types import Unknown
 
 from .types import TypeDef
 

hiku/typedef/types.py

@@ -1,4 +1,4 @@
-from ..types import TypingMeta, GenericMeta
+from ..types import TypingMeta
 from ..compat import with_metaclass
 
 
@@ -26,13 +26,3 @@ def accept(cls, visitor):
 
 class TypeRef(with_metaclass(TypeRefMeta, object)):
     pass
-
-
-class UnknownMeta(GenericMeta):
-
-    def accept(cls, visitor):
-        return visitor.visit_unknown(cls)
-
-
-class Unknown(with_metaclass(UnknownMeta, object)):
-    pass

hiku/types.py

@@ -13,6 +13,16 @@ def accept(cls, visitor):
         raise NotImplementedError
 
 
+class UnknownMeta(GenericMeta):
+
+    def accept(cls, visitor):
+        return visitor.visit_unknown(cls)
+
+
+class Unknown(with_metaclass(UnknownMeta, object)):
+    pass
+
+
 class BooleanMeta(GenericMeta):
 
     def accept(cls, visitor):

tests/test_compiler.py

@@ -9,12 +9,11 @@
 import pytest
 
 from hiku.expr import define, S, if_, each, to_expr, if_some
-from hiku.types import Optional, String, Record
+from hiku.types import Optional, String, Record, Unknown
 from hiku.graph import Graph, Field, Edge, Link, Root, Many, One
 from hiku.compat import PY3, PY35
 from hiku.checker import check, graph_types, fn_types
 from hiku.compiler import ExpressionCompiler
-from hiku.typedef.types import Unknown
 
 
 @define(Unknown, _name='foo')

tests/test_refs.py

@@ -5,9 +5,8 @@
 from hiku.refs import Ref, NamedRef, ref_to_req, RequirementsExtractor
 from hiku.graph import Many, One, Maybe
 from hiku.query import Edge, Field, Link
-from hiku.types import Record
+from hiku.types import Record, Unknown
 from hiku.checker import check, graph_types, fn_types
-from hiku.typedef.types import Unknown
 
 from .base import reqs_eq_patcher
 

tests/test_source_graph.py

@@ -5,10 +5,9 @@
 
 from hiku.expr import define, S, each
 from hiku.graph import Graph, Edge, Link, Field, Option, Root, Many, One
-from hiku.types import Record, Sequence
+from hiku.types import Record, Sequence, Unknown
 from hiku.engine import Engine
 from hiku.sources.graph import SubGraph, Expr
-from hiku.typedef.types import Unknown
 from hiku.readers.simple import read
 from hiku.executors.threads import ThreadsExecutor