@pie-players/pie-default-tool-loaders 0.3.67 → 0.3.69

package/README.md

@@ -17,7 +17,7 @@ and how does the program tier them":
 | `PACKAGED_TOOL_TAG_MAP` | Which custom element each one renders as |
 | `PACKAGED_TOOL_PLACEMENT`, `SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT`, `PACKAGED_TOOL_ORDER` | Where they appear and in what order |
 | `UNIVERSAL_SUPPORTS_PRESET`, `createUniversalPersonalNeedsProfile` | Which of their support ids the program grants to everyone |
-| `DEFAULT_TOOL_MODULE_LOADERS`, `registerSectionToolModuleLoaders` | When each one's bundle loads |
+| `DEFAULT_TOOL_MODULE_LOADERS`, `createDefaultToolModuleLoaders`, `registerSectionToolModuleLoaders` | When each one's bundle loads |
 
 The individual registrations are exported too, so a host can compose its own set
 rather than take the packaged one whole.
@@ -52,6 +52,43 @@ const registry = createPackagedToolRegistry({
 });
 ```
 
+Desmos remains the calculator delivery when no provider is configured. To use
+GeoGebra or the fully bundled open-source Cortex implementation, pass the same
+calculator configuration to both the toolkit and the
+packaged composition. The composition then owns the matching element tag and
+module loader; hosts do not hand-maintain a second vendor map.
+
+```ts
+import {
+	createDefaultToolModuleLoaders,
+	createPackagedToolRegistry,
+} from "@pie-players/pie-default-tool-loaders";
+
+const calculatorProviderConfig = {
+	provider: {
+		id: "calculator-geogebra",
+		init: { appletTimeoutMs: 20_000 },
+	},
+	settings: { showResetIcon: true },
+};
+
+const registry = createPackagedToolRegistry({
+	calculatorProviderConfig,
+	toolModuleLoaders: createDefaultToolModuleLoaders({
+		calculatorProviderConfig,
+	}),
+});
+
+const tools = {
+	providers: { calculator: calculatorProviderConfig },
+};
+```
+
+For an offline-capable calculator with no API key or runtime CDN, use
+`provider.id: "calculator-cortex"`. Its `settings` accept angle mode, precision,
+history, evaluation limit, allowed functions, clipboard policy, and graph
+viewport options documented by `@pie-players/pie-calculator-cortex`.
+
 `createDefaultToolRegistry()` in the toolkit is the other end of that choice: it
 builds an empty registry, and a host composing its own set registers into it.
 

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-export type { PackagedToolRegistryOptions, RegisterDefaultToolModuleLoadersOptions, RegisterPackagedToolsOptions, ToolModuleLoader, ToolRegistryLike, } from "./packaged-capability-composition.js";
-export { createPackagedToolRegistry, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
+export type { PackagedCalculatorCompositionOptions, PackagedToolRegistryOptions, RegisterDefaultToolModuleLoadersOptions, RegisterPackagedToolsOptions, ToolModuleLoader, ToolRegistryLike, } from "./packaged-capability-composition.js";
+export { createPackagedToolRegistry, createDefaultToolModuleLoaders, createSectionToolModuleLoaders, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
 export { CONTENT_ALTERNATE_REGISTRATIONS } from "./content-alternates.js";
 export { annotationToolbarRegistration, lineReaderToolRegistration, themeToolRegistration, } from "./registrations/accessibility-tools.js";
 export { AUDIO_TRANSCRIPT_FEATURE_ID, AUDIO_TRANSCRIPT_REGION_CLASS, AUDIO_TRANSCRIPT_REGION_LABEL, audioTranscriptRegistration, resolveAudioTranscript, type ResolvedAudioTranscript, } from "./registrations/audio-transcript.js";
 export { calculatorToolRegistration } from "./registrations/calculator.js";
-export { answerEliminatorToolRegistration, highlighterToolRegistration, } from "./registrations/interaction-tools.js";
+export { createDictionaryToolRegistration, createPictureDictionaryToolRegistration, dictionaryToolRegistration, type DictionaryVariantOptions, pictureDictionaryToolRegistration, spanishDictionaryToolRegistration, spanishPictureDictionaryToolRegistration, } from "./registrations/dictionary-tools.js";
+export { answerEliminatorToolRegistration } from "./registrations/interaction-tools.js";
 export { protractorToolRegistration, rulerToolRegistration, } from "./registrations/measurement-tools.js";
 export { graphToolRegistration, periodicTableToolRegistration, } from "./registrations/subject-specific-tools.js";
 export { ttsToolRegistration } from "./registrations/tts.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-export { createPackagedToolRegistry, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
+export { createPackagedToolRegistry, createDefaultToolModuleLoaders, createSectionToolModuleLoaders, createUniversalPersonalNeedsProfile, DEFAULT_TOOL_MODULE_LOADERS, ITEM_TOOL_MODULE_LOADERS, PACKAGED_TOOL_ORDER, PACKAGED_TOOL_PLACEMENT, PACKAGED_TOOL_REGISTRATIONS, PACKAGED_TOOL_TAG_MAP, registerDefaultToolModuleLoaders, registerPackagedTools, registerSectionToolModuleLoaders, SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT, SECTION_TOOL_MODULE_LOADERS, UNIVERSAL_SUPPORTS_PRESET, } from "./packaged-capability-composition.js";
 // The authored-alternate subset, for a renderer that shows alternates and no
 // toolbar — importable without the packaged composition's tool loaders.
 export { CONTENT_ALTERNATE_REGISTRATIONS } from "./content-alternates.js";
@@ -7,7 +7,8 @@ export { CONTENT_ALTERNATE_REGISTRATIONS } from "./content-alternates.js";
 export { annotationToolbarRegistration, lineReaderToolRegistration, themeToolRegistration, } from "./registrations/accessibility-tools.js";
 export { AUDIO_TRANSCRIPT_FEATURE_ID, AUDIO_TRANSCRIPT_REGION_CLASS, AUDIO_TRANSCRIPT_REGION_LABEL, audioTranscriptRegistration, resolveAudioTranscript, } from "./registrations/audio-transcript.js";
 export { calculatorToolRegistration } from "./registrations/calculator.js";
-export { answerEliminatorToolRegistration, highlighterToolRegistration, } from "./registrations/interaction-tools.js";
+export { createDictionaryToolRegistration, createPictureDictionaryToolRegistration, dictionaryToolRegistration, pictureDictionaryToolRegistration, spanishDictionaryToolRegistration, spanishPictureDictionaryToolRegistration, } from "./registrations/dictionary-tools.js";
+export { answerEliminatorToolRegistration } from "./registrations/interaction-tools.js";
 export { protractorToolRegistration, rulerToolRegistration, } from "./registrations/measurement-tools.js";
 export { graphToolRegistration, periodicTableToolRegistration, } from "./registrations/subject-specific-tools.js";
 export { ttsToolRegistration } from "./registrations/tts.js";

package/dist/packaged-capability-composition.d.ts

@@ -7,13 +7,21 @@
  * Public constants are projections of this composition so adding a capability
  * cannot leave a second hand-maintained catalogue silently behind.
  */
-import { ToolRegistry, type ToolComponentFactory, type ToolComponentFactoryMap, type ToolRegistration, type ToolTagMap } from "@pie-players/pie-assessment-toolkit/tools/internal";
+import { ToolRegistry, type ToolComponentFactory, type ToolComponentFactoryMap, type ToolRegistration, type ToolTagMap, type ToolProviderConfig } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import type { PersonalNeedsProfile } from "@pie-players/pie-players-shared/types";
 export type ToolModuleLoader = () => Promise<unknown>;
 export interface ToolRegistryLike {
     setToolModuleLoaders(loaders: Partial<Record<string, ToolModuleLoader>>): void;
 }
-export interface PackagedToolRegistryOptions {
+export interface PackagedCalculatorCompositionOptions {
+    /**
+     * The same calculator config supplied at `tools.providers.calculator`.
+     * Selects the matching packaged element and default loader. Omit it to retain
+     * the existing Desmos delivery.
+     */
+    calculatorProviderConfig?: ToolProviderConfig;
+}
+export interface PackagedToolRegistryOptions extends PackagedCalculatorCompositionOptions {
     /** Override packaged registrations by toolId. */
     overrides?: Partial<Record<string, ToolRegistration>>;
     /** Override or extend the packaged element tag mapping. */
@@ -30,9 +38,9 @@ export interface RegisterPackagedToolsOptions {
     toolIds?: string[];
     applyOverrides?: (registration: ToolRegistration) => ToolRegistration;
 }
-export type RegisterDefaultToolModuleLoadersOptions = {
+export interface RegisterDefaultToolModuleLoadersOptions extends PackagedCalculatorCompositionOptions {
     loaders?: Partial<Record<string, ToolModuleLoader>>;
-};
+}
 /**
  * Release/build gate for PIE-authored composition data.
  *
@@ -41,25 +49,29 @@ export type RegisterDefaultToolModuleLoadersOptions = {
  * that prevents an otherwise usable assessment from rendering.
  */
 export declare function assertPackagedCapabilityComposition(): void;
-export declare const PACKAGED_TOOL_REGISTRATIONS: readonly [ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration];
+export declare const PACKAGED_TOOL_REGISTRATIONS: readonly [ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration, ToolRegistration];
 export declare const PACKAGED_TOOL_TAG_MAP: ToolTagMap;
 export declare const ITEM_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
 export declare const SECTION_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
 export declare const DEFAULT_TOOL_MODULE_LOADERS: Record<string, ToolModuleLoader>;
+/** Build the packaged loader map for a selected calculator provider. */
+export declare function createDefaultToolModuleLoaders(options?: PackagedCalculatorCompositionOptions): Record<string, ToolModuleLoader>;
+/** Build the section-bootstrap loader subset for a selected calculator provider. */
+export declare function createSectionToolModuleLoaders(options?: PackagedCalculatorCompositionOptions): Record<string, ToolModuleLoader>;
 export declare const PACKAGED_TOOL_PLACEMENT: {
     readonly assessment: readonly ["theme"];
     readonly section: readonly ["theme"];
-    readonly item: readonly ["textToSpeech", "highlighter", "annotationToolbar", "graph", "periodicTable"];
-    readonly passage: readonly ["textToSpeech", "highlighter", "annotationToolbar", "lineReader"];
-    readonly rubric: readonly ["textToSpeech", "highlighter", "annotationToolbar", "lineReader"];
-    readonly element: readonly ["calculator", "answerEliminator", "textToSpeech", "ruler", "protractor", "highlighter", "annotationToolbar", "graph", "periodicTable"];
+    readonly item: readonly ["textToSpeech", "annotationToolbar", "graph", "periodicTable", "dictionary", "pictureDictionary", "dictionarySpanish", "pictureDictionarySpanish"];
+    readonly passage: readonly ["textToSpeech", "annotationToolbar", "lineReader"];
+    readonly rubric: readonly ["textToSpeech", "annotationToolbar", "lineReader"];
+    readonly element: readonly ["calculator", "answerEliminator", "textToSpeech", "ruler", "protractor", "annotationToolbar", "graph", "periodicTable", "dictionary", "pictureDictionary", "dictionarySpanish", "pictureDictionarySpanish"];
 };
 export declare const SECTION_PLAYER_PREFERRED_TOOL_PLACEMENT: {
     section: string[];
     item: string[];
     passage: string[];
 };
-export declare const PACKAGED_TOOL_ORDER: readonly ["theme", "calculator", "textToSpeech", "lineReader", "annotationToolbar", "highlighter", "answerEliminator", "ruler", "protractor", "graph", "periodicTable"];
+export declare const PACKAGED_TOOL_ORDER: readonly ["theme", "calculator", "textToSpeech", "lineReader", "annotationToolbar", "answerEliminator", "ruler", "protractor", "graph", "periodicTable", "dictionary", "pictureDictionary", "dictionarySpanish", "pictureDictionarySpanish"];
 export declare const UNIVERSAL_SUPPORTS_PRESET: readonly string[];
 /** Register packaged PIE capabilities onto an existing registry. */
 export declare function registerPackagedTools(registry: ToolRegistry, options?: RegisterPackagedToolsOptions): void;

package/dist/packaged-capability-composition.js

@@ -10,19 +10,40 @@
 import { ToolRegistry, } from "@pie-players/pie-assessment-toolkit/tools/internal";
 import { annotationToolbarRegistration, lineReaderToolRegistration, themeToolRegistration, } from "./registrations/accessibility-tools.js";
 import { audioTranscriptRegistration } from "./registrations/audio-transcript.js";
-import { calculatorToolRegistration } from "./registrations/calculator.js";
-import { answerEliminatorToolRegistration, highlighterToolRegistration, } from "./registrations/interaction-tools.js";
+import { calculatorToolRegistration, resolveCalculatorProviderId, } from "./registrations/calculator.js";
+import { dictionaryToolRegistration, pictureDictionaryToolRegistration, spanishDictionaryToolRegistration, spanishPictureDictionaryToolRegistration, } from "./registrations/dictionary-tools.js";
+import { answerEliminatorToolRegistration } from "./registrations/interaction-tools.js";
 import { protractorToolRegistration, rulerToolRegistration, } from "./registrations/measurement-tools.js";
 import { graphToolRegistration, periodicTableToolRegistration, } from "./registrations/subject-specific-tools.js";
 import { ttsToolRegistration } from "./registrations/tts.js";
 const loadSideEffectModule = (load) => load().then(() => undefined);
-function loadCalculatorModule() {
+function loadCalculatorElement(tagName, load) {
     if (typeof globalThis !== "undefined" &&
         "customElements" in globalThis &&
-        globalThis.customElements?.get("pie-tool-calculator")) {
+        globalThis.customElements?.get(tagName)) {
         return Promise.resolve();
     }
-    return loadSideEffectModule(() => import("@pie-players/pie-tool-calculator-desmos"));
+    return loadSideEffectModule(load);
+}
+const loadDesmosCalculatorModule = () => loadCalculatorElement("pie-tool-calculator", () => import("@pie-players/pie-tool-calculator-shared/calculator-element"));
+const loadGeoGebraCalculatorModule = () => loadCalculatorElement("pie-tool-calculator-geogebra", () => import("@pie-players/pie-tool-calculator-geogebra"));
+const loadCortexCalculatorModule = () => loadCalculatorElement("pie-tool-calculator-cortex", () => import("@pie-players/pie-tool-calculator-cortex"));
+const CALCULATOR_DELIVERY = {
+    "calculator-desmos": {
+        tagName: "pie-tool-calculator",
+        loadModule: loadDesmosCalculatorModule,
+    },
+    "calculator-geogebra": {
+        tagName: "pie-tool-calculator-geogebra",
+        loadModule: loadGeoGebraCalculatorModule,
+    },
+    "calculator-cortex": {
+        tagName: "pie-tool-calculator-cortex",
+        loadModule: loadCortexCalculatorModule,
+    },
+};
+function resolveCalculatorDelivery(config) {
+    return CALCULATOR_DELIVERY[resolveCalculatorProviderId(config)];
 }
 const loadTtsModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-tts-inline"));
 const loadRulerModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-ruler"));
@@ -33,21 +54,18 @@ const loadLineReaderModule = () => loadSideEffectModule(() => import("@pie-playe
 const loadThemeModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-theme"));
 const loadGraphModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-graph"));
 const loadPeriodicTableModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-periodic-table"));
+const loadDictionaryModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-dictionary"));
+const loadPictureDictionaryModule = () => loadSideEffectModule(() => import("@pie-players/pie-tool-picture-dictionary"));
 const PACKAGED_CAPABILITY_DEFINITIONS = [
     {
         registration: calculatorToolRegistration,
-        tagName: "pie-tool-calculator",
-        loadModule: loadCalculatorModule,
+        tagName: CALCULATOR_DELIVERY["calculator-desmos"].tagName,
+        loadModule: CALCULATOR_DELIVERY["calculator-desmos"].loadModule,
         loaderTargets: ["item", "section"],
         placementOrder: { element: 10 },
         preferredPlacementOrder: { item: 10 },
         toolbarOrder: 20,
-        universalSupportIds: [
-            "calculator",
-            "graphingCalculator",
-            "basicCalculator",
-            "scientificCalculator",
-        ],
+        universalSupportIds: ["calculator", "graphingCalculator"],
     },
     {
         registration: ttsToolRegistration,
@@ -57,7 +75,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 10, passage: 10, rubric: 10, element: 30 },
         preferredPlacementOrder: { item: 20, passage: 10 },
         toolbarOrder: 30,
-        universalSupportIds: ["textToSpeech", "readAloud", "tts", "speechOutput"],
+        universalSupportIds: ["textToSpeech", "readAloud"],
     },
     {
         registration: rulerToolRegistration,
@@ -67,7 +85,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 40 },
         preferredPlacementOrder: { section: 50 },
         toolbarOrder: 80,
-        universalSupportIds: ["ruler", "measurement"],
+        universalSupportIds: ["ruler"],
     },
     {
         registration: protractorToolRegistration,
@@ -77,7 +95,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 50 },
         preferredPlacementOrder: { section: 60 },
         toolbarOrder: 90,
-        universalSupportIds: ["protractor", "angleMeasurement"],
+        universalSupportIds: ["protractor"],
     },
     {
         registration: answerEliminatorToolRegistration,
@@ -87,21 +105,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { element: 20 },
         preferredPlacementOrder: { item: 30 },
         toolbarOrder: 70,
-        universalSupportIds: [
-            "answerMasking",
-            "answerEliminator",
-            "strikethrough",
-            "choiceMasking",
-        ],
-    },
-    {
-        registration: highlighterToolRegistration,
-        tagName: "pie-tool-annotation-toolbar",
-        loadModule: loadAnnotationToolbarModule,
-        loaderTargets: ["item"],
-        placementOrder: { item: 20, passage: 20, rubric: 20, element: 60 },
-        toolbarOrder: 60,
-        universalSupportIds: ["highlighter", "textHighlight", "annotation"],
+        universalSupportIds: ["answerMasking", "answerEliminator", "strikethrough"],
     },
     {
         registration: lineReaderToolRegistration,
@@ -111,13 +115,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { passage: 40, rubric: 40 },
         preferredPlacementOrder: { section: 40 },
         toolbarOrder: 40,
-        universalSupportIds: [
-            "readingMask",
-            "readingGuide",
-            "readingRuler",
-            "lineReader",
-            "trackingGuide",
-        ],
+        universalSupportIds: ["readingMask", "readingGuide", "readingRuler"],
     },
     {
         registration: themeToolRegistration,
@@ -132,8 +130,6 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
             "colorContrast",
             "invertColors",
             "theme",
-            "highContrast",
-            "customColors",
         ],
     },
     {
@@ -144,6 +140,9 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 30, passage: 30, rubric: 30, element: 70 },
         preferredPlacementOrder: { item: 40, passage: 20 },
         toolbarOrder: 50,
+        // The last three came from the `highlighter` capability, which mounted this
+        // same element behind a second identically-labelled button. Kept here so a
+        // profile granted one of the older ids still gets highlighting.
         universalSupportIds: ["highlighting", "annotations"],
     },
     {
@@ -154,7 +153,7 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 40, element: 80 },
         preferredPlacementOrder: { section: 20 },
         toolbarOrder: 100,
-        universalSupportIds: ["graph", "coordinatePlane", "graphingTool"],
+        universalSupportIds: ["graph"],
     },
     {
         registration: periodicTableToolRegistration,
@@ -164,11 +163,52 @@ const PACKAGED_CAPABILITY_DEFINITIONS = [
         placementOrder: { item: 50, element: 90 },
         preferredPlacementOrder: { section: 30 },
         toolbarOrder: 110,
-        universalSupportIds: [
-            "periodicTable",
-            "chemistryReference",
-            "elementReference",
-        ],
+        universalSupportIds: ["periodicTable"],
+    },
+    {
+        registration: dictionaryToolRegistration,
+        tagName: "pie-tool-dictionary",
+        loadModule: loadDictionaryModule,
+        loaderTargets: ["section"],
+        placementOrder: { item: 60, element: 100 },
+        preferredPlacementOrder: { section: 70 },
+        toolbarOrder: 120,
+        // Deliberately empty: a dictionary is a granted accommodation, and on a
+        // vocabulary item it is construct-relevant, so it is never universal.
+        universalSupportIds: [],
+    },
+    {
+        registration: pictureDictionaryToolRegistration,
+        tagName: "pie-tool-picture-dictionary",
+        loadModule: loadPictureDictionaryModule,
+        loaderTargets: ["section"],
+        placementOrder: { item: 70, element: 110 },
+        preferredPlacementOrder: { section: 80 },
+        toolbarOrder: 130,
+        universalSupportIds: [],
+    },
+    // The Spanish variants render the same elements under their own capability ids, so a
+    // programme can grant a Spanish gloss beside the content-following dictionary or
+    // instead of it. Ordered after both, since English-content delivery is the common case.
+    {
+        registration: spanishDictionaryToolRegistration,
+        tagName: "pie-tool-dictionary",
+        loadModule: loadDictionaryModule,
+        loaderTargets: ["section"],
+        placementOrder: { item: 80, element: 120 },
+        preferredPlacementOrder: { section: 90 },
+        toolbarOrder: 140,
+        universalSupportIds: [],
+    },
+    {
+        registration: spanishPictureDictionaryToolRegistration,
+        tagName: "pie-tool-picture-dictionary",
+        loadModule: loadPictureDictionaryModule,
+        loaderTargets: ["section"],
+        placementOrder: { item: 90, element: 130 },
+        preferredPlacementOrder: { section: 100 },
+        toolbarOrder: 150,
+        universalSupportIds: [],
     },
     {
         registration: audioTranscriptRegistration,
@@ -358,10 +398,27 @@ class PackagedCapabilityComposition {
         // their bundle/runtime behavior.
         if (options.toolModuleLoaders &&
             Object.keys(options.toolModuleLoaders).length > 0) {
-            registry.setToolModuleLoaders(options.toolModuleLoaders);
+            const toolModuleLoaders = { ...options.toolModuleLoaders };
+            const calculatorDelivery = resolveCalculatorDelivery(options.calculatorProviderConfig);
+            // A host using the packaged default map gets a coherent provider-specific
+            // loader. A genuinely custom calculator loader remains the host's override.
+            if (options.calculatorProviderConfig &&
+                toolModuleLoaders.calculator === this.defaultModuleLoaders.calculator) {
+                toolModuleLoaders.calculator = calculatorDelivery.loadModule;
+            }
+            registry.setToolModuleLoaders(toolModuleLoaders);
         }
+        const calculatorTagMap = options.calculatorProviderConfig
+            ? {
+                calculator: resolveCalculatorDelivery(options.calculatorProviderConfig).tagName,
+            }
+            : {};
         registry.setComponentOverrides({
-            toolTagMap: { ...this.toolTagMap, ...(options.toolTagMap ?? {}) },
+            toolTagMap: {
+                ...this.toolTagMap,
+                ...calculatorTagMap,
+                ...(options.toolTagMap ?? {}),
+            },
             toolComponentFactory: options.toolComponentFactory,
             toolComponentFactories: options.toolComponentFactories,
         });
@@ -402,6 +459,22 @@ export const SECTION_TOOL_MODULE_LOADERS = {
 export const DEFAULT_TOOL_MODULE_LOADERS = {
     ...packagedCapabilityComposition.defaultModuleLoaders,
 };
+/** Build the packaged loader map for a selected calculator provider. */
+export function createDefaultToolModuleLoaders(options = {}) {
+    return {
+        ...DEFAULT_TOOL_MODULE_LOADERS,
+        calculator: resolveCalculatorDelivery(options.calculatorProviderConfig)
+            .loadModule,
+    };
+}
+/** Build the section-bootstrap loader subset for a selected calculator provider. */
+export function createSectionToolModuleLoaders(options = {}) {
+    return {
+        ...SECTION_TOOL_MODULE_LOADERS,
+        calculator: resolveCalculatorDelivery(options.calculatorProviderConfig)
+            .loadModule,
+    };
+}
 export const PACKAGED_TOOL_PLACEMENT = {
     assessment: [...packagedCapabilityComposition.placement.assessment],
     section: [...packagedCapabilityComposition.placement.section],
@@ -434,14 +507,14 @@ export function createUniversalPersonalNeedsProfile() {
 /** Register packaged lazy module loaders, followed by host overrides. */
 export function registerDefaultToolModuleLoaders(registry, options = {}) {
     registry.setToolModuleLoaders({
-        ...DEFAULT_TOOL_MODULE_LOADERS,
+        ...createDefaultToolModuleLoaders(options),
         ...(options.loaders ?? {}),
     });
 }
 /** Register only the section-bootstrap loader subset, then host overrides. */
 export function registerSectionToolModuleLoaders(registry, options = {}) {
     registry.setToolModuleLoaders({
-        ...SECTION_TOOL_MODULE_LOADERS,
+        ...createSectionToolModuleLoaders(options),
         ...(options.loaders ?? {}),
     });
 }