Merge pull request #20 from cocopon/refactor-types

Refactor InputParams and MonitorParams
cocopon · Oct 23, 2019 · fbda969 · fbda969
2 parents 152ea62 + 8a47b7d
commit fbda969
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 27 deletions.
diff --git a/src/main/js/api/types.ts b/src/main/js/api/types.ts
@@ -1,9 +1,3 @@
-export interface Point2dDimensionParams {
-	max?: number;
-	min?: number;
-	step?: number;
-}
-
 export interface InputParamsOption<T> {
 	text: string;
 	value: T;
@@ -13,27 +7,67 @@ export interface InputParamsOptionDictionary<T> {
 	[key: string]: T;
 }
 
-export interface InputParams {
+export interface Point2dDimensionParams {
+	max?: number;
+	min?: number;
+	step?: number;
+}
+
+interface BaseInputParams {
 	label?: string;
+	presetKey?: string;
+}
+
+interface BooleanInputParams extends BaseInputParams {
+	options?: InputParamsOption<unknown>[] | InputParamsOptionDictionary<unknown>;
+}
+
+interface NumberInputParams extends BaseInputParams {
 	max?: number;
 	min?: number;
 	options?: InputParamsOption<unknown>[] | InputParamsOptionDictionary<unknown>;
-	presetKey?: string;
 	step?: number;
+}
+
+interface Point2dInputParams extends BaseInputParams {
+	options?: InputParamsOption<unknown>[] | InputParamsOptionDictionary<unknown>;
 	x?: Point2dDimensionParams;
 	y?: Point2dDimensionParams;
 }
 
-export interface MonitorParams {
+interface StrintrigInputParams extends BaseInputParams {
+	options?: InputParamsOption<unknown>[] | InputParamsOptionDictionary<unknown>;
+}
+
+export type InputParams =
+	| BooleanInputParams
+	| NumberInputParams
+	| Point2dInputParams
+	| StrintrigInputParams;
+
+interface BaseMonitorParams {
 	count?: number;
 	interval?: number;
 	label?: string;
+}
+
+type BooleanMonitorParams = BaseMonitorParams;
+
+interface NumberMonitorParams extends BaseMonitorParams {
 	max?: number;
 	min?: number;
-	multiline?: boolean;
 	type?: string;
 }
 
+interface StringMonitorParams extends BaseMonitorParams {
+	multiline?: boolean;
+}
+
+export type MonitorParams =
+	| BooleanMonitorParams
+	| NumberMonitorParams
+	| StringMonitorParams;
+
 export interface ButtonParams {
 	title: string;
 }

diff --git a/src/main/js/controller/binding-creators/number-input.ts b/src/main/js/controller/binding-creators/number-input.ts
@@ -21,15 +21,18 @@ import * as UiUtil from '../ui-util';
 function createConstraint(params: InputParams): Constraint<number> {
 	const constraints: Constraint<number>[] = [];
 
-	if (!TypeUtil.isEmpty(params.step)) {
+	if ('step' in params && !TypeUtil.isEmpty(params.step)) {
 		constraints.push(
 			new StepConstraint({
 				step: params.step,
 			}),
 		);
 	}
 
-	if (!TypeUtil.isEmpty(params.max) || !TypeUtil.isEmpty(params.min)) {
+	if (
+		('max' in params && !TypeUtil.isEmpty(params.max)) ||
+		('min' in params && !TypeUtil.isEmpty(params.min))
+	) {
 		constraints.push(
 			new RangeConstraint({
 				max: params.max,

diff --git a/src/main/js/controller/binding-creators/number-monitor.ts b/src/main/js/controller/binding-creators/number-monitor.ts
@@ -80,8 +80,14 @@ function createGraphMonitor(
 		}),
 		controller: new GraphMonitorController(document, {
 			formatter: createFormatter(),
-			maxValue: TypeUtil.getOrDefault<number>(params.max, 100),
-			minValue: TypeUtil.getOrDefault<number>(params.min, 0),
+			maxValue: TypeUtil.getOrDefault<number>(
+				'max' in params ? params.max : null,
+				100,
+			),
+			minValue: TypeUtil.getOrDefault<number>(
+				'min' in params ? params.min : null,
+				0,
+			),
 			value: value,
 		}),
 		label: params.label || target.key,
@@ -98,7 +104,7 @@ export function create(
 		return null;
 	}
 
-	if (params.type === 'graph') {
+	if ('type' in params && params.type === 'graph') {
 		return createGraphMonitor(document, target, params);
 	}
 

diff --git a/src/main/js/controller/binding-creators/point-2d-input.ts b/src/main/js/controller/binding-creators/point-2d-input.ts
@@ -1,4 +1,4 @@
-import {Point2dDimensionParams} from '../../api/types';
+import {InputParams, Point2dDimensionParams} from '../../api/types';
 import {InputBinding} from '../../binding/input';
 import {CompositeConstraint} from '../../constraint/composite';
 import {Constraint} from '../../constraint/constraint';
@@ -18,12 +18,6 @@ import {InputBindingController} from '../input-binding';
 import {Point2dPadTextInputController} from '../input/point-2d-pad-text';
 import * as UiUtil from '../ui-util';
 
-interface Params {
-	label?: string;
-	x?: Point2dDimensionParams;
-	y?: Point2dDimensionParams;
-}
-
 function createDimensionConstraint(
 	params: Point2dDimensionParams | undefined,
 ): Constraint<number> | undefined {
@@ -53,10 +47,10 @@ function createDimensionConstraint(
 	});
 }
 
-function createConstraint(params: Params): Constraint<Point2d> {
+function createConstraint(params: InputParams): Constraint<Point2d> {
 	return new Point2dConstraint({
-		x: createDimensionConstraint(params.x),
-		y: createDimensionConstraint(params.y),
+		x: createDimensionConstraint('x' in params ? params.x : undefined),
+		y: createDimensionConstraint('y' in params ? params.y : undefined),
 	});
 }
 
@@ -84,7 +78,7 @@ function createController(document: Document, value: InputValue<Point2d>) {
 export function create(
 	document: Document,
 	target: Target,
-	params: Params,
+	params: InputParams,
 ): InputBindingController<Point2d, Point2dObject> | null {
 	const initialValue = target.read();
 	const p = AnyPoint2dParser(initialValue);

diff --git a/src/main/js/controller/binding-creators/string-monitor.ts b/src/main/js/controller/binding-creators/string-monitor.ts
@@ -28,7 +28,8 @@ export function create(
 		TypeUtil.getOrDefault<number>(params.count, 1),
 	);
 
-	const multiline = value.totalCount > 1 || params.multiline;
+	const multiline =
+		value.totalCount > 1 || ('multiline' in params && params.multiline);
 	const controller = multiline
 		? new MultiLogMonitorController(document, {
 				formatter: new StringFormatter(),