Merge pull request #13998 from keymanapp/refactor/web/variablestoredic

Author: ermshiperete

web/src/engine/keyboard/src/index.ts

@@ -1,6 +1,6 @@
 export { ActiveKeyBase, ActiveKey, ActiveSubKey, ActiveRow, ActiveLayer, ActiveLayout } from "./keyboards/activeLayout.js";
 export { ButtonClass, ButtonClasses, LayoutLayer, LayoutFormFactor, LayoutRow, LayoutKey, LayoutSubKey, Layouts } from "./keyboards/defaultLayouts.js";
-export { JSKeyboard, LayoutState, VariableStoreDictionary } from "./keyboards/jsKeyboard.js";
+export { JSKeyboard, LayoutState } from "./keyboards/jsKeyboard.js";
 export { KeyboardMinimalInterface } from './keyboards/keyboardMinimalInterface.js';
 export { KMXKeyboard } from './keyboards/kmxKeyboard.js';
 export { KeyboardHarness, KeyboardKeymanGlobal, MinimalCodesInterface, MinimalKeymanGlobal } from "./keyboards/keyboardHarness.js";
@@ -32,7 +32,7 @@ export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js";
 export { default as KeyMapping } from "./keyMapping.js";
 export { OutputTargetInterface } from "./outputTargetInterface.js";
 export { type SystemStoreMutationHandler, MutableSystemStore, SystemStore, SystemStoreIDs, type SystemStoreDictionary } from "./systemStore.js";
-export { type VariableStore, VariableStoreSerializer } from "./variableStore.js";
+export { type VariableStore, VariableStoreSerializer, VariableStoreDictionary } from "./variableStore.js";
 
 export * from "@keymanapp/web-utils";
 

web/src/engine/keyboard/src/keyboards/jsKeyboard.ts

@@ -4,6 +4,7 @@ import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js";
 import { KeyEvent } from "../keyEvent.js";
 import { type OutputTargetInterface } from "../outputTargetInterface.js";
 import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";
+import { VariableStoreDictionary } from "../variableStore.js";
 
 import ComplexKeyboardStore = KeymanWebKeyboard.ComplexKeyboardStore;
 import KeyboardObject = KeymanWebKeyboard.KeyboardObject;
@@ -30,10 +31,6 @@ export enum LayoutState {
   POLYFILLED = 1
 }
 
-export interface VariableStoreDictionary {
-  [name: string]: string;
-};
-
 type KmwKeyboardObject = KeyboardObject & {
   /**
    * Used internally by Keyman Engine for Web to hold preprocessed stores.

web/src/engine/keyboard/src/keyboards/ruleBehavior.ts

@@ -3,8 +3,7 @@
  */
 import { LexicalModelTypes } from '@keymanapp/common-types';
 import { Transcription } from './transcription.js';
-import { VariableStore } from '../variableStore.js';
-import { VariableStoreDictionary } from './jsKeyboard.js';
+import { VariableStore, VariableStoreDictionary } from '../variableStore.js';
 import { SystemStoreDictionary } from '../systemStore.js';
 
 /**

web/src/engine/keyboard/src/variableStore.ts

@@ -4,6 +4,10 @@
  * Definitions for variable stores (see kmn reference)
  */
 
+export interface VariableStoreDictionary {
+  [name: string]: string;
+};
+
 export type VariableStore = { [name: string]: string; };
 
 export interface VariableStoreSerializer {