multi-dataset aware test analysis + lotsa wrappers

.gitignore

@@ -3,3 +3,6 @@
 .RData
 .Ruserdata
 _processedLockFile.lock
+ModuleBundleBuildDir/
+bundles_out/
+results_multidataset.json

NAMESPACE

@@ -1,3 +1,4 @@
 exportPattern('^[[:alpha:]]+')
+  import('jaspBase');
   import('svglite');
   import('stringi');

NEWS.md

@@ -15,6 +15,34 @@
 ---
 
 # jaspTestModule (development version)
+## Added
+* "Test Multi-DataSet": analysis + form to exercise multi-dataset aware analyses
+  (`multiDataSetAware` Description entries, the VariablesForm dataset/filter selection,
+  the `datasets` handout and encoded-name routing of jaspBase, the readDataSet() guard,
+  the `.meta` dataSetId/filterId provenance and the non-aware counterpart as controls).
+  The aware analysis is wrapped (`hasWrapper: true`): body in `multiDataSetFuncInternal`,
+  generated `multiDataSetFunc(datasets = ...)` wrapper for R syntax use.
+* `Tools/buildBundle.R`: builds an installable `bundles_out/jaspTestModule.JASPModule`
+  from this checkout with the local `jasp-desktop/Engine/jaspBase` (or any checkout via
+  `JASP_BASE_DIR`) packed into the bundle; no JASP cellar needed.
+* `Tools/testMultiDataSet.R` (+ `_wrapper.R`): full headless test of the analysis over
+  engine-style queued slices, the wrapper in a clean session and a legacy non-aware run.
+* `Tools/testdata/DataSetA.csv` / `DataSetB.csv`: two datasets with deliberately colliding
+  column names for the per-dataset routing test.
+
+## Changed
+* `renv.lock` re-resolved for R 4.6.1 (current CRAN, jaspBase/jaspGraphs from GitHub HEAD).
+* `hasWrappers: true` for the module: every analysis body now lives in `<func>Internal`
+  and has a generated `R/<func>Wrapper.R` (via jaspSyntax/SyntaxInterface) exposing the
+  plain `<func>(data = ..., ...)` entry point for R syntax use - 38 of 43; the four
+  entries pointing at removed qml files (test.qml, TestPlotStatus.qml) can't generate
+  one, and filteredDataEntry crashes the syntax bridge headlessly (Filter without
+  DataSet assertion in CommonData/filter.cpp - a real bridge bug to fix).
+* The non-aware twin (`multiDataSetNonAware` func/qml/wrapper) is removed again (mds-plan
+  C4/M8): its generated wrapper carried a stale qml pointer so its R entry point always
+  errored, and every other analysis in this module already is a plain single-dataset one.
+  Legacy path 3 of Tools/testMultiDataSet.R now runs through `testEncodingFunc` (whose R body
+  really calls `.readDataSetToEnd`).
 
 
 

R/AnalysisUpgradeAWrapper.R

