@sdeverywhere/plugin-check 0.3.30 → 0.3.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/plugin-check",
-  "version": "0.3.30",
+  "version": "0.3.32",
   "files": [
     "bin/**",
     "dist/**",
@@ -25,8 +25,8 @@
   "dependencies": {
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
-    "@sdeverywhere/check-core": "^0.1.9",
-    "@sdeverywhere/check-ui-shell": "^0.2.21",
+    "@sdeverywhere/check-core": "^0.1.11",
+    "@sdeverywhere/check-ui-shell": "^0.2.23",
     "@sdeverywhere/runtime": "^0.2.8",
     "@sdeverywhere/runtime-async": "^0.2.8",
     "assert-never": "^1.2.1",

package/template-bundle/src/bundle.ts

@@ -2,11 +2,9 @@
 
 import type {
   Bundle,
-  BundleGraphData,
   BundleModel as CheckBundleModel,
   DatasetKey,
   DatasetsResult,
-  LinkItem,
   ModelSpec,
   ScenarioSpec
 } from '@sdeverywhere/check-core'

package/template-bundle/src/inputs.ts

@@ -2,7 +2,7 @@
 
 import { assertNever } from 'assert-never'
 
-import type { InputVar, ScenarioSpec } from '@sdeverywhere/check-core'
+import type { ScenarioSpec, SliderInputVar } from '@sdeverywhere/check-core'
 import type { InputValue, InputVarId } from '@sdeverywhere/runtime'
 import { createInputValue } from '@sdeverywhere/runtime'
 
@@ -28,7 +28,15 @@ export interface InputSpec {
   maxValue: number
 }
 
-export interface Input extends InputVar {
+// TODO: For now we always treat each input as a slider, because the `InputSpec`
+// type in the `@sdeverywhere/build` package only carries slider-style fields
+// (defaultValue/minValue/maxValue) and doesn't distinguish sliders from
+// switches.  In practice, plugin-config-driven builds map a switch's
+// `offValue`/`onValue` onto `minValue`/`maxValue` here, so things work well
+// enough through the model-check pipeline, but it's not ideal.  Developers can
+// implement their own bundle (rather than using this template) if they need to
+// expose true switch inputs.
+export type Input = SliderInputVar & {
   value: InputValue
 }
 
@@ -39,7 +47,11 @@ export function getInputVars(inputSpecs: InputSpec[]): Map<InputVarId, Input> {
   const inputs: Map<InputVarId, Input> = new Map()
   for (const inputSpec of inputSpecs) {
     const varId = inputSpec.varId
+    // TODO: We always construct a slider-kind input here; see the note on the
+    // `Input` type above.  Switches reach this point with their off/on values
+    // already mapped onto `minValue`/`maxValue`.
     const input: Input = {
+      kind: 'slider',
       inputId: inputSpec.inputId,
       varId,
       varName: inputSpec.varName,

package/template-tests/src/index.ts

@@ -113,6 +113,18 @@ function createBaseComparisonSpecs(bundleL: Bundle, bundleR: Bundle): Comparison
   addInputs(bundleL, inputsByIdL)
   addInputs(bundleR, inputsByIdR)
 
+  // Get the value of an input at the requested matrix position.  For sliders,
+  // this is `minValue`/`maxValue`; for switches, this is `offValue`/`onValue`
+  // (matching the convention used by check-core's position resolution).
+  const valueAtPos = (iv: InputVar, position: 'min' | 'max'): number => {
+    switch (iv.kind) {
+      case 'slider':
+        return position === 'min' ? iv.minValue : iv.maxValue
+      case 'switch':
+        return position === 'min' ? iv.offValue : iv.onValue
+    }
+  }
+
   // Create an "all inputs at default" scenario
   const scenarios: ComparisonScenarioSpec[] = []
   scenarios.push({
@@ -131,16 +143,12 @@ function createBaseComparisonSpecs(bundleL: Bundle, bundleR: Bundle): Comparison
       return
     }
 
-    // Don't add a scenario if the input's min or max is equal to its default (this is already
-    // covered by the `all_inputs_at_default` scenario from above)
-    if (position === 'min') {
-      if (inputL.minValue === inputL.defaultValue && inputR.minValue === inputR.defaultValue) {
-        return
-      }
-    } else {
-      if (inputL.maxValue === inputL.defaultValue && inputR.maxValue === inputR.defaultValue) {
-        return
-      }
+    // Don't add a scenario if the input's value at the requested position is equal to its default
+    // value (this is already covered by the `all_inputs_at_default` scenario from above)
+    const valL = valueAtPos(inputL, position)
+    const valR = valueAtPos(inputR, position)
+    if (valL === inputL.defaultValue && valR === inputR.defaultValue) {
+      return
     }
 
     // Derive the scenario name from the related slider name (or if not defined, the variable name)