Asset per file scheme, stage 2 by Imberflur · Pull Request #70 · Cakefish/bauble

Imberflur · 2026-05-04T16:25:21Z

This follows up from #69

Main changes

A special 0 identifier is introduced for top level objects so their name does not need to be repeated from the file name.
Files now require a top level object unless they are empty.
Local objects can no longer be referenced outside of the current file.
Local objects no longer registered into BaubleContext (similarly to inline objects). E.g. BaubleContext::assets now only lists top level objects.
Object paths now use a use the ObjectPath enum instead of being plain TypePaths. The enum has 3 variants: Top, Local, and Inline. Uses of a top_level bool were replaced with this.

Other changes

Resolved various edge cases around registration ordering of assets referencing each other.
Added tests for these edge cases.
Fix case where explicit type on binding can be ignored for objects that are a referenced asset that is already registered.
path::*::ident now produces an error when multiple items could be referenced by it instead of selecting one of those items

…the identifier

currently fails)

…added in previous commits), also minimize places using `Symbols`

… statement conflicts with an asset identifiers in the current file

…should_panic test for explicit ref type being wrong when referencing something from another file that is already registered

This pass pre-registers asset/module paths, so we can properly resolve the full path of reference to asset which has yet to be processed in the next pass (where types of assets are resolved). The full path needs to be resolved so that delayed resolution of types can happen without the Symbols structure being available. This would be difficult since the delayed resolution handles assets across multiple files. Part of this change is duplicating structures from `BaubleContext` so we can represent the pending asset/module paths but without requiring that assets have a known type. This is done in the new `early_context` module.

…iguous item

…re specific when referenced asset fails to be registerer, and test that local assets will be suggsted in errors

…distinguishing local objects.

local objects from BaubleContext, and prevent them from being referenced outside the current file. ObjectPath uses enum variants to distinguish top-level, local, and inline objects. Objects of different kinds can now have the same path without colliding.

…t is now required

Imberflur

Here are notes for reviewers, and a few cleanup tasks for myself.

Imberflur · 2026-05-04T16:28:20Z

+                        emitter.emit(Rich::custom(
+                            ident.span,
+                            format!(
+                                "The first item must have '{}' as the identifier",


We now required the first object to be a top level object and subsequent objects must not use the special identifier.

Imberflur · 2026-05-04T19:50:09Z

        }
    }

+    if path.is_empty() {


moved all the code down past the inner function definitions so it is easier to follow

Imberflur · 2026-05-05T17:14:08Z

-    /// `ident`, the refs from these will be combined (potentially overriding each other).
-    //
-    // TODO: couldn't this overriding lead to unexpected behavior? Should we return an error when
-    // there are multiple results in the same namespace?


TODO resolved by producing an error on ambiguity

Imberflur · 2026-05-05T17:15:54Z

+///
+/// Contains registery of local objects. These are objects that are only referencable by other
+/// objects in the same file.
+pub(crate) struct LocalContext {


Local objects are now registered in this ephemeral context type instead of BaubleContext. It only exists during the loading process.

This ended up being a super simple type!

Imberflur · 2026-05-05T17:17:00Z

+///
+/// Path format documented in [`TypePath`].
+#[derive(Copy, Clone, Debug)]
+pub enum ObjectPath<S = String> {


New ObjectPath enum, I hope the docs are sufficient explanation.

It might be helpful to have examples of what the contents of each variant might look like.

Added a set of examples

Imberflur · 2026-05-05T17:17:49Z

-    /// The inner representation of a type path created by this allocator.
-    type TypePathInner: 'static;
+    /// The inner representation of an object path created by this allocator.
+    type PathInner: 'static;


renamed for clarity

Imberflur · 2026-05-05T17:18:48Z

    let a = &test_file!(
        "a",
-        r#"test = integration::Test { x: -5, y: 5 }"#,
+        r#"0 = integration::Test { x: -5, y: 5 }"#,


all the tests needed updating for the new syntax

MavethGH · 2026-05-06T15:37:37Z

Testing whether I can comment without it being on a specific line.

…h enum distinguishing objects kinds

Imberflur added 21 commits March 9, 2026 12:22

Require first asset in all files to be a top level asset with '0' as …

75e8b6e

…the identifier

Update tests

4fe5697

more comments in code

16218c7

Test that generic types that are referenced are resolved properly (this

e3e91d1

currently fails)

Another reference pattern where type resolution doesn't work

9059ef2

Fix a couple issues with resolve_path usage and generic types (tests …

4519d34

…added in previous commits), also minimize places using `Symbols`

Add LocalContext type (not used yet)

bea87f5

Simplify Symbols usage in convert_values and produce error when a use…

de0cbf4

… statement conflicts with an asset identifiers in the current file

Clarify note on delaying type resolution for references

13dbbfa

More notes on reference type resolution

bb22e44

Fix should_panic test that had the wrong panic and add a new failing …

98c5d97

…should_panic test for explicit ref type being wrong when referencing something from another file that is already registered

Fix case where explicit type could be ignored for reference values

479e7b3

Make Symbols::get_module and Symbols::resolve_item private

1f8d55e

Produce an error when the indirect with ident syntax refers to an amb…

8382f9f

…iguous item

Report error earlier when we know asset will not exist, make error mo…

b45d078

…re specific when referenced asset fails to be registerer, and test that local assets will be suggsted in errors

Refactor Symbols path resolution to delay uses lookup to prepare for …

c8169c6

…distinguishing local objects.

Small fix (otherwise, 'static is required for key)

6cccd0e

More useful ObjectPath methods

8ee3a0b

Add dummy top level object to validation file since a top level objec…

71276db

…t is now required

Imberflur commented May 5, 2026

View reviewed changes

hazelwiss assigned MavethGH May 5, 2026

MavethGH approved these changes May 6, 2026

View reviewed changes

Imberflur added 4 commits May 8, 2026 12:48

Remove is_subobject, we no longer need this method with the ObjectPat…

ddd9000

…h enum distinguishing objects kinds

Add examples of contents of ObjectPath variants

11af202

Typos and comment cleanup

a61e4a9

Rename Symbols::add_local_object to more accurate name

a23b1c4

Imberflur merged commit 967a486 into main May 8, 2026
1 check passed

Imberflur deleted the asset-per-file-stage-2 branch May 15, 2026 17:03

Uh oh!

Conversation

Imberflur commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Main changes

Other changes

Uh oh!

Imberflur left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MavethGH commented May 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Imberflur commented May 4, 2026 •

edited

Loading