Uses latest runtype

Author: erezsh

preql/core/pql_ast.py

@@ -1,7 +1,7 @@
 from typing import List, Any, Optional, Dict, Union
 from dataclasses import field
 
-from preql.utils import dataclass, TextReference, field_list
+from preql.utils import dataclass, TextReference
 
 from . import pql_types as types
 from .pql_types import T, Object, Id
@@ -153,7 +153,7 @@ class Projection(TableOperation):
     table: Object
     fields: List[NamedField]
     groupby: bool = False
-    agg_fields: List[NamedField] = field_list()
+    agg_fields: List[NamedField] = []
 
     def __post_init__(self):
         if self.groupby:

preql/core/sql.py

@@ -1,6 +1,6 @@
 from typing import List, Optional, Dict
 
-from preql.utils import dataclass, X, listgen, field_list, safezip
+from preql.utils import dataclass, X, listgen, safezip
 
 from . import pql_types
 from .pql_types import T, Type, dp_type, Id
@@ -675,9 +675,9 @@ class Select(TableOperation):
     type: Type
     table: Sql # XXX Table won't work with RawSQL
     fields: List[Sql]
-    conds: List[Sql] = field_list()
-    group_by: List[Sql] = field_list()
-    order: List[Sql] = field_list()
+    conds: List[Sql] = []
+    group_by: List[Sql] = []
+    order: List[Sql] = []
 
     # MySQL doesn't support arithmetic in offset/limit, and we don't need it anyway
     offset: Optional[int] = None

preql/utils.py

@@ -7,7 +7,6 @@
 from typing import Optional
 from functools import wraps
 from operator import getitem
-import dataclasses
 
 import runtype
 from rich.text import Text
@@ -18,9 +17,6 @@
 dataclass = runtype.dataclass(check_types=settings.typecheck)
 dsp = runtype.Dispatch()
 
-def field_list():
-    return dataclasses.field(default_factory=list)
-
 class SafeDict(dict):
     def __setitem__(self, key, value):
         if key in self:

pyproject.toml

@@ -28,7 +28,7 @@ packages = [{ include = "preql" }]
 [tool.poetry.dependencies]
 python = "^3.6"
 lark-parser = "^0.11.3"
-runtype = "^0.1.12"
+runtype = "^0.1.16"
 dsnparse = "*"
 prompt-toolkit = "*"
 pygments = "*"