fix: move std types into std.types module, disambiguate text and date types (#6155)

Author: kgutwin

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 **Language**:
 
+- Move all standard types into a dedicated `std.types` submodule in order to
+  disambiguate between `type text` - `module text` and `type date` -
+  `module date`. (@kgutwin, #6155)
+
 **Features**:
 
 - Add simple enumeration type, and dedicated support for name resolution when an

prqlc/prqlc/src/semantic/module.rs

@@ -35,6 +35,7 @@ impl Module {
                 Ident::from_name(NS_THIS),
                 Ident::from_name(NS_THAT),
                 Ident::from_name(NS_PARAM),
+                Ident::from_path(vec![NS_STD, "types"]),
                 Ident::from_name(NS_STD),
             ],
         }

prqlc/prqlc/src/semantic/resolver/stmt.rs

@@ -170,7 +170,7 @@ impl super::Resolver<'_> {
 
         if def.name == "main" {
             def.ty = Some(Ty::new(TyKind::Ident(Ident::from_path(vec![
-                "std", "relation",
+                "std", "types", "relation",
             ]))));
         }
 

prqlc/prqlc/src/semantic/std.prql

@@ -37,27 +37,29 @@ let not = expr<bool> -> <bool> internal std.not
 
 # Types
 
-## Type primitives
-type int = int
-type float = float
-type bool = bool
-type text = text
-type date = date
-type time = time
-type timestamp = timestamp
-type `func` = func
-
-## Generic array
-type array = []
-
-## Generic relation
-type relation = [{..}]
-
-## Range
-type range = {start = *, end = *}
-
-## Transform
-type transform = func relation -> relation
+module types {
+  ## Type primitives
+  type int = int
+  type float = float
+  type bool = bool
+  type text = text
+  type date = date
+  type time = time
+  type timestamp = timestamp
+  type `func` = func
+
+  ## Generic array
+  type array = []
+
+  ## Generic relation
+  type relation = [{..}]
+
+  ## Range
+  type range = {start = *, end = *}
+
+  ## Transform
+  type transform = func relation -> relation
+}
 
 # Functions
 

prqlc/prqlc/tests/integration/error_messages.rs

@@ -195,7 +195,7 @@ fn test_ambiguous() {
        │            ──┬─
        │              ╰─── Ambiguous name
        │
-       │ Help: could be any of: std.date, this.date
+       │ Help: could be any of: std.date, std.types.date, this.date
        │
        │ Note: available columns: date
     ───╯

prqlc/prqlc/tests/integration/snapshots/integration__queries__debug_lineage__set_ops_remove.snap

@@ -184,7 +184,7 @@ nodes:
   span: [std]
   children:
   - 59
-  - 4000000155
+  - 4000000156
   parent: 69
 - id: 67
   kind: Ident
@@ -224,14 +224,14 @@ nodes:
   children:
   - 69
   - 70
-- id: 4000000155
+- id: 4000000156
   kind: RqOperator
   span: [std]
   targets:
   - 62
-  - 4000000157
+  - 4000000158
   parent: 66
-- id: 4000000157
+- id: 4000000158
   kind: Literal
   span: [std]
 ast: