pytrilogy 0.0.3.55__py3-none-any.whl → 0.0.3.57__py3-none-any.whl

trilogy/parsing/parse_engine.py

@@ -74,6 +74,7 @@ from trilogy.core.models.author import (
     Parenthetical,
     RowsetItem,
     SubselectComparison,
+    UndefinedConceptFull,
     WhereClause,
     Window,
     WindowItem,
@@ -666,8 +667,14 @@ class ParseToObjects(Transformer):
                 environment=self.environment,
                 metadata=metadata,
             )
-
-            if purpose and purpose != Purpose.AUTO and concept.purpose != purpose:
+            # let constant purposes exist to support round-tripping
+            # as a build concept may end up with a constant based on constant inlining happening recursively
+            if (
+                purpose
+                and purpose != Purpose.AUTO
+                and concept.purpose != purpose
+                and purpose != Purpose.CONSTANT
+            ):
                 raise SyntaxError(
                     f'Concept {name} purpose {concept.purpose} does not match declared purpose {purpose}. Suggest defaulting to "auto"'
                 )
@@ -962,6 +969,11 @@ class ParseToObjects(Transformer):
             targets = {sources[0].address: self.environment.concepts[target]}
 
         if self.parse_pass == ParsePass.VALIDATION:
+            for source_c in sources:
+                if isinstance(source_c, UndefinedConceptFull):
+                    raise SyntaxError(
+                        f"Cannot merge non-existent source concept {source_c.address} on line: {meta.line}"
+                    )
             new = MergeStatementV2(
                 sources=sources,
                 targets=targets,

trilogy/parsing/trilogy.lark

@@ -379,7 +379,7 @@
 
     int_lit:  /\-?[0-9]+/
     
-    float_lit: /[0-9]*\.[0-9]+/
+    float_lit: /\-?[0-9]*\.[0-9]+/
 
     array_lit: "[" (literal ",")* literal ","? "]"()
 

trilogy/std/date.preql

@@ -2,7 +2,9 @@
 
 type year int;
 type month int;
+type week int;
 type day int;
 type hour int;
 type minute int;
-type second int;
+type second int;
+type day_of_week int;

trilogy/std/geography.preql

@@ -15,3 +15,7 @@ type city string; # City name
 type country string; # Country name
 type timezone string; # Timezone name
 type region string; # Region name
+
+
+## special formats
+type geojson string; # GeoJSON format for geographic data

trilogy/std/money.preql

@@ -1,6 +1,67 @@
+# generic currency types
 
+# Major global currencies
+type usd numeric;  # US Dollar
+type eur numeric;  # Euro
+type gbp numeric;  # British Pound Sterling
+type jpy numeric;  # Japanese Yen
+type chf numeric;  # Swiss Franc
+type cad numeric;  # Canadian Dollar
+type aud numeric;  # Australian Dollar
+type nzd numeric;  # New Zealand Dollar
 
-# generic currency types
-type usd numeric;
-type eur numeric;
-type gbp numeric;
+# Asian currencies
+type cny numeric;  # Chinese Yuan
+type hkd numeric;  # Hong Kong Dollar
+type sgd numeric;  # Singapore Dollar
+type krw numeric;  # South Korean Won
+type inr numeric;  # Indian Rupee
+type thb numeric;  # Thai Baht
+type php numeric;  # Philippine Peso
+type myr numeric;  # Malaysian Ringgit
+type idr numeric;  # Indonesian Rupiah
+type vnd numeric;  # Vietnamese Dong
+
+# European currencies (non-Euro)
+type sek numeric;  # Swedish Krona
+type nok numeric;  # Norwegian Krone
+type dkk numeric;  # Danish Krone
+type pln numeric;  # Polish Zloty
+type czk numeric;  # Czech Koruna
+type huf numeric;  # Hungarian Forint
+type ron numeric;  # Romanian Leu
+type bgn numeric;  # Bulgarian Lev
+type rub numeric;  # Russian Ruble
+
+# Middle Eastern currencies
+type aed numeric;  # UAE Dirham
+type sar numeric;  # Saudi Riyal
+type qar numeric;  # Qatari Riyal
+type kwd numeric;  # Kuwaiti Dinar
+type bhd numeric;  # Bahraini Dinar
+type omr numeric;  # Omani Rial
+type jod numeric;  # Jordanian Dinar
+type ils numeric;  # Israeli Shekel
+type try numeric;  # Turkish Lira
+
+# African currencies
+type zar numeric;  # South African Rand
+type egp numeric;  # Egyptian Pound
+type ngn numeric;  # Nigerian Naira
+type mad numeric;  # Moroccan Dirham
+type kes numeric;  # Kenyan Shilling
+type ghs numeric;  # Ghanaian Cedi
+
+# Latin American currencies
+type mxn numeric;  # Mexican Peso
+type brl numeric;  # Brazilian Real
+type ars numeric;  # Argentine Peso
+type cop numeric;  # Colombian Peso
+type pen numeric;  # Peruvian Sol
+type clp numeric;  # Chilean Peso
+type uyu numeric;  # Uruguayan Peso
+
+# Other notable currencies
+type isk numeric;  # Icelandic Krona
+type xof numeric;  # West African CFA Franc
+type xaf numeric;  # Central African CFA Franc

trilogy/std/net.preql

@@ -0,0 +1,8 @@
+
+
+type url string;
+type domain string;
+type ip_net_mask string;
+type ipv6_address string;
+type ipv4_address string;
+type suffix string;