@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2013-2025 University of Amsterdam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This is a generated file. Don't change it!
+
+#' Analysis A
+#'
+#' @param stemAndLeaf, Create a Stem and leaf table.
+#'    Defaults to \code{FALSE}.
+#' @param stemAndLeafScale, The scale parameter controls how much the table is expanded. For example, scale = 2 will cause the table to be roughly twice as long as the default (scale = 1).
+AnalysisUpgradeA <- function(
+          data = NULL,
+          version = "1",
+          addSmooth = TRUE,
+          addSmoothCI = TRUE,
+          addSmoothCIValue = 0.95,
+          binWidthType = "sturges",
+          chartType = "_2barCharts",
+          chartValues = "_2percentages",
+          colorPalette = "colorblind",
+          descriptivesIntervalPlot = FALSE,
+          descriptivesPiechart = FALSE,
+          descriptivesQQPlot = FALSE,
+          distPlotDensity = FALSE,
+          distPlotRug = FALSE,
+          frequencyTables = FALSE,
+          frequencyTablesMaximumAmount = 10,
+          graphTypeAbove = "density",
+          graphTypeRight = "density",
+          iqr = FALSE,
+          kurtosis = FALSE,
+          mad = FALSE,
+          madrobust = FALSE,
+          maximum = TRUE,
+          mean = TRUE,
+          median = FALSE,
+          minimum = TRUE,
+          mode = FALSE,
+          numberOfBins = 30,
+          percentileValuesEqualGroups = FALSE,
+          percentileValuesEqualGroupsNo = 4,
+          percentileValuesPercentiles = FALSE,
+          percentileValuesQuartiles = FALSE,
+          plotCorrelationMatrix = FALSE,
+          plotHeight = 320,
+          plotVariables = FALSE,
+          plotWidth = 480,
+          range = FALSE,
+          regressionType = "smooth",
+          scatterPlot = FALSE,
+          shapiro = FALSE,
+          showLegend = TRUE,
+          skewness = FALSE,
+          splitPlotBoxplot = TRUE,
+          splitPlotColour = FALSE,
+          splitPlotJitter = FALSE,
+          splitPlotOutlierLabel = FALSE,
+          splitPlotViolin = FALSE,
+          splitPlots = FALSE,
+          splitby = list(types = list(), value = ""),
+          standardDeviation = TRUE,
+          standardErrorMean = FALSE,
+          statisticsValuesAreGroupMidpoints = FALSE,
+          stemAndLeaf = FALSE,
+          stemAndLeafScale = 1,
+          sum = FALSE,
+          variables = list(types = list(), value = list()),
+          variance = FALSE) {
+
+   defaultArgCalls <- formals(jaspTestModule::AnalysisUpgradeA)
+   defaultArgs <- lapply(defaultArgCalls, eval)
+   options <- as.list(match.call())[-1L]
+   options <- lapply(options, eval)
+   defaults <- setdiff(names(defaultArgs), names(options))
+   options[defaults] <- defaultArgs[defaults]
+   options[["data"]] <- NULL
+   options[["version"]] <- NULL
+
+
+   if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
+      jaspBase::storeDataSet(data)
+   }
+
+   optionsWithFormula <- c("binWidthType", "colorPalette", "splitby", "variables")
+   for (name in optionsWithFormula) {
+      if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
+
+   return(jaspBase::runWrappedAnalysis("jaspTestModule", "AnalysisUpgradeA", "AnalysisUpgrade.qml", options, version, FALSE))
+}

R/AnalysisUpgradeBWrapper.R

@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2013-2025 University of Amsterdam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This is a generated file. Don't change it!
+
+#' Analysis B
+#'
+#' @param stemAndLeaf, Create a Stem and leaf table.
+#'    Defaults to \code{FALSE}.
+#' @param stemAndLeafScale, The scale parameter controls how much the table is expanded. For example, scale = 2 will cause the table to be roughly twice as long as the default (scale = 1).
+AnalysisUpgradeB <- function(
+          data = NULL,
+          version = "1",
+          addSmooth = TRUE,
+          addSmoothCI = TRUE,
+          addSmoothCIValue = 0.95,
+          binWidthType = "sturges",
+          chartType = "_1noCharts",
+          chartValues = "_1frequencies",
+          colorPalette = "colorblind",
+          descriptivesIntervalPlot = FALSE,
+          descriptivesPiechart = FALSE,
+          descriptivesQQPlot = FALSE,
+          distPlotDensity = FALSE,
+          distPlotRug = FALSE,
+          frequencyTables = FALSE,
+          frequencyTablesMaximumAmount = 10,
+          graphTypeAbove = "density",
+          graphTypeRight = "density",
+          iqr = FALSE,
+          kurtosis = FALSE,
+          mad = FALSE,
+          madrobust = FALSE,
+          maximum = TRUE,
+          mean = TRUE,
+          median = FALSE,
+          minimum = TRUE,
+          mode = FALSE,
+          numberOfBins = 30,
+          percentileValuesEqualGroups = FALSE,
+          percentileValuesEqualGroupsNo = 4,
+          percentileValuesPercentiles = FALSE,
+          percentileValuesQuartiles = FALSE,
+          plotCorrelationMatrix = FALSE,
+          plotHeight = 320,
+          plotVariables = FALSE,
+          plotWidth = 480,
+          range = FALSE,
+          regressionType = "smooth",
+          scatterPlot = FALSE,
+          shapiro = FALSE,
+          showLegend = TRUE,
+          skewness = FALSE,
+          splitPlotBoxplot = TRUE,
+          splitPlotColour = FALSE,
+          splitPlotJitter = FALSE,
+          splitPlotOutlierLabel = FALSE,
+          splitPlotViolin = FALSE,
+          splitPlots = FALSE,
+          splitby = list(types = list(), value = ""),
+          standardDeviation = TRUE,
+          standardErrorMean = FALSE,
+          statisticsValuesAreGroupMidpoints = FALSE,
+          stemAndLeaf = FALSE,
+          stemAndLeafScale = 1,
+          sum = FALSE,
+          variables = list(types = list(), value = list()),
+          variance = FALSE) {
+
+   defaultArgCalls <- formals(jaspTestModule::AnalysisUpgradeB)
+   defaultArgs <- lapply(defaultArgCalls, eval)
+   options <- as.list(match.call())[-1L]
+   options <- lapply(options, eval)
+   defaults <- setdiff(names(defaultArgs), names(options))
+   options[defaults] <- defaultArgs[defaults]
+   options[["data"]] <- NULL
+   options[["version"]] <- NULL
+
+
+   if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
+      jaspBase::storeDataSet(data)
+   }
+
+   optionsWithFormula <- c("binWidthType", "colorPalette", "splitby", "variables")
+   for (name in optionsWithFormula) {
+      if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
+
+   return(jaspBase::runWrappedAnalysis("jaspTestModule", "AnalysisUpgradeB", "AnalysisUpgrade.qml", options, version, FALSE))
+}

