Add exact argument to array.zip

crates/typst/src/foundations/array.rs

@@ -7,6 +7,7 @@ use comemo::Tracked;
 use ecow::{eco_format, EcoString, EcoVec};
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
+use typst_syntax::Spanned;
 
 use crate::diag::{bail, At, SourceResult, StrResult};
 use crate::engine::Engine;
@@ -485,11 +486,17 @@ impl Array {
  /// The real arguments (the other arguments are just for the docs, this
  /// function is a bit involved, so we parse the arguments manually).
  args: &mut Args,
+ #[external]
+ #[named]
+ #[default(false)]
+ exact: bool,
  /// The arrays to zip with.
  #[external]
  #[variadic]
  others: Vec<Array>,
  ) -> SourceResult<Array> {
+ let exact: bool = args.named("exact")?.unwrap_or_default();
+
  let remaining = args.remaining();
 
  // Fast path for one array.
@@ -499,7 +506,16 @@ impl Array {
 
  // Fast path for just two arrays.
  if remaining == 1 {
- let other = args.expect::<Array>("others")?;
+ let Spanned { v: other, span: other_span } =
+ args.expect::<Spanned<Array>>("others")?;
+ if exact && self.len() != other.len() {
+ bail!(
+ other_span,
+ "Second argument has different length ({}) from first argument ({})",
+ other.len(),
+ self.len()
+ );
+ }
  return Ok(self
  .into_iter()
  .zip(other)
@@ -509,11 +525,20 @@ impl Array {
 
  // If there is more than one array, we use the manual method.
  let mut out = Self::with_capacity(self.len());
- let mut iterators = args
- .all::<Array>()?
- .into_iter()
- .map(|i| i.into_iter())
- .collect::<Vec<_>>();
+ let arrays = args.all::<Spanned<Array>>()?;
+ if let Some(Spanned { v, span }) =
+ arrays.iter().find(|sp| sp.v.len() != self.len())
+ {
+ bail!(
+ *span,
+ "Argument has different length ({}) from first argument ({})",
+ v.len(),
+ self.len()
+ );
+ }
+
+ let mut iterators =
+ arrays.into_iter().map(|i| i.v.into_iter()).collect::<Vec<_>>();
 
  for this in self {
  let mut row = Self::with_capacity(1 + iterators.len());