[release/v1.7.0]: Revert "Add macro bindings for views (#3429)"

This reverts commit 0d325b2.

Author: bfops

crates/bindings-macro/src/lib.rs

@@ -12,7 +12,6 @@ mod reducer;
 mod sats;
 mod table;
 mod util;
-mod view;
 
 use proc_macro::TokenStream as StdTokenStream;
 use proc_macro2::TokenStream;
@@ -113,14 +112,6 @@ pub fn reducer(args: StdTokenStream, item: StdTokenStream) -> StdTokenStream {
     })
 }
 
-#[proc_macro_attribute]
-pub fn view(args: StdTokenStream, item: StdTokenStream) -> StdTokenStream {
-    cvt_attr::<ItemFn>(args, item, quote!(), |args, original_function| {
-        let args = view::ViewArgs::parse(args)?;
-        view::view_impl(args, original_function)
-    })
-}
-
 /// It turns out to be shockingly difficult to construct an [`Attribute`].
 /// That type is not [`Parse`], instead having two distinct methods
 /// for parsing "inner" vs "outer" attributes.

crates/bindings-macro/src/reducer.rs

@@ -139,12 +139,11 @@ pub(crate) fn reducer_impl(args: ReducerArgs, original_function: &ItemFn) -> syn
             }
         }
         #[automatically_derived]
-        impl spacetimedb::rt::FnInfo for #func_name {
-            type Invoke = spacetimedb::rt::ReducerFn;
+        impl spacetimedb::rt::ReducerInfo for #func_name {
             const NAME: &'static str = #reducer_name;
             #(const LIFECYCLE: Option<spacetimedb::rt::LifecycleReducer> = Some(#lifecycle);)*
             const ARG_NAMES: &'static [Option<&'static str>] = &[#(#opt_arg_names),*];
-            const INVOKE: Self::Invoke = #func_name::invoke;
+            const INVOKE: spacetimedb::rt::ReducerFn = #func_name::invoke;
         }
     })
 }

crates/bindings-macro/src/table.rs

@@ -821,7 +821,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             let reducer = &sched.reducer;
             let scheduled_at_id = scheduled_at_column.index;
             let desc = quote!(spacetimedb::table::ScheduleDesc {
-                reducer_name: <#reducer as spacetimedb::rt::FnInfo>::NAME,
+                reducer_name: <#reducer as spacetimedb::rt::ReducerInfo>::NAME,
                 scheduled_at_column: #scheduled_at_id,
             });
 

crates/bindings-macro/src/view.rs

@@ -666,133 +666,6 @@ pub use spacetimedb_bindings_macro::table;
 #[doc(inline)]
 pub use spacetimedb_bindings_macro::reducer;
 
-/// Marks a function as a spacetimedb view.
-///
-/// A view is a function with read-only access to the database.
-///
-/// The first argument of a view is always a [`&ViewContext`] or [`&AnonymousViewContext`].
-/// The former can only read from the database whereas latter can also access info about the caller.
-///
-/// After this, a view can take any number of arguments just like reducers.
-/// These arguments must implement the [`SpacetimeType`], [`Serialize`], and [`Deserialize`] traits.
-/// All of these traits can be derived at once by marking a type with `#[derive(SpacetimeType)]`.
-///
-/// Views return `Vec<T>` or `Option<T>` where `T` is a `SpacetimeType`.
-///
-/// ```no_run
-/// # mod demo {
-/// use spacetimedb::{view, table, AnonymousViewContext, SpacetimeType, ViewContext};
-/// use spacetimedb_lib::Identity;
-///
-/// #[table(name = player)]
-/// struct Player {
-///     #[auto_inc]
-///     #[primary_key]
-///     id: u64,
-///
-///     #[unique]
-///     identity: Identity,
-///
-///     #[index(btree)]
-///     level: u32,
-/// }
-///
-/// impl Player {
-///     fn merge(self, location: Location) -> PlayerAndLocation {
-///         PlayerAndLocation {
-///             player_id: self.id,
-///             level: self.level,
-///             x: location.x,
-///             y: location.y,
-///         }
-///     }
-/// }
-///
-/// #[derive(SpacetimeType)]
-/// struct PlayerId {
-///     id: u64,
-/// }
-///
-/// #[table(name = location, index(name = coordinates, btree(columns = [x, y])))]
-/// struct Location {
-///     #[unique]
-///     player_id: u64,
-///     x: u64,
-///     y: u64,
-/// }
-///
-/// #[derive(SpacetimeType)]
-/// struct PlayerAndLocation {
-///     player_id: u64,
-///     level: u32,
-///     x: u64,
-///     y: u64,
-/// }
-///
-/// // A view that selects at most one row from a table
-/// #[view(public)]
-/// fn my_player(ctx: &ViewContext) -> Option<Player> {
-///     ctx.db.player().identity().find(ctx.sender)
-/// }
-///
-/// // An example of column projection
-/// #[view(public)]
-/// fn my_player_id(ctx: &ViewContext) -> Option<PlayerId> {
-///     ctx.db.player().identity().find(ctx.sender).map(|Player { id, .. }| PlayerId { id })
-/// }
-///
-/// // An example of a parameterized view
-/// #[view(public)]
-/// fn players_at_level(ctx: &AnonymousViewContext, level: u32) -> Vec<Player> {
-///     ctx.db.player().level().filter(level).collect()
-/// }
-///
-/// // An example that is analogous to a semijoin in sql
-/// #[view(public)]
-/// fn players_at_coordinates(ctx: &AnonymousViewContext, x: u64, y: u64) -> Vec<Player> {
-///     ctx
-///         .db
-///         .location()
-///         .coordinates()
-///         .filter((x, y))
-///         .filter_map(|location| ctx.db.player().id().find(location.player_id))
-///         .collect()
-/// }
-///
-/// // An example of a join that combines fields from two different tables
-/// #[view(public)]
-/// fn players_with_coordinates(ctx: &AnonymousViewContext, x: u64, y: u64) -> Vec<PlayerAndLocation> {
-///     ctx
-///         .db
-///         .location()
-///         .coordinates()
-///         .filter((x, y))
-///         .filter_map(|location| ctx
-///             .db
-///             .player()
-///             .id()
-///             .find(location.player_id)
-///             .map(|player| player.merge(location))
-///         )
-///         .collect()
-/// }
-/// # }
-/// ```
-///
-/// Just like reducers, views are limited in their ability to interact with the outside world.
-/// They have no access to any network or filesystem interfaces.
-/// Calling methods from [`std::io`], [`std::net`], or [`std::fs`] will result in runtime errors.
-///
-/// Views are callable by reducers and other views simply by passing their `ViewContext`..
-/// This is a regular function call.
-/// The callee will run within the caller's transaction.
-///
-///
-/// [`&ViewContext`]: `ViewContext`
-/// [`&AnonymousViewContext`]: `AnonymousViewContext`
-#[doc(inline)]
-pub use spacetimedb_bindings_macro::view;
-
 /// One of two possible types that can be passed as the first argument to a `#[view]`.
 /// The other is [`ViewContext`].
 /// Use this type if the view does not depend on the caller's identity.