pytrilogy 0.0.3.23__py3-none-any.whl → 0.0.3.25__py3-none-any.whl

{pytrilogy-0.0.3.23.dist-info → pytrilogy-0.0.3.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.23
+Version: 0.0.3.25
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.23.dist-info → pytrilogy-0.0.3.25.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.23.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=V3stjtkh3sDxf-s4ccwlCSOIsq8WO5pyE5PuQVwEsio,303
+pytrilogy-0.0.3.25.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=piV4nnwA9-0AitLYz0ClSA6czFL0v_VeaN4NIfqH7xw,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -13,21 +13,21 @@ trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
 trilogy/core/enums.py,sha256=wuW667WD3mhZnXmN2VXzohseHpdlmzrfLvPtQJNdhdw,7165
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
-trilogy/core/environment_helpers.py,sha256=oOpewPwMp8xOtx2ayeeyuLNUwr-cli7UanHKot5ebNY,7627
+trilogy/core/environment_helpers.py,sha256=LjB3UsLyw7TncgS8EiMGtovGU_txyUki_QK94rSsJq0,7631
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=E-OZZTshUNmEMMl8nhaUDUhQkr45gqUCdPaDiBlayic,25392
+trilogy/core/functions.py,sha256=U-IkBF-HEaGFXF-PgB993CVTnDFE850LHXW-HFfhttc,25391
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
 trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,7957
 trilogy/core/query_processor.py,sha256=Do8YpdPBdsbKtl9n37hobzk8SORMGqH-e_zNNxd-BE4,19456
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/models/author.py,sha256=gsn_vkm8gvnwTvzgqOL5v3X1Lx4n8xg32tRwk_9Mxnc,73494
-trilogy/core/models/build.py,sha256=T3rDPoWNO_pNice90WBVwPzyiHK4pg-i-5iClkWeY8s,57392
+trilogy/core/models/author.py,sha256=-90COW7QY6w-g8GkjivPZqG2yNitn74e13m5KYgB1IU,73985
+trilogy/core/models/build.py,sha256=2K-dANoFFl36yFdEDf7FDL36zM8FKSzpjLT5K2Na8Kc,57549
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
-trilogy/core/models/core.py,sha256=nb4h1HHm5_qwmUkYth4zRhEttS1EtsMZCP4vT20EEAE,10326
+trilogy/core/models/core.py,sha256=wx6hJcFECMG-Ij972ADNkr-3nFXkYESr82ObPiC46_U,10875
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
-trilogy/core/models/environment.py,sha256=RlHNrRer4p1uSQM030iwGJL82M1hMyY5p8a550XTfUI,26606
+trilogy/core/models/environment.py,sha256=eB52hyb1e9fJFybP5u5tUiaNbBHGXkMdm0i2V-LUUiw,26888
 trilogy/core/models/execute.py,sha256=KZHiovlSr_3ZjyzKD1mdBlAqnPCqFCChQkO4_4WlGtg,34224
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
@@ -37,7 +37,7 @@ trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP75
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/concept_strategies_v3.py,sha256=O-O08cGLl4XX3Faf59UlkFjsjzTU-QkzlDQ0mzY-LRE,40515
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
-trilogy/core/processing/utility.py,sha256=Oc5tLGeDDpzhbfo2ZcF8ex1kez-NcJDMcG2Lm5BjS4c,20548
+trilogy/core/processing/utility.py,sha256=mnN_pewdpDgRou4QJ1JLcqYHyZdp8DrcsGsqW3QmA3o,20591
 trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
 trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt218jAS11s4RV4zD781vP4im-GI,3371
 trilogy/core/processing/node_generators/common.py,sha256=ZsDzThjm_mAtdQpKAg8QIJiPVZ4KuUkKyilj4eOhSDs,9439
@@ -70,7 +70,7 @@ trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 trilogy/core/statements/common.py,sha256=KxEmz2ySySyZ6CTPzn0fJl5NX2KOk1RPyuUSwWhnK1g,759
 trilogy/core/statements/execute.py,sha256=cSlvpHFOqpiZ89pPZ5GDp9Hu6j6uj-5_h21FWm_L-KM,1248
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=QxBqbMop8l1eD36RNxSNL8XWd0mbI71FryvW1XK5NuQ,40797
+trilogy/dialect/base.py,sha256=ogBNUDt0UEmx-F8EXGG65i6fcz2KcIz8a3gwE7YXCVw,40956
 trilogy/dialect/bigquery.py,sha256=PkjFcNGZHYOe655PmJhb8a0afdFULuovqP0qQVO8m0I,2953
 trilogy/dialect/common.py,sha256=XjHkP8Dqezjkd2JU5xoAlMRS_6HNyXQCF4CykLK3C8o,5011
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
@@ -91,13 +91,13 @@ trilogy/parsing/common.py,sha256=99tDKrpQTk-SpyTXUqKFtm-lfmhjCOQIn25hxbQvRRg,214
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=Jja7SxpD0QSVdDfhaGs7QN301tt6g0npc3fAGhsuVuI,60787
+trilogy/parsing/parse_engine.py,sha256=Ffm3YB2jTPcA81CZTkpQ7iAwD1LP10QQpjoKk9fey4I,61849
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
 trilogy/parsing/trilogy.lark,sha256=7libFS5HNiyHJYzr5_lEiY-Lpqit04_PgyIPHMZT7-w,12928
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.23.dist-info/METADATA,sha256=ZlYR5KCt_WOZwxuAmV6P5iFW88GmieXKo48iTCHmG9c,9100
-pytrilogy-0.0.3.23.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.23.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.23.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.23.dist-info/RECORD,,
+pytrilogy-0.0.3.25.dist-info/METADATA,sha256=emvDFD0vE0A1aIYfJZDD1qNZG9QnYUt2XQ7UkYeO49s,9100
+pytrilogy-0.0.3.25.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.25.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.25.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.25.dist-info/RECORD,,

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.23"
+__version__ = "0.0.3.25"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/environment_helpers.py

@@ -54,7 +54,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
             grain=concept.grain,
             namespace=concept.namespace,
             keys=set(
-                concept.address,
+                [concept.address],
             ),
             metadata=Metadata(
                 description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}. ",
@@ -102,7 +102,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
             grain=concept.grain,
             namespace=concept.namespace,
             keys=set(
-                concept.address,
+                [concept.address],
             ),
             metadata=Metadata(
                 description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}.",

trilogy/core/functions.py

@@ -717,7 +717,6 @@ class FunctionFactory:
                 output_purpose = Purpose.METRIC
             else:
                 output_purpose = Purpose.PROPERTY
-
         return Function(
             operator=operator,
             arguments=full_args,

trilogy/core/models/author.py

@@ -255,7 +255,7 @@ class Parenthetical(
         return arg_to_datatype(self.content)
 
 
-class Conditional(Mergeable, ConceptArgs, Namespaced, BaseModel):
+class Conditional(Mergeable, ConceptArgs, Namespaced, DataTyped, BaseModel):
     left: Expr
     right: Expr
     operator: BooleanOperator
@@ -357,6 +357,11 @@ class Conditional(Mergeable, ConceptArgs, Namespaced, BaseModel):
             output += self.right.existence_arguments
         return output
 
+    @property
+    def output_datatype(self):
+        # a conditional is always a boolean
+        return DataType.BOOL
+
     def decompose(self):
         chunks = []
         if self.operator == BooleanOperator.AND:
@@ -545,7 +550,7 @@ class Grain(Namespaced, BaseModel):
             return self.__add__(other)
 
 
-class Comparison(ConceptArgs, Mergeable, Namespaced, BaseModel):
+class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
     left: Union[
         int,
         str,
@@ -745,6 +750,11 @@ class Comparison(ConceptArgs, Mergeable, Namespaced, BaseModel):
             output += self.right.existence_arguments
         return output
 
+    @property
+    def output_datatype(self):
+        # a conditional is always a boolean
+        return DataType.BOOL
+
 
 class SubselectComparison(Comparison):
     def __eq__(self, other):
@@ -1035,6 +1045,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
                     pkeys.update(parent_keys)
             raw_keys = pkeys
             # deduplicate
+
             final_grain = Grain.from_concepts(raw_keys, environment)
             keys = final_grain.components
         return new_lineage, final_grain, keys
@@ -1400,7 +1411,7 @@ def get_basic_type(
     if isinstance(type, NumericType):
         return DataType.NUMERIC
     if isinstance(type, TraitDataType):
-        return type.type
+        return get_basic_type(type.type)
     return type
 
 
@@ -2244,6 +2255,11 @@ class CustomType(BaseModel):
     name: str
     type: DataType
 
+    def with_namespace(self, namespace: str) -> "CustomType":
+        return CustomType.model_construct(
+            name=address_with_namespace(self.name, namespace), type=self.type
+        )
+
 
 Expr = (
     MagicConstants
@@ -2284,6 +2300,7 @@ FuncArgs = (
     | date
     | datetime
     | MapWrapper[Any, Any]
+    | TraitDataType
     | DataType
     | ListType
     | MapType

trilogy/core/models/build.py

@@ -77,6 +77,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
     arg_to_datatype,
 )
@@ -1066,7 +1067,9 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
     # class BuildFunction(Function):
     operator: FunctionType
     arg_count: int = Field(default=1)
-    output_datatype: DataType | ListType | StructType | MapType | NumericType
+    output_datatype: (
+        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+    )
     output_purpose: Purpose
     valid_inputs: Optional[
         Union[
@@ -1082,6 +1085,7 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
             date,
             datetime,
             MapWrapper[Any, Any],
+            TraitDataType,
             DataType,
             ListType,
             MapType,
@@ -1873,6 +1877,10 @@ class Factory:
         new.gen_concept_list_caches()
         return new
 
+    @build.register
+    def _(self, base: TraitDataType):
+        return base
+
     @build.register
     def _(self, base: Datasource):
         local_cache: dict[str, BuildConcept] = {}

trilogy/core/models/core.py

@@ -105,12 +105,15 @@ class DataType(Enum):
 
 
 class TraitDataType(BaseModel):
-    type: DataType
+    type: DataType | NumericType | StructType | ListType | MapType
     traits: list[str]
 
     def __hash__(self):
         return hash(self.type)
 
+    def __str__(self) -> str:
+        return f"Trait<{self.type}, {self.traits}>"
+
     def __eq__(self, other):
         if isinstance(other, DataType):
             return self.type == other
@@ -131,6 +134,9 @@ class NumericType(BaseModel):
     precision: int = 20
     scale: int = 5
 
+    def __str__(self) -> str:
+        return f"Numeric({self.precision},{self.scale})"
+
     @property
     def data_type(self):
         return DataType.NUMERIC
@@ -353,12 +359,21 @@ def merge_datatypes(
 
 def is_compatible_datatype(left, right):
     # for unknown types, we can't make any assumptions
+    if all(
+        isinstance(x, NumericType)
+        or x in (DataType.INTEGER, DataType.FLOAT, DataType.NUMERIC)
+        for x in (left, right)
+    ):
+        return True
+    elif isinstance(left, NumericType) or isinstance(right, NumericType):
+        return False
     if right == DataType.UNKNOWN or left == DataType.UNKNOWN:
         return True
     if left == right:
         return True
     if {left, right} == {DataType.NUMERIC, DataType.FLOAT}:
         return True
+
     if {left, right} == {DataType.NUMERIC, DataType.INTEGER}:
         return True
     if {left, right} == {DataType.FLOAT, DataType.INTEGER}:
@@ -382,6 +397,8 @@ def arg_to_datatype(arg) -> CONCRETE_TYPES:
         return DataType.FLOAT
     elif isinstance(arg, NumericType):
         return arg
+    elif isinstance(arg, TraitDataType):
+        return arg
     elif isinstance(arg, ListWrapper):
         return ListType(type=arg.type)
     elif isinstance(arg, DataTyped):

trilogy/core/models/environment.py

@@ -442,6 +442,13 @@ class Environment(BaseModel):
                 self.functions[address_with_namespace(key, alias)] = (
                     function.with_namespace(alias)
                 )
+        for key, type in source.data_types.items():
+            if same_namespace:
+                self.data_types[key] = type
+            else:
+                self.data_types[address_with_namespace(key, alias)] = (
+                    type.with_namespace(alias)
+                )
         return self
 
     def add_file_import(

trilogy/core/processing/utility.py

@@ -38,6 +38,7 @@ from trilogy.core.models.core import (
     MapType,
     MapWrapper,
     NumericType,
+    TraitDataType,
     TupleWrapper,
 )
 from trilogy.core.models.execute import (
@@ -441,6 +442,7 @@ def is_scalar_condition(
         | BuildCaseWhen
         | BuildCaseElse
         | MagicConstants
+        | TraitDataType
         | DataType
         | MapWrapper[Any, Any]
         | ListType

trilogy/dialect/base.py

@@ -36,6 +36,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
 )
 from trilogy.core.models.datasource import Datasource, RawColumnExpr
@@ -510,6 +511,7 @@ class BaseDialect:
             date,
             datetime,
             DataType,
+            TraitDataType,
             MagicConstants,
             MapWrapper[Any, Any],
             MapType,
@@ -677,6 +679,8 @@ class BaseDialect:
             return self.FUNCTION_MAP[FunctionType.DATE_LITERAL](e)
         elif isinstance(e, datetime):
             return self.FUNCTION_MAP[FunctionType.DATETIME_LITERAL](e)
+        elif isinstance(e, TraitDataType):
+            return self.render_expr(e.type, cte=cte, cte_map=cte_map)
         else:
             raise ValueError(f"Unable to render type {type(e)} {e}")
 

trilogy/parsing/parse_engine.py

@@ -91,6 +91,7 @@ from trilogy.core.models.core import (
     TupleWrapper,
     arg_to_datatype,
     dict_to_map_wrapper,
+    is_compatible_datatype,
     list_to_wrapper,
     tuple_to_wrapper,
 )
@@ -146,6 +147,8 @@ SELF_LABEL = "root"
 
 MAX_PARSE_DEPTH = 10
 
+STDLIB_ROOT = Path(__file__).parent.parent
+
 
 @dataclass
 class WholeGrainWrapper:
@@ -443,22 +446,36 @@ class ParseToObjects(Transformer):
     def map_type(self, args) -> MapType:
         return MapType(key_type=args[0], value_type=args[1])
 
+    @v_args(meta=True)
     def data_type(
-        self, args
+        self, meta: Meta, args
     ) -> DataType | TraitDataType | ListType | StructType | MapType | NumericType:
         resolved = args[0]
         traits = args[2:]
+        base: DataType | TraitDataType | ListType | StructType | MapType | NumericType
         if isinstance(resolved, StructType):
-            return resolved
+            base = resolved
         elif isinstance(resolved, ListType):
-            return resolved
+            base = resolved
         elif isinstance(resolved, NumericType):
-            return resolved
+            base = resolved
         elif isinstance(resolved, MapType):
-            return resolved
-        base = DataType(args[0].lower())
+            base = resolved
+        else:
+            base = DataType(args[0].lower())
         if traits:
+            for trait in traits:
+                if trait not in self.environment.data_types:
+                    raise ParseError(
+                        f"Invalid trait (type) {trait} for {base}, line {meta.line}."
+                    )
+                matched = self.environment.data_types[trait]
+                if not is_compatible_datatype(matched.type, base):
+                    raise ParseError(
+                        f"Invalid trait (type) {trait} for {base}, line {meta.line}. Trait expects type {matched.type}, has {base}"
+                    )
             return TraitDataType(type=base, traits=traits)
+
         return base
 
     def array_comparison(self, args) -> ComparisonOperator:
@@ -929,9 +946,12 @@ class ParseToObjects(Transformer):
             select=args[-1],
         )
 
-    def resolve_import_address(self, address) -> str:
-        if isinstance(
-            self.environment.config.import_resolver, FileSystemImportResolver
+    def resolve_import_address(self, address, is_stdlib: bool = False) -> str:
+        if (
+            isinstance(
+                self.environment.config.import_resolver, FileSystemImportResolver
+            )
+            or is_stdlib
         ):
             with open(address, "r", encoding="utf-8") as f:
                 text = f.read()
@@ -939,7 +959,7 @@ class ParseToObjects(Transformer):
             lookup = address
             if lookup not in self.environment.config.import_resolver.content:
                 raise ImportError(
-                    f"Unable to import file {lookup}, not found in import resolver"
+                    f"Unable to import file {lookup}, not found in imsport resolver"
                 )
             text = self.environment.config.import_resolver.content[lookup]
         else:
@@ -957,13 +977,17 @@ class ParseToObjects(Transformer):
             cache_key = args[0]
         input_path = args[0]
         path = input_path.split(".")
-
-        if isinstance(
+        is_stdlib = False
+        if path[0] == "std":
+            is_stdlib = True
+            target = join(STDLIB_ROOT, *path) + ".preql"
+            token_lookup: Path | str = Path(target)
+        elif isinstance(
             self.environment.config.import_resolver, FileSystemImportResolver
         ):
             target = join(self.environment.working_path, *path) + ".preql"
             # tokens + text are cached by path
-            token_lookup: Path | str = Path(target)
+            token_lookup = Path(target)
         elif isinstance(self.environment.config.import_resolver, DictImportResolver):
             target = ".".join(path)
             token_lookup = target
@@ -984,7 +1008,7 @@ class ParseToObjects(Transformer):
             raw_tokens = self.tokens[token_lookup]
             text = self.text_lookup[token_lookup]
         else:
-            text = self.resolve_import_address(target)
+            text = self.resolve_import_address(target, is_stdlib)
             self.text_lookup[token_lookup] = text
 
             try:
@@ -1238,8 +1262,9 @@ class ParseToObjects(Transformer):
     def type_declaration(self, meta: Meta, args) -> TypeDeclaration:
         key = args[0]
         datatype = args[1]
-        self.environment.data_types[key] = datatype
-        return TypeDeclaration(type=CustomType(name=key, type=datatype))
+        new = CustomType(name=key, type=datatype)
+        self.environment.data_types[key] = new
+        return TypeDeclaration(type=new)
 
     def int_lit(self, args):
         return int("".join(args))