fix(dojo-lang): add a default namespace to ensure language server sup…

…port (#2472) fix: add a default namespace to ensure language server support
dojoengine · Sep 24, 2024 · 87ad4ab · 87ad4ab
1 parent 78250fa
commit 87ad4ab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
@@ -11,11 +11,3 @@ dependencies = [
 [[package]]
 name = "dojo"
 version = "1.0.0-alpha.4"
-dependencies = [
- "dojo_plugin",
-]
-
-[[package]]
-name = "dojo_plugin"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
diff --git a/crates/dojo-world/src/config/namespace_config.rs b/crates/dojo-world/src/config/namespace_config.rs
@@ -8,14 +8,21 @@ use serde::Deserialize;
 pub const NAMESPACE_CFG_PREFIX: &str = "nm|";
 pub const DEFAULT_NAMESPACE_CFG_KEY: &str = "namespace_default";
 pub const DOJO_MANIFESTS_DIR_CFG_KEY: &str = "dojo_manifests_dir";
+pub const DEFAULT_NAMESPACE: &str = "DEFAULT_NAMESPACE";
 
 /// Namespace configuration.
-#[derive(Debug, Clone, Default, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct NamespaceConfig {
     pub default: String,
     pub mappings: Option<HashMap<String, String>>,
 }
 
+impl Default for NamespaceConfig {
+    fn default() -> Self {
+        NamespaceConfig { default: DEFAULT_NAMESPACE.to_string(), mappings: None }
+    }
+}
+
 impl NamespaceConfig {
     /// Creates a new namespace configuration with a default namespace.
     pub fn new(default: &str) -> Self {

diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock
@@ -4,14 +4,6 @@ version = 1
 [[package]]
 name = "dojo"
 version = "1.0.0-alpha.4"
-dependencies = [
- "dojo_plugin",
-]
-
-[[package]]
-name = "dojo_plugin"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
 
 [[package]]
 name = "types_test"

diff --git a/spawn-and-move-db.tar.gz b/spawn-and-move-db.tar.gz
diff --git a/types-test-db.tar.gz b/types-test-db.tar.gz