R/AnalysisUpgradeIncompatibleAWrapper.R

@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2013-2025 University of Amsterdam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This is a generated file. Don't change it!
+
+#' Analysis A with incompatible to B
+#'
+#' @param stemAndLeaf, Create a Stem and leaf table.
+#'    Defaults to \code{FALSE}.
+#' @param stemAndLeafScale, The scale parameter controls how much the table is expanded. For example, scale = 2 will cause the table to be roughly twice as long as the default (scale = 1).
+AnalysisUpgradeIncompatibleA <- function(
+          data = NULL,
+          version = "1",
+          addSmooth = TRUE,
+          addSmoothCI = TRUE,
+          addSmoothCIValue = 0.95,
+          binWidthType = "sturges",
+          chartType = "_4histograms",
+          chartValues = "_2percentages",
+          colorPalette = "colorblind",
+          descriptivesIntervalPlot = FALSE,
+          descriptivesPiechart = FALSE,
+          descriptivesQQPlot = FALSE,
+          distPlotDensity = FALSE,
+          distPlotRug = FALSE,
+          frequencyTables = FALSE,
+          frequencyTablesMaximumAmount = 10,
+          graphTypeAbove = "density",
+          graphTypeRight = "density",
+          iqr = FALSE,
+          kurtosis = FALSE,
+          mad = FALSE,
+          madrobust = FALSE,
+          maximum = TRUE,
+          mean = TRUE,
+          median = FALSE,
+          minimum = TRUE,
+          mode = FALSE,
+          numberOfBins = 30,
+          percentileValuesEqualGroups = FALSE,
+          percentileValuesEqualGroupsNo = 4,
+          percentileValuesPercentiles = FALSE,
+          percentileValuesQuartiles = FALSE,
+          plotCorrelationMatrix = FALSE,
+          plotHeight = 320,
+          plotVariables = FALSE,
+          plotWidth = 480,
+          range = FALSE,
+          regressionType = "smooth",
+          scatterPlot = FALSE,
+          shapiro = FALSE,
+          showLegend = TRUE,
+          skewness = FALSE,
+          splitPlotBoxplot = TRUE,
+          splitPlotColour = FALSE,
+          splitPlotJitter = FALSE,
+          splitPlotOutlierLabel = FALSE,
+          splitPlotViolin = FALSE,
+          splitPlots = FALSE,
+          splitby = list(types = list(), value = ""),
+          standardDeviation = TRUE,
+          standardErrorMean = FALSE,
+          statisticsValuesAreGroupMidpoints = FALSE,
+          stemAndLeaf = FALSE,
+          stemAndLeafScale = 1,
+          sum = FALSE,
+          variables = list(types = list(), value = list()),
+          variance = FALSE) {
+
+   defaultArgCalls <- formals(jaspTestModule::AnalysisUpgradeIncompatibleA)
+   defaultArgs <- lapply(defaultArgCalls, eval)
+   options <- as.list(match.call())[-1L]
+   options <- lapply(options, eval)
+   defaults <- setdiff(names(defaultArgs), names(options))
+   options[defaults] <- defaultArgs[defaults]
+   options[["data"]] <- NULL
+   options[["version"]] <- NULL
+
+
+   if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
+      jaspBase::storeDataSet(data)
+   }
+
+   optionsWithFormula <- c("binWidthType", "colorPalette", "splitby", "variables")
+   for (name in optionsWithFormula) {
+      if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
+
+   return(jaspBase::runWrappedAnalysis("jaspTestModule", "AnalysisUpgradeIncompatibleA", "AnalysisUpgrade.qml", options, version, FALSE))
+}