feat(psl): moved psl-builtin-connectors within psl-core (#4630)

psl/psl-core/Cargo.toml

@@ -19,6 +19,7 @@ serde.workspace = true
 serde_json.workspace = true
 enumflags2 = "0.7"
 indoc.workspace = true
+either = "1.8.1"
 
 # For the connector API.
 lsp-types = "0.91.1"

psl/builtin-connectors/src/cockroach_datamodel_connector.rs → psl/psl-core/src/builtin_connectors/cockroach_datamodel_connector.rs

@@ -3,10 +3,7 @@ mod validations;
 
 pub use native_types::CockroachType;
 
-use chrono::*;
-use enumflags2::BitFlags;
-use lsp_types::{CompletionItem, CompletionItemKind, CompletionList};
-use psl_core::{
+use crate::{
     datamodel_connector::{
         Connector, ConnectorCapabilities, ConnectorCapability, ConstraintScope, Flavour, NativeTypeConstructor,
         NativeTypeInstance, RelationMode, StringFilter,
@@ -21,9 +18,12 @@ use psl_core::{
     },
     PreviewFeature,
 };
+use chrono::*;
+use enumflags2::BitFlags;
+use lsp_types::{CompletionItem, CompletionItemKind, CompletionList};
 use std::borrow::Cow;
 
-use crate::completions;
+use super::completions;
 
 const CONSTRAINT_SCOPES: &[ConstraintScope] = &[ConstraintScope::ModelPrimaryKeyKeyIndexForeignKey];
 
@@ -294,7 +294,7 @@ impl Connector for CockroachDatamodelConnector {
         }
     }
 
-    fn datasource_completions(&self, config: &psl_core::Configuration, completion_list: &mut CompletionList) {
+    fn datasource_completions(&self, config: &crate::Configuration, completion_list: &mut CompletionList) {
         let ds = match config.datasources.first() {
             Some(ds) => ds,
             None => return,
@@ -318,11 +318,11 @@ impl Connector for CockroachDatamodelConnector {
 
         match native_type {
             Some(ct) => match ct {
-                CockroachType::Timestamptz(_) => crate::utils::parse_timestamptz(str),
-                CockroachType::Timestamp(_) => crate::utils::parse_timestamp(str),
-                CockroachType::Date => crate::utils::parse_date(str),
-                CockroachType::Time(_) => crate::utils::parse_time(str),
-                CockroachType::Timetz(_) => crate::utils::parse_timetz(str),
+                CockroachType::Timestamptz(_) => super::utils::parse_timestamptz(str),
+                CockroachType::Timestamp(_) => super::utils::parse_timestamp(str),
+                CockroachType::Date => super::utils::parse_date(str),
+                CockroachType::Time(_) => super::utils::parse_time(str),
+                CockroachType::Timetz(_) => super::utils::parse_timetz(str),
                 _ => unreachable!(),
             },
             None => self.parse_json_datetime(

psl/builtin-connectors/src/cockroach_datamodel_connector/validations.rs → psl/psl-core/src/builtin_connectors/cockroach_datamodel_connector/validations.rs

@@ -1,4 +1,4 @@
-use psl_core::{
+use crate::{
     diagnostics::{DatamodelError, Diagnostics},
     parser_database::{
         walkers::{IndexWalker, ModelWalker},

psl/builtin-connectors/src/completions.rs → psl/psl-core/src/builtin_connectors/completions.rs

@@ -1,7 +1,7 @@
+use crate::datamodel_connector::format_completion_docs;
 use lsp_types::{
     CompletionItem, CompletionItemKind, CompletionList, Documentation, InsertTextFormat, MarkupContent, MarkupKind,
 };
-use psl_core::datamodel_connector::format_completion_docs;
 
 pub(crate) fn extensions_completion(completion_list: &mut CompletionList) {
     completion_list.items.push(CompletionItem {

psl/builtin-connectors/src/lib.rs → psl/psl-core/src/builtin_connectors/mod.rs

@@ -1,6 +1,3 @@
-#![deny(rust_2018_idioms, unsafe_code)]
-#![allow(clippy::derive_partial_eq_without_eq)]
-
 pub mod cockroach_datamodel_connector;
 pub mod completions;
 
@@ -18,7 +15,7 @@ mod postgres_datamodel_connector;
 mod sqlite_datamodel_connector;
 mod utils;
 
-use psl_core::{datamodel_connector::Connector, ConnectorRegistry};
+use crate::{datamodel_connector::Connector, ConnectorRegistry};
 
 pub const POSTGRES: &'static dyn Connector = &postgres_datamodel_connector::PostgresDatamodelConnector;
 pub const COCKROACH: &'static dyn Connector = &cockroach_datamodel_connector::CockroachDatamodelConnector;

psl/builtin-connectors/src/mongodb.rs → psl/psl-core/src/builtin_connectors/mongodb.rs

@@ -3,16 +3,16 @@ mod validations;
 
 pub use mongodb_types::MongoDbType;
 
-use enumflags2::BitFlags;
-use mongodb_types::*;
-use psl_core::{
+use crate::{
     datamodel_connector::{
         Connector, ConnectorCapabilities, ConnectorCapability, ConstraintScope, Flavour, NativeTypeConstructor,
         NativeTypeInstance, RelationMode,
     },
     diagnostics::{Diagnostics, Span},
     parser_database::{walkers::*, ReferentialAction, ScalarType},
 };
+use enumflags2::BitFlags;
+use mongodb_types::*;
 use std::result::Result as StdResult;
 
 const CAPABILITIES: ConnectorCapabilities = enumflags2::make_bitflags!(ConnectorCapability::{
@@ -82,7 +82,7 @@ impl Connector for MongoDbDatamodelConnector {
 
     fn validate_relation_field(
         &self,
-        field: psl_core::parser_database::walkers::RelationFieldWalker<'_>,
+        field: crate::parser_database::walkers::RelationFieldWalker<'_>,
         errors: &mut Diagnostics,
     ) {
         validations::relation_same_native_type(field, errors);

psl/builtin-connectors/src/mongodb/mongodb_types.rs → psl/psl-core/src/builtin_connectors/mongodb/mongodb_types.rs

@@ -1,5 +1,5 @@
+use crate::parser_database::ScalarType;
 use once_cell::sync::Lazy;
-use psl_core::parser_database::ScalarType;
 use std::collections::HashMap;
 
 crate::native_type_definition! {

psl/builtin-connectors/src/mongodb/validations.rs → psl/psl-core/src/builtin_connectors/mongodb/validations.rs

@@ -1,4 +1,4 @@
-use psl_core::{
+use crate::{
     diagnostics::{DatamodelError, DatamodelWarning, Diagnostics},
     parser_database::{
         ast::{WithName, WithSpan},
@@ -214,7 +214,7 @@ pub(crate) fn field_name_uses_valid_characters(field: ScalarFieldWalker<'_>, err
 
 /// Makes sure underlying fields of a relation have the same native types.
 pub(crate) fn relation_same_native_type(
-    field: psl_core::parser_database::walkers::RelationFieldWalker<'_>,
+    field: crate::parser_database::walkers::RelationFieldWalker<'_>,
     errors: &mut Diagnostics,
 ) {
     let references = field.referenced_fields();

psl/builtin-connectors/src/mssql_datamodel_connector.rs → psl/psl-core/src/builtin_connectors/mssql_datamodel_connector.rs

@@ -3,9 +3,7 @@ mod validations;
 
 pub use native_types::{MsSqlType, MsSqlTypeParameter};
 
-use enumflags2::BitFlags;
-use lsp_types::{CompletionItem, CompletionItemKind, CompletionList};
-use psl_core::{
+use crate::{
     datamodel_connector::{
         Connector, ConnectorCapabilities, ConnectorCapability, ConstraintScope, Flavour, NativeTypeConstructor,
         NativeTypeInstance, RelationMode,
@@ -14,11 +12,13 @@ use psl_core::{
     parser_database::{self, ast, ParserDatabase, ReferentialAction, ScalarType},
     PreviewFeature,
 };
+use enumflags2::BitFlags;
+use lsp_types::{CompletionItem, CompletionItemKind, CompletionList};
 
 use MsSqlType::*;
 use MsSqlTypeParameter::*;
 
-use crate::completions;
+use super::completions;
 
 const CONSTRAINT_SCOPES: &[ConstraintScope] = &[
     ConstraintScope::GlobalPrimaryKeyForeignKeyDefault,
@@ -269,7 +269,7 @@ impl Connector for MsSqlDatamodelConnector {
         }
     }
 
-    fn datasource_completions(&self, config: &psl_core::Configuration, completion_list: &mut CompletionList) {
+    fn datasource_completions(&self, config: &crate::Configuration, completion_list: &mut CompletionList) {
         let ds = match config.datasources.first() {
             Some(ds) => ds,
             None => return,

psl/builtin-connectors/src/mssql_datamodel_connector/native_types.rs → psl/psl-core/src/builtin_connectors/mssql_datamodel_connector/native_types.rs

@@ -6,7 +6,7 @@ pub enum MsSqlTypeParameter {
     Max,
 }
 
-impl psl_core::datamodel_connector::NativeTypeArguments for MsSqlTypeParameter {
+impl crate::datamodel_connector::NativeTypeArguments for MsSqlTypeParameter {
     const DESCRIPTION: &'static str = "an integer or `Max`";
     const OPTIONAL_ARGUMENTS_COUNT: usize = 0;
     const REQUIRED_ARGUMENTS_COUNT: usize = 1;

psl/builtin-connectors/src/mssql_datamodel_connector/validations.rs → psl/psl-core/src/builtin_connectors/mssql_datamodel_connector/validations.rs

@@ -1,5 +1,5 @@
 use super::MsSqlType;
-use psl_core::{
+use crate::{
     datamodel_connector::{walker_ext_traits::ScalarFieldWalkerExt, Connector},
     diagnostics::{DatamodelError, Diagnostics},
     parser_database::{

psl/builtin-connectors/src/mysql_datamodel_connector.rs → psl/psl-core/src/builtin_connectors/mysql_datamodel_connector.rs

@@ -3,10 +3,8 @@ mod validations;
 
 pub use native_types::MySqlType;
 
-use crate::completions;
-use enumflags2::BitFlags;
-use lsp_types::CompletionList;
-use psl_core::{
+use super::completions;
+use crate::{
     datamodel_connector::{
         Connector, ConnectorCapabilities, ConnectorCapability, ConstraintScope, Flavour, NativeTypeConstructor,
         NativeTypeInstance, RelationMode,
@@ -15,6 +13,8 @@ use psl_core::{
     parser_database::{walkers, ReferentialAction, ScalarType},
     PreviewFeature,
 };
+use enumflags2::BitFlags;
+use lsp_types::CompletionList;
 use MySqlType::*;
 
 const TINY_BLOB_TYPE_NAME: &str = "TinyBlob";
@@ -270,7 +270,7 @@ impl Connector for MySqlDatamodelConnector {
         Ok(())
     }
 
-    fn datasource_completions(&self, config: &psl_core::Configuration, completion_list: &mut CompletionList) {
+    fn datasource_completions(&self, config: &crate::Configuration, completion_list: &mut CompletionList) {
         let ds = match config.datasources.first() {
             Some(ds) => ds,
             None => return,

psl/builtin-connectors/src/mysql_datamodel_connector/validations.rs → psl/psl-core/src/builtin_connectors/mysql_datamodel_connector/validations.rs

@@ -1,12 +1,14 @@
-use indoc::formatdoc;
-use psl_core::diagnostics::{DatamodelWarning, Span};
-use psl_core::parser_database::ast::WithSpan;
-use psl_core::parser_database::ReferentialAction;
-use psl_core::{
+use crate::{
     datamodel_connector::{walker_ext_traits::ScalarFieldWalkerExt, Connector},
     diagnostics::Diagnostics,
-    parser_database::walkers::{IndexWalker, PrimaryKeyWalker, RelationFieldWalker},
+    diagnostics::{DatamodelWarning, Span},
+    parser_database::{
+        ast::WithSpan,
+        walkers::{IndexWalker, PrimaryKeyWalker, RelationFieldWalker},
+        ReferentialAction,
+    },
 };
+use indoc::formatdoc;
 
 const LENGTH_GUIDE: &str = " Please use the `length` argument to the field in the index definition to allow this.";
 

psl/builtin-connectors/src/native_type_definition.rs → psl/psl-core/src/builtin_connectors/native_type_definition.rs

@@ -52,8 +52,8 @@ macro_rules! native_type_definition {
             pub fn from_parts(
                 name: &str,
                 arguments: &[String],
-                span: psl_core::parser_database::ast::Span,
-                diagnostics: &mut psl_core::diagnostics::Diagnostics
+                span: $crate::parser_database::ast::Span,
+                diagnostics: &mut $crate::diagnostics::Diagnostics
             ) -> Option<Self> {
                 use $enumName::*;
 
@@ -130,7 +130,7 @@ macro_rules! native_type_definition {
             $self,
             {
                 $($body)*
-                $variant(arg) => (stringify!($variant), <$param as psl_core::datamodel_connector::NativeTypeArguments>::to_parts(arg)),
+                $variant(arg) => (stringify!($variant), <$param as $crate::datamodel_connector::NativeTypeArguments>::to_parts(arg)),
             }
             $($tail)*
         }
@@ -163,7 +163,7 @@ macro_rules! native_type_definition {
         match $name {
             $($body)*
             _ => {
-                $diagnostics.push_error(psl_core::diagnostics::DatamodelError::new_native_type_parser_error($name, $span));
+                $diagnostics.push_error($crate::diagnostics::DatamodelError::new_native_type_parser_error($name, $span));
                 None
             },
         }
@@ -182,12 +182,12 @@ macro_rules! native_type_definition {
             {
                 $($body)*
                 name if name == stringify!($variant) => {
-                    let args  = <$params as psl_core::datamodel_connector::NativeTypeArguments>::from_parts($arguments);
+                    let args  = <$params as $crate::datamodel_connector::NativeTypeArguments>::from_parts($arguments);
                     match args {
                         Some(args) => Some($variant(args)),
                         None => {
                             let rendered_args = format!("({})", $arguments.join(", "));
-                            $diagnostics.push_error(psl_core::diagnostics::DatamodelError::new_value_parser_error(<$params as psl_core::datamodel_connector::NativeTypeArguments>::DESCRIPTION, &rendered_args, $span));
+                            $diagnostics.push_error($crate::diagnostics::DatamodelError::new_value_parser_error(<$params as $crate::datamodel_connector::NativeTypeArguments>::DESCRIPTION, &rendered_args, $span));
                             None
                         }
                     }
@@ -221,7 +221,7 @@ macro_rules! native_type_definition {
         { $($body:tt)* }
     ) => {
         #[allow(unused_imports)]
-        use psl_core::datamodel_connector::NativeTypeConstructor;
+        use $crate::datamodel_connector::NativeTypeConstructor;
 
         pub(crate) const CONSTRUCTORS: &[NativeTypeConstructor] = &[
             $( $body )*
@@ -242,7 +242,7 @@ macro_rules! native_type_definition {
                     name: stringify!($variant),
                     number_of_args: 0,
                     number_of_optional_args: 0,
-                    prisma_types: &[$(psl_core::parser_database::ScalarType::$scalar),*],
+                    prisma_types: &[$($crate::parser_database::ScalarType::$scalar),*],
                 },
             }
             $($tail)*
@@ -261,9 +261,9 @@ macro_rules! native_type_definition {
                 $($body)*
                 NativeTypeConstructor {
                     name: stringify!($variant),
-                    number_of_args: <$params as psl_core::datamodel_connector::NativeTypeArguments>::REQUIRED_ARGUMENTS_COUNT,
-                    number_of_optional_args: <$params as psl_core::datamodel_connector::NativeTypeArguments>::OPTIONAL_ARGUMENTS_COUNT,
-                    prisma_types: &[$(psl_core::parser_database::ScalarType::$scalar),*],
+                    number_of_args: <$params as $crate::datamodel_connector::NativeTypeArguments>::REQUIRED_ARGUMENTS_COUNT,
+                    number_of_optional_args: <$params as $crate::datamodel_connector::NativeTypeArguments>::OPTIONAL_ARGUMENTS_COUNT,
+                    prisma_types: &[$($crate::parser_database::ScalarType::$scalar),*],
                 },
             }
             $($tail